summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorbsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-04 18:59:27 +0000
committerbsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-04 18:59:27 +0000
commit5b5a9d8955006ba4f8afe940937a70e656e0e41f (patch)
tree83e27860b57c5df5b2cfec48febe9d6453187043 /webkit
parentc7e593a2845fa89985b261026115a5acc475fcbd (diff)
downloadchromium_src-5b5a9d8955006ba4f8afe940937a70e656e0e41f.zip
chromium_src-5b5a9d8955006ba4f8afe940937a70e656e0e41f.tar.gz
chromium_src-5b5a9d8955006ba4f8afe940937a70e656e0e41f.tar.bz2
Roll skia to r2034 (and add new gl bindings)
Review URL: http://codereview.chromium.org/7564013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95462 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/gl_bindings_skia_cmd_buffer.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/webkit/glue/gl_bindings_skia_cmd_buffer.cc b/webkit/glue/gl_bindings_skia_cmd_buffer.cc
index 403fd8b..5192e34 100644
--- a/webkit/glue/gl_bindings_skia_cmd_buffer.cc
+++ b/webkit/glue/gl_bindings_skia_cmd_buffer.cc
@@ -53,6 +53,8 @@ void BindSkiaToCommandBufferGL() {
NULL, // glDisableClientState
glDisableVertexAttribArray,
glDrawArrays,
+ NULL, // glDrawBuffer
+ NULL, // glDrawBuffers
glDrawElements,
glEnable,
NULL, // glEnableClientState
@@ -76,6 +78,7 @@ void BindSkiaToCommandBufferGL() {
NULL, // glMatrixMode
glPixelStorei,
NULL, // glPointSize
+ NULL, // glReadBuffer
glReadPixels,
glScissor,
NULL, // glShadeModel