| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #if defined(OS_WIN) | 5 #if defined(OS_WIN) |
| 6 #include <windows.h> | 6 #include <windows.h> |
| 7 #endif | 7 #endif |
| 8 | 8 |
| 9 #include "content/common/gpu/gpu_channel.h" | 9 #include "content/common/gpu/gpu_channel.h" |
| 10 | 10 |
| (...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 631 | 631 |
| 632 *route_id = GenerateRouteID(); | 632 *route_id = GenerateRouteID(); |
| 633 scoped_ptr<GpuCommandBufferStub> stub( | 633 scoped_ptr<GpuCommandBufferStub> stub( |
| 634 new GpuCommandBufferStub(this, | 634 new GpuCommandBufferStub(this, |
| 635 share_group, | 635 share_group, |
| 636 window, | 636 window, |
| 637 mailbox_manager_.get(), | 637 mailbox_manager_.get(), |
| 638 image_manager_.get(), | 638 image_manager_.get(), |
| 639 gfx::Size(), | 639 gfx::Size(), |
| 640 disallowed_features_, | 640 disallowed_features_, |
| 641 init_params.allowed_extensions, | |
| 642 init_params.attribs, | 641 init_params.attribs, |
| 643 init_params.gpu_preference, | 642 init_params.gpu_preference, |
| 644 use_virtualized_gl_context, | 643 use_virtualized_gl_context, |
| 645 *route_id, | 644 *route_id, |
| 646 surface_id, | 645 surface_id, |
| 647 watchdog_, | 646 watchdog_, |
| 648 software_, | 647 software_, |
| 649 init_params.active_url)); | 648 init_params.active_url)); |
| 650 if (preempted_flag_.get()) | 649 if (preempted_flag_.get()) |
| 651 stub->SetPreemptByFlag(preempted_flag_); | 650 stub->SetPreemptByFlag(preempted_flag_); |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 861 *route_id = GenerateRouteID(); | 860 *route_id = GenerateRouteID(); |
| 862 | 861 |
| 863 scoped_ptr<GpuCommandBufferStub> stub(new GpuCommandBufferStub( | 862 scoped_ptr<GpuCommandBufferStub> stub(new GpuCommandBufferStub( |
| 864 this, | 863 this, |
| 865 share_group, | 864 share_group, |
| 866 gfx::GLSurfaceHandle(), | 865 gfx::GLSurfaceHandle(), |
| 867 mailbox_manager_.get(), | 866 mailbox_manager_.get(), |
| 868 image_manager_.get(), | 867 image_manager_.get(), |
| 869 size, | 868 size, |
| 870 disallowed_features_, | 869 disallowed_features_, |
| 871 init_params.allowed_extensions, | |
| 872 init_params.attribs, | 870 init_params.attribs, |
| 873 init_params.gpu_preference, | 871 init_params.gpu_preference, |
| 874 false, | 872 false, |
| 875 *route_id, | 873 *route_id, |
| 876 0, | 874 0, |
| 877 watchdog_, | 875 watchdog_, |
| 878 software_, | 876 software_, |
| 879 init_params.active_url)); | 877 init_params.active_url)); |
| 880 if (preempted_flag_.get()) | 878 if (preempted_flag_.get()) |
| 881 stub->SetPreemptByFlag(preempted_flag_); | 879 stub->SetPreemptByFlag(preempted_flag_); |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 987 | 985 |
| 988 void GpuChannel::AddFilter(IPC::ChannelProxy::MessageFilter* filter) { | 986 void GpuChannel::AddFilter(IPC::ChannelProxy::MessageFilter* filter) { |
| 989 channel_->AddFilter(filter); | 987 channel_->AddFilter(filter); |
| 990 } | 988 } |
| 991 | 989 |
| 992 void GpuChannel::RemoveFilter(IPC::ChannelProxy::MessageFilter* filter) { | 990 void GpuChannel::RemoveFilter(IPC::ChannelProxy::MessageFilter* filter) { |
| 993 channel_->RemoveFilter(filter); | 991 channel_->RemoveFilter(filter); |
| 994 } | 992 } |
| 995 | 993 |
| 996 } // namespace content | 994 } // namespace content |
| OLD | NEW |