Chromium Code Reviews| 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 <memory> | |
|
no sievers
2016/04/18 21:05:33
nit: move this below under the <algorithm> and <ma
Mostyn Bramley-Moore
2016/04/18 21:47:01
Done (but I had to disable presubmit checks when u
| |
| 8 | |
| 7 #include "third_party/khronos/GLES2/gl2.h" | 9 #include "third_party/khronos/GLES2/gl2.h" |
| 8 #ifndef GL_GLEXT_PROTOTYPES | 10 #ifndef GL_GLEXT_PROTOTYPES |
| 9 #define GL_GLEXT_PROTOTYPES 1 | 11 #define GL_GLEXT_PROTOTYPES 1 |
| 10 #endif | 12 #endif |
| 11 #include "third_party/khronos/GLES2/gl2ext.h" | 13 #include "third_party/khronos/GLES2/gl2ext.h" |
| 12 | 14 |
| 13 #include <algorithm> | 15 #include <algorithm> |
| 14 #include <map> | 16 #include <map> |
| 15 | 17 |
| 16 #include "base/atomicops.h" | 18 #include "base/atomicops.h" |
| (...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 366 | 368 |
| 367 void WebGraphicsContext3DCommandBufferImpl::OnErrorMessage(const char* message, | 369 void WebGraphicsContext3DCommandBufferImpl::OnErrorMessage(const char* message, |
| 368 int id) { | 370 int id) { |
| 369 if (error_message_callback_) { | 371 if (error_message_callback_) { |
| 370 blink::WebString str = blink::WebString::fromUTF8(message); | 372 blink::WebString str = blink::WebString::fromUTF8(message); |
| 371 error_message_callback_->onErrorMessage(str, id); | 373 error_message_callback_->onErrorMessage(str, id); |
| 372 } | 374 } |
| 373 } | 375 } |
| 374 | 376 |
| 375 } // namespace content | 377 } // namespace content |
| OLD | NEW |