diff options
author | tomhudson@google.com <tomhudson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-16 14:20:37 +0000 |
---|---|---|
committer | tomhudson@google.com <tomhudson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-16 14:20:37 +0000 |
commit | 1d30e16b6c956644667c3f18dd5e7480c4d7f6ea (patch) | |
tree | 99a0e8ef634dc8da9058935c397e389e39a5034a /ui/gfx/gl | |
parent | 0b0b074f6a864e98ad8bf7f78a583df86039e6e3 (diff) | |
download | chromium_src-1d30e16b6c956644667c3f18dd5e7480c4d7f6ea.zip chromium_src-1d30e16b6c956644667c3f18dd5e7480c4d7f6ea.tar.gz chromium_src-1d30e16b6c956644667c3f18dd5e7480c4d7f6ea.tar.bz2 |
Rolling skia deps from r3180 to r3196.
Requires changes in include paths and new target for SSSE3 optimizations.
Followup patch should tweak includes in
third_party\WebKit\Source\WebKit\chromium\src\WebGraphicsContext3D.cpp
and GraphicsContext3DChromium.cpp.
Review URL: https://chromiumcodereview.appspot.com/9404008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122285 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/gl')
-rw-r--r-- | ui/gfx/gl/gl_bindings_skia_in_process.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/gfx/gl/gl_bindings_skia_in_process.cc b/ui/gfx/gl/gl_bindings_skia_in_process.cc index 609c442..eeae0d2 100644 --- a/ui/gfx/gl/gl_bindings_skia_in_process.cc +++ b/ui/gfx/gl/gl_bindings_skia_in_process.cc @@ -6,7 +6,7 @@ #include "ui/gfx/gl/gl_bindings_skia_in_process.h" #include "base/logging.h" -#include "third_party/skia/include/gpu/GrGLInterface.h" +#include "third_party/skia/include/gpu/gl/GrGLInterface.h" #include "ui/gfx/gl/gl_bindings.h" #include "ui/gfx/gl/gl_implementation.h" |