Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(148)

Side by Side Diff: content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc

Issue 8633020: Revert 111170 - Move GL headers from gpu to third_party/khronos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/renderer/gpu/transport_texture_host.cc ('k') | gpu/EGL/eglext.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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(ENABLE_GPU) 5 #if defined(ENABLE_GPU)
6 6
7 #include "content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h" 7 #include "content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h"
8 8
9 #include "third_party/khronos/GLES2/gl2.h" 9 #include "gpu/GLES2/gl2.h"
10 #ifndef GL_GLEXT_PROTOTYPES 10 #ifndef GL_GLEXT_PROTOTYPES
11 #define GL_GLEXT_PROTOTYPES 1 11 #define GL_GLEXT_PROTOTYPES 1
12 #endif 12 #endif
13 #include "third_party/khronos/GLES2/gl2ext.h" 13 #include "gpu/GLES2/gl2ext.h"
14 14
15 #include <algorithm> 15 #include <algorithm>
16 #include <set> 16 #include <set>
17 17
18 #include "base/bind.h" 18 #include "base/bind.h"
19 #include "base/lazy_instance.h" 19 #include "base/lazy_instance.h"
20 #include "base/string_tokenizer.h" 20 #include "base/string_tokenizer.h"
21 #include "base/command_line.h" 21 #include "base/command_line.h"
22 #include "base/debug/trace_event.h" 22 #include "base/debug/trace_event.h"
23 #include "base/logging.h" 23 #include "base/logging.h"
(...skipping 1146 matching lines...) Expand 10 before | Expand all | Expand 10 after
1170 if (context_lost_callback_) { 1170 if (context_lost_callback_) {
1171 context_lost_callback_->onContextLost(); 1171 context_lost_callback_->onContextLost();
1172 } 1172 }
1173 RenderViewImpl* renderview = 1173 RenderViewImpl* renderview =
1174 web_view_ ? RenderViewImpl::FromWebView(web_view_) : NULL; 1174 web_view_ ? RenderViewImpl::FromWebView(web_view_) : NULL;
1175 if (renderview) 1175 if (renderview)
1176 renderview->OnViewContextSwapBuffersAborted(); 1176 renderview->OnViewContextSwapBuffersAborted();
1177 } 1177 }
1178 1178
1179 #endif // defined(ENABLE_GPU) 1179 #endif // defined(ENABLE_GPU)
OLDNEW
« no previous file with comments | « content/renderer/gpu/transport_texture_host.cc ('k') | gpu/EGL/eglext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698