From d1b8fcccc251aab37bd522d237e3d7e8c3661a1b Mon Sep 17 00:00:00 2001 From: "levin@chromium.org" Date: Wed, 3 Aug 2011 01:20:13 +0000 Subject: RenderThread::OnControlMessageReceived may result in UserScriptSlave::UpdateScripts which calls WebKit::WebView::addUserStyleSheet. It is more important that places which access the WebKit api first call WebKit::initialize (due to that being needed for currentThread to work). Review URL: http://codereview.chromium.org/7544035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95187 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/renderer/extensions/user_script_slave.cc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'chrome/renderer/extensions/user_script_slave.cc') diff --git a/chrome/renderer/extensions/user_script_slave.cc b/chrome/renderer/extensions/user_script_slave.cc index 48e20ab..ec2de6e 100644 --- a/chrome/renderer/extensions/user_script_slave.cc +++ b/chrome/renderer/extensions/user_script_slave.cc @@ -19,6 +19,7 @@ #include "chrome/renderer/chrome_render_process_observer.h" #include "chrome/renderer/extensions/extension_dispatcher.h" #include "chrome/renderer/extensions/extension_groups.h" +#include "content/renderer/render_thread.h" #include "googleurl/src/gurl.h" #include "grit/renderer_resources.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" @@ -191,6 +192,7 @@ bool UserScriptSlave::UpdateScripts(base::SharedMemoryHandle shared_memory) { } // Push user styles down into WebCore + RenderThread::current()->EnsureWebKitInitialized(); WebView::removeAllUserContent(); for (size_t i = 0; i < scripts_.size(); ++i) { UserScript* script = scripts_[i]; -- cgit v1.1