| 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 626 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 637 image_manager_, | 637 image_manager_, |
| 638 gfx::Size(), | 638 gfx::Size(), |
| 639 disallowed_features_, | 639 disallowed_features_, |
| 640 init_params.allowed_extensions, | 640 init_params.allowed_extensions, |
| 641 init_params.attribs, | 641 init_params.attribs, |
| 642 init_params.gpu_preference, | 642 init_params.gpu_preference, |
| 643 *route_id, | 643 *route_id, |
| 644 surface_id, | 644 surface_id, |
| 645 watchdog_, | 645 watchdog_, |
| 646 software_, | 646 software_, |
| 647 init_params.use_virtual_gl_context, |
| 647 init_params.active_url)); | 648 init_params.active_url)); |
| 648 if (preempted_flag_.get()) | 649 if (preempted_flag_.get()) |
| 649 stub->SetPreemptByFlag(preempted_flag_); | 650 stub->SetPreemptByFlag(preempted_flag_); |
| 650 router_.AddRoute(*route_id, stub.get()); | 651 router_.AddRoute(*route_id, stub.get()); |
| 651 stubs_.AddWithID(stub.release(), *route_id); | 652 stubs_.AddWithID(stub.release(), *route_id); |
| 652 #endif // ENABLE_GPU | 653 #endif // ENABLE_GPU |
| 653 } | 654 } |
| 654 | 655 |
| 655 GpuCommandBufferStub* GpuChannel::LookupCommandBuffer(int32 route_id) { | 656 GpuCommandBufferStub* GpuChannel::LookupCommandBuffer(int32 route_id) { |
| 656 return stubs_.Lookup(route_id); | 657 return stubs_.Lookup(route_id); |
| (...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 851 share_group, | 852 share_group, |
| 852 gfx::GLSurfaceHandle(), | 853 gfx::GLSurfaceHandle(), |
| 853 mailbox_manager_.get(), | 854 mailbox_manager_.get(), |
| 854 image_manager_.get(), | 855 image_manager_.get(), |
| 855 size, | 856 size, |
| 856 disallowed_features_, | 857 disallowed_features_, |
| 857 init_params.allowed_extensions, | 858 init_params.allowed_extensions, |
| 858 init_params.attribs, | 859 init_params.attribs, |
| 859 init_params.gpu_preference, | 860 init_params.gpu_preference, |
| 860 *route_id, | 861 *route_id, |
| 861 0, watchdog_, | 862 0, |
| 863 watchdog_, |
| 862 software_, | 864 software_, |
| 865 init_params.use_virtual_gl_context, |
| 863 init_params.active_url)); | 866 init_params.active_url)); |
| 864 if (preempted_flag_.get()) | 867 if (preempted_flag_.get()) |
| 865 stub->SetPreemptByFlag(preempted_flag_); | 868 stub->SetPreemptByFlag(preempted_flag_); |
| 866 router_.AddRoute(*route_id, stub.get()); | 869 router_.AddRoute(*route_id, stub.get()); |
| 867 stubs_.AddWithID(stub.release(), *route_id); | 870 stubs_.AddWithID(stub.release(), *route_id); |
| 868 TRACE_EVENT1("gpu", "GpuChannel::OnCreateOffscreenCommandBuffer", | 871 TRACE_EVENT1("gpu", "GpuChannel::OnCreateOffscreenCommandBuffer", |
| 869 "route_id", route_id); | 872 "route_id", route_id); |
| 870 } | 873 } |
| 871 | 874 |
| 872 void GpuChannel::OnDestroyCommandBuffer(int32 route_id) { | 875 void GpuChannel::OnDestroyCommandBuffer(int32 route_id) { |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 939 } | 942 } |
| 940 } | 943 } |
| 941 | 944 |
| 942 void GpuChannel::CacheShader(const std::string& key, | 945 void GpuChannel::CacheShader(const std::string& key, |
| 943 const std::string& shader) { | 946 const std::string& shader) { |
| 944 gpu_channel_manager_->Send( | 947 gpu_channel_manager_->Send( |
| 945 new GpuHostMsg_CacheShader(client_id_, key, shader)); | 948 new GpuHostMsg_CacheShader(client_id_, key, shader)); |
| 946 } | 949 } |
| 947 | 950 |
| 948 } // namespace content | 951 } // namespace content |
| OLD | NEW |