| 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 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 base::LazyInstance<GLES2Initializer> g_gles2_initializer = | 91 base::LazyInstance<GLES2Initializer> g_gles2_initializer = |
| 92 LAZY_INSTANCE_INITIALIZER; | 92 LAZY_INSTANCE_INITIALIZER; |
| 93 | 93 |
| 94 //////////////////////////////////////////////////////////////////////////////// | 94 //////////////////////////////////////////////////////////////////////////////// |
| 95 | 95 |
| 96 } // namespace anonymous | 96 } // namespace anonymous |
| 97 | 97 |
| 98 class WebGraphicsContext3DErrorMessageCallback | 98 class WebGraphicsContext3DErrorMessageCallback |
| 99 : public gpu::gles2::GLES2Implementation::ErrorMessageCallback { | 99 : public gpu::gles2::GLES2Implementation::ErrorMessageCallback { |
| 100 public: | 100 public: |
| 101 WebGraphicsContext3DErrorMessageCallback( | 101 explicit WebGraphicsContext3DErrorMessageCallback( |
| 102 WebGraphicsContext3DCommandBufferImpl* context) | 102 WebGraphicsContext3DCommandBufferImpl* context) |
| 103 : graphics_context_(context) { | 103 : graphics_context_(context) { |
| 104 } | 104 } |
| 105 | 105 |
| 106 virtual void OnErrorMessage(const char* msg, int id) OVERRIDE; | 106 virtual void OnErrorMessage(const char* msg, int id) OVERRIDE; |
| 107 | 107 |
| 108 private: | 108 private: |
| 109 WebGraphicsContext3DCommandBufferImpl* graphics_context_; | 109 WebGraphicsContext3DCommandBufferImpl* graphics_context_; |
| 110 | 110 |
| 111 DISALLOW_COPY_AND_ASSIGN(WebGraphicsContext3DErrorMessageCallback); | 111 DISALLOW_COPY_AND_ASSIGN(WebGraphicsContext3DErrorMessageCallback); |
| (...skipping 1602 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1714 | 1714 |
| 1715 void WebGraphicsContext3DCommandBufferImpl::OnErrorMessage( | 1715 void WebGraphicsContext3DCommandBufferImpl::OnErrorMessage( |
| 1716 const std::string& message, int id) { | 1716 const std::string& message, int id) { |
| 1717 if (error_message_callback_) { | 1717 if (error_message_callback_) { |
| 1718 WebKit::WebString str = WebKit::WebString::fromUTF8(message.c_str()); | 1718 WebKit::WebString str = WebKit::WebString::fromUTF8(message.c_str()); |
| 1719 error_message_callback_->onErrorMessage(str, id); | 1719 error_message_callback_->onErrorMessage(str, id); |
| 1720 } | 1720 } |
| 1721 } | 1721 } |
| 1722 | 1722 |
| 1723 } // namespace content | 1723 } // namespace content |
| OLD | NEW |