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 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" | 5 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" |
6 | 6 |
7 #include "third_party/khronos/GLES2/gl2.h" | 7 #include "third_party/khronos/GLES2/gl2.h" |
8 #ifndef GL_GLEXT_PROTOTYPES | 8 #ifndef GL_GLEXT_PROTOTYPES |
9 #define GL_GLEXT_PROTOTYPES 1 | 9 #define GL_GLEXT_PROTOTYPES 1 |
10 #endif | 10 #endif |
(...skipping 15 matching lines...) Expand all Loading... |
26 #include "content/common/gpu/gpu_memory_allocation.h" | 26 #include "content/common/gpu/gpu_memory_allocation.h" |
27 #include "content/common/gpu/client/gpu_channel_host.h" | 27 #include "content/common/gpu/client/gpu_channel_host.h" |
28 #include "content/common/gpu/gpu_process_launch_causes.h" | 28 #include "content/common/gpu/gpu_process_launch_causes.h" |
29 #include "content/public/common/content_constants.h" | 29 #include "content/public/common/content_constants.h" |
30 #include "content/public/common/content_switches.h" | 30 #include "content/public/common/content_switches.h" |
31 #include "gpu/command_buffer/client/gles2_cmd_helper.h" | 31 #include "gpu/command_buffer/client/gles2_cmd_helper.h" |
32 #include "gpu/command_buffer/client/gles2_implementation.h" | 32 #include "gpu/command_buffer/client/gles2_implementation.h" |
33 #include "gpu/command_buffer/client/gles2_lib.h" | 33 #include "gpu/command_buffer/client/gles2_lib.h" |
34 #include "gpu/command_buffer/client/transfer_buffer.h" | 34 #include "gpu/command_buffer/client/transfer_buffer.h" |
35 #include "gpu/command_buffer/common/constants.h" | 35 #include "gpu/command_buffer/common/constants.h" |
| 36 #include "gpu/GLES2/gl2extchromium.h" |
36 #include "gpu/ipc/command_buffer_proxy.h" | 37 #include "gpu/ipc/command_buffer_proxy.h" |
37 #include "webkit/gpu/gl_bindings_skia_cmd_buffer.h" | 38 #include "webkit/gpu/gl_bindings_skia_cmd_buffer.h" |
38 | 39 |
39 namespace content { | 40 namespace content { |
40 static base::LazyInstance<base::Lock>::Leaky | 41 static base::LazyInstance<base::Lock>::Leaky |
41 g_all_shared_contexts_lock = LAZY_INSTANCE_INITIALIZER; | 42 g_all_shared_contexts_lock = LAZY_INSTANCE_INITIALIZER; |
42 static base::LazyInstance<std::set<WebGraphicsContext3DCommandBufferImpl*> > | 43 static base::LazyInstance<std::set<WebGraphicsContext3DCommandBufferImpl*> > |
43 g_all_shared_contexts = LAZY_INSTANCE_INITIALIZER; | 44 g_all_shared_contexts = LAZY_INSTANCE_INITIALIZER; |
44 | 45 |
45 namespace { | 46 namespace { |
(...skipping 1668 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1714 | 1715 |
1715 void WebGraphicsContext3DCommandBufferImpl::OnErrorMessage( | 1716 void WebGraphicsContext3DCommandBufferImpl::OnErrorMessage( |
1716 const std::string& message, int id) { | 1717 const std::string& message, int id) { |
1717 if (error_message_callback_) { | 1718 if (error_message_callback_) { |
1718 WebKit::WebString str = WebKit::WebString::fromUTF8(message.c_str()); | 1719 WebKit::WebString str = WebKit::WebString::fromUTF8(message.c_str()); |
1719 error_message_callback_->onErrorMessage(str, id); | 1720 error_message_callback_->onErrorMessage(str, id); |
1720 } | 1721 } |
1721 } | 1722 } |
1722 | 1723 |
1723 } // namespace content | 1724 } // namespace content |
OLD | NEW |