diff options
| author | skyostil@google.com <skyostil@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 17:26:19 +0000 |
|---|---|---|
| committer | skyostil@google.com <skyostil@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 17:26:19 +0000 |
| commit | 8fcd0ee58318edc4e96732ba87426f9c356abbf0 (patch) | |
| tree | 258024dc374c4b60d77953115792d937718fbf22 /webkit | |
| parent | 8ea26c2868aa05a80b9f7fe6b39d9bd74ca9b46e (diff) | |
| download | chromium_src-8fcd0ee58318edc4e96732ba87426f9c356abbf0.zip chromium_src-8fcd0ee58318edc4e96732ba87426f9c356abbf0.tar.gz chromium_src-8fcd0ee58318edc4e96732ba87426f9c356abbf0.tar.bz2 | |
Move GL headers from gpu to third_party/khronos
This change moves the OpenGL ES and EGL header files from gpu/ to a new third_party/khronos/ directory. The headers are also rebased to the latest upstream versions.
BUG=102824
TEST=none
Review URL: http://codereview.chromium.org/8423038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111170 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/DEPS | 2 | ||||
| -rw-r--r-- | webkit/glue/gl_bindings_skia_cmd_buffer.cc | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/webkit/DEPS b/webkit/DEPS index 0ec44a0..18c4566 100644 --- a/webkit/DEPS +++ b/webkit/DEPS @@ -21,7 +21,7 @@ include_rules = [ "+gpu/command_buffer/client", "+gpu/command_buffer/common", "+gpu/command_buffer/service", - "+gpu/GLES2", + "+third_party/khronos/GLES2", # TODO(brettw) - review these; move up if it's ok, or remove the dependency "+crypto", diff --git a/webkit/glue/gl_bindings_skia_cmd_buffer.cc b/webkit/glue/gl_bindings_skia_cmd_buffer.cc index c19d36c..9a44070 100644 --- a/webkit/glue/gl_bindings_skia_cmd_buffer.cc +++ b/webkit/glue/gl_bindings_skia_cmd_buffer.cc @@ -8,9 +8,8 @@ #ifndef GL_GLEXT_PROTOTYPES #define GL_GLEXT_PROTOTYPES #endif -#include "gpu/GLES2/gl2.h" -#include "gpu/GLES2/gl2ext.h" - +#include "third_party/khronos/GLES2/gl2.h" +#include "third_party/khronos/GLES2/gl2ext.h" #include "third_party/skia/include/gpu/GrGLInterface.h" namespace webkit_glue { @@ -119,4 +118,3 @@ GrGLInterface* CreateCommandBufferSkiaGLBinding() { } } // namespace webkit_glue - |