summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authorbsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-26 12:14:25 +0000
committerbsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-26 12:14:25 +0000
commita3368de0405de11233e898ab0dcee732ef8eec82 (patch)
treea964800ecd4f3d634607eb0ff3b1130745400023 /webkit/glue
parentb9739600f1b038006b455f20fb8780f472e41a7d (diff)
downloadchromium_src-a3368de0405de11233e898ab0dcee732ef8eec82.zip
chromium_src-a3368de0405de11233e898ab0dcee732ef8eec82.tar.gz
chromium_src-a3368de0405de11233e898ab0dcee732ef8eec82.tar.bz2
Roll skia to 1951
Review URL: http://codereview.chromium.org/7504002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94082 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-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 a917c2f..403fd8b 100644
--- a/webkit/glue/gl_bindings_skia_cmd_buffer.cc
+++ b/webkit/glue/gl_bindings_skia_cmd_buffer.cc
@@ -68,6 +68,7 @@ void BindSkiaToCommandBufferGL() {
glGetShaderInfoLog,
glGetShaderiv,
glGetString,
+ NULL, // glGetTexLevelParameteriv
glGetUniformLocation,
glLineWidth,
glLinkProgram,
@@ -123,6 +124,8 @@ void BindSkiaToCommandBufferGL() {
glFramebufferTexture2D,
glGenFramebuffers,
glGenRenderbuffers,
+ glGetFramebufferAttachmentParameteriv,
+ glGetRenderbufferParameteriv,
glRenderbufferStorage,
glRenderbufferStorageMultisampleEXT,
glBlitFramebufferEXT,