diff options
| author | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-15 17:59:59 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-15 17:59:59 +0000 |
| commit | 119a9d2bda4c5be6f7b7a63152be749766f53df2 (patch) | |
| tree | e525feebdaaeed5b802656eef4ef5a2b7e6528bf | |
| parent | 5fa8e19883aaac580a1352dbbc1995e24c635c0d (diff) | |
| download | chromium_src-119a9d2bda4c5be6f7b7a63152be749766f53df2.zip chromium_src-119a9d2bda4c5be6f7b7a63152be749766f53df2.tar.gz chromium_src-119a9d2bda4c5be6f7b7a63152be749766f53df2.tar.bz2 | |
roll skia w/ GLInterface change
Review URL: http://codereview.chromium.org/7168014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89213 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | ui/gfx/gl/gl_bindings_skia_in_process.cc | 5 | ||||
| -rw-r--r-- | webkit/glue/gl_bindings_skia_cmd_buffer.cc | 4 |
3 files changed, 10 insertions, 1 deletions
@@ -16,7 +16,7 @@ vars = { "libjingle_revision": "66", "libvpx_revision": "88361", "ffmpeg_revision": "88382", - "skia_revision": "1574", + "skia_revision": "1590", "v8_revision": "8218", } diff --git a/ui/gfx/gl/gl_bindings_skia_in_process.cc b/ui/gfx/gl/gl_bindings_skia_in_process.cc index 0d06971..ec30247 100644 --- a/ui/gfx/gl/gl_bindings_skia_in_process.cc +++ b/ui/gfx/gl/gl_bindings_skia_in_process.cc @@ -460,6 +460,11 @@ void BindSkiaToInProcessGL() { static GrGLInterface host_gl_interface = { binding, + + -1, // NPOTRenderTargetSupport + -1, // MinRenderTargetHeight + -1, // MinRenderTargetWidth + StubGLActiveTexture, StubGLAttachShader, StubGLBindAttribLocation, diff --git a/webkit/glue/gl_bindings_skia_cmd_buffer.cc b/webkit/glue/gl_bindings_skia_cmd_buffer.cc index ebb0db0..f3139cb 100644 --- a/webkit/glue/gl_bindings_skia_cmd_buffer.cc +++ b/webkit/glue/gl_bindings_skia_cmd_buffer.cc @@ -19,6 +19,10 @@ void BindSkiaToCommandBufferGL() { static GrGLInterface cmd_buffer_interface = { kES2_GrGLBinding, + -1, // NPOTRenderTargetSupport + -1, // MinRenderTargetHeight + -1, // MinRenderTargetWidth + glActiveTexture, glAttachShader, glBindAttribLocation, |