diff options
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/chrome_renderer.gypi | 1 | ||||
-rw-r--r-- | chrome/renderer/DEPS | 1 | ||||
-rw-r--r-- | chrome/renderer/renderer_webkitclient_impl.cc | 5 |
3 files changed, 5 insertions, 2 deletions
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi index fe979af..ebbd838 100644 --- a/chrome/chrome_renderer.gypi +++ b/chrome/chrome_renderer.gypi @@ -26,6 +26,7 @@ '../third_party/npapi/npapi.gyp:npapi', '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', '../webkit/support/webkit_support.gyp:glue', + '../webkit/support/webkit_support.gyp:webkit_gpu', '../webkit/support/webkit_support.gyp:webkit_resources', ], 'include_dirs': [ diff --git a/chrome/renderer/DEPS b/chrome/renderer/DEPS index dfd8d21..3025ecf 100644 --- a/chrome/renderer/DEPS +++ b/chrome/renderer/DEPS @@ -14,6 +14,7 @@ include_rules = [ "+webkit/extensions", "+webkit/glue", "+webkit/glue/plugins", + "+webkit/gpu", "+webkit/plugins", "+v8/include", "+third_party/cld/encodings/compact_lang_det/win", diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc index 1025e69..1683691 100644 --- a/chrome/renderer/renderer_webkitclient_impl.cc +++ b/chrome/renderer/renderer_webkitclient_impl.cc @@ -42,6 +42,7 @@ #include "webkit/glue/webclipboard_impl.h" #include "webkit/glue/webfileutilities_impl.h" #include "webkit/glue/webkit_glue.h" +#include "webkit/gpu/webgraphicscontext3d_in_process_impl.h" #if defined(OS_WIN) #include "third_party/WebKit/WebKit/chromium/public/win/WebSandboxSupport.h" @@ -504,11 +505,11 @@ RendererWebKitClientImpl::sharedWorkerRepository() { WebKit::WebGraphicsContext3D* RendererWebKitClientImpl::createGraphicsContext3D() { - // The WebGraphicsContext3D::createDefault code path is used for + // The WebGraphicsContext3DInProcessImpl code path is used for // layout tests (though not through this code) as well as for // debugging and bringing up new ports. if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kInProcessWebGL)) { - return WebKit::WebGraphicsContext3D::createDefault(); + return new webkit_gpu::WebGraphicsContext3DInProcessImpl(); } else { #if defined(ENABLE_GPU) return new WebGraphicsContext3DCommandBufferImpl(); |