diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-20 23:43:01 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-20 23:43:01 +0000 |
| commit | 89df77e2d8fa34a5d1bc190fdb7270bd7fa021c7 (patch) | |
| tree | ba745d3f03467223cfae80a3dfcc0f38e1ccf1f4 /ui | |
| parent | c5174283acca78725ddd235957aa1c318361652a (diff) | |
| download | chromium_src-89df77e2d8fa34a5d1bc190fdb7270bd7fa021c7.zip chromium_src-89df77e2d8fa34a5d1bc190fdb7270bd7fa021c7.tar.gz chromium_src-89df77e2d8fa34a5d1bc190fdb7270bd7fa021c7.tar.bz2 | |
Roll skia r1385:1395
The non-DEPS changes were recommended by bsalomon in http://codereview.chromium.org/7052001/
BUG=none
TEST=none
TBR=vandebo
Review URL: http://codereview.chromium.org/6961031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86176 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gfx/gl/gl_bindings_skia_in_process.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ui/gfx/gl/gl_bindings_skia_in_process.cc b/ui/gfx/gl/gl_bindings_skia_in_process.cc index b430276..0d06971 100644 --- a/ui/gfx/gl/gl_bindings_skia_in_process.cc +++ b/ui/gfx/gl/gl_bindings_skia_in_process.cc @@ -566,6 +566,7 @@ void BindSkiaToInProcessGL() { NULL, // glResolveMultisampleFramebuffer StubGLMapBuffer, StubGLUnmapBuffer, + NULL, // glBindFragDataLocationIndexed GrGLInterface::kStaticInitEndGuard, }; GrGLSetGLInterface(&host_gl_interface); |