diff options
| author | bsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-06 17:21:39 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-06 17:21:39 +0000 |
| commit | 4ca1a669c58326d586e35b4d43e9e97626edf0a6 (patch) | |
| tree | 8f727d1da26c10b1884da118044a23910bd1ab87 /content/renderer | |
| parent | 8cc85fcb137d43a8221aed3bcd8b9e7da1e640a4 (diff) | |
| download | chromium_src-4ca1a669c58326d586e35b4d43e9e97626edf0a6.zip chromium_src-4ca1a669c58326d586e35b4d43e9e97626edf0a6.tar.gz chromium_src-4ca1a669c58326d586e35b4d43e9e97626edf0a6.tar.bz2 | |
Roll Skia
Setup pointers to cmd buffer GLES2 interface in Ganesh
Review URL: http://codereview.chromium.org/6691042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80642 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/renderer_webkitclient_impl.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/content/renderer/renderer_webkitclient_impl.cc b/content/renderer/renderer_webkitclient_impl.cc index c904137..92ec578f 100644 --- a/content/renderer/renderer_webkitclient_impl.cc +++ b/content/renderer/renderer_webkitclient_impl.cc @@ -42,6 +42,8 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageEventDispatcher.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h" +#include "ui/gfx/gl/gl_bindings_skia_in_process.h" +#include "webkit/glue/gl_bindings_skia_cmd_buffer.h" #include "webkit/glue/simple_webmimeregistry_impl.h" #include "webkit/glue/webclipboard_impl.h" #include "webkit/glue/webfileutilities_impl.h" @@ -528,9 +530,11 @@ RendererWebKitClientImpl::createGraphicsContext3D() { // layout tests (though not through this code) as well as for // debugging and bringing up new ports. if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kInProcessWebGL)) { + gfx::BindSkiaToInProcessGL(); return new webkit::gpu::WebGraphicsContext3DInProcessImpl(); } else { #if defined(ENABLE_GPU) + webkit_glue::BindSkiaToCommandBufferGL(); return new WebGraphicsContext3DCommandBufferImpl(); #else return NULL; |