diff options
| author | abodenha@chromium.org <abodenha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 18:19:23 +0000 |
|---|---|---|
| committer | abodenha@chromium.org <abodenha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 18:19:23 +0000 |
| commit | 8ee503f6c24c6531618ce8d9569af1fd16c5e071 (patch) | |
| tree | d1f6977a11a1e143f111c2f08860e829078f9666 /webkit | |
| parent | 108e031e12f8300ddc545837fe704de4710f542e (diff) | |
| download | chromium_src-8ee503f6c24c6531618ce8d9569af1fd16c5e071.zip chromium_src-8ee503f6c24c6531618ce8d9569af1fd16c5e071.tar.gz chromium_src-8ee503f6c24c6531618ce8d9569af1fd16c5e071.tar.bz2 | |
Revert 111170 - 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
TBR=skyostil@google.com
Review URL: http://codereview.chromium.org/8633020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111173 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, 5 insertions, 3 deletions
diff --git a/webkit/DEPS b/webkit/DEPS index 18c4566..0ec44a0 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", - "+third_party/khronos/GLES2", + "+gpu/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 9a44070..c19d36c 100644 --- a/webkit/glue/gl_bindings_skia_cmd_buffer.cc +++ b/webkit/glue/gl_bindings_skia_cmd_buffer.cc @@ -8,8 +8,9 @@ #ifndef GL_GLEXT_PROTOTYPES #define GL_GLEXT_PROTOTYPES #endif -#include "third_party/khronos/GLES2/gl2.h" -#include "third_party/khronos/GLES2/gl2ext.h" +#include "gpu/GLES2/gl2.h" +#include "gpu/GLES2/gl2ext.h" + #include "third_party/skia/include/gpu/GrGLInterface.h" namespace webkit_glue { @@ -118,3 +119,4 @@ GrGLInterface* CreateCommandBufferSkiaGLBinding() { } } // namespace webkit_glue + |