diff options
| author | twiz@chromium.org <twiz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-26 21:01:56 +0000 |
|---|---|---|
| committer | twiz@chromium.org <twiz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-26 21:01:56 +0000 |
| commit | 33bd0f059a7caee231351163a208159de9a69a48 (patch) | |
| tree | df4fb1ca7041e9c062ca96946869edc6e9db6535 /content | |
| parent | 7f072f44076c3615b4741f20daf05ea75535ead6 (diff) | |
| download | chromium_src-33bd0f059a7caee231351163a208159de9a69a48.zip chromium_src-33bd0f059a7caee231351163a208159de9a69a48.tar.gz chromium_src-33bd0f059a7caee231351163a208159de9a69a48.tar.bz2 | |
The skia bindings calls were not at a correct place to ensure that the host GL had been initialized. Move them so that we are certain that Skia will be able to find the correct GL exports.
BUG=79955
TEST=DRT with Ganesh Enabled
Review URL: http://codereview.chromium.org/6882132
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83071 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/renderer/renderer_webkitclient_impl.cc | 4 | ||||
| -rw-r--r-- | content/renderer/webgraphicscontext3d_command_buffer_impl.cc | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/content/renderer/renderer_webkitclient_impl.cc b/content/renderer/renderer_webkitclient_impl.cc index e86747d..4829dd1 100644 --- a/content/renderer/renderer_webkitclient_impl.cc +++ b/content/renderer/renderer_webkitclient_impl.cc @@ -40,8 +40,6 @@ #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" @@ -530,11 +528,9 @@ 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; diff --git a/content/renderer/webgraphicscontext3d_command_buffer_impl.cc b/content/renderer/webgraphicscontext3d_command_buffer_impl.cc index 2ff2b98..0ed31f6 100644 --- a/content/renderer/webgraphicscontext3d_command_buffer_impl.cc +++ b/content/renderer/webgraphicscontext3d_command_buffer_impl.cc @@ -25,6 +25,7 @@ #include "gpu/command_buffer/common/constants.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "webkit/glue/gl_bindings_skia_cmd_buffer.h" WebGraphicsContext3DCommandBufferImpl::WebGraphicsContext3DCommandBufferImpl() : context_(NULL), @@ -52,6 +53,7 @@ bool WebGraphicsContext3DCommandBufferImpl::initialize( WebGraphicsContext3D::Attributes attributes, WebKit::WebView* web_view, bool render_directly_to_web_view) { + webkit_glue::BindSkiaToCommandBufferGL(); RenderThread* render_thread = RenderThread::current(); if (!render_thread) return false; |