diff options
| author | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-03 01:20:13 +0000 |
|---|---|---|
| committer | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-03 01:20:13 +0000 |
| commit | d1b8fcccc251aab37bd522d237e3d7e8c3661a1b (patch) | |
| tree | e2243c4842540812b469d0f29f357129d7d85cdd /chrome/renderer/extensions/user_script_slave.cc | |
| parent | 4a3f5a60151cb476f4dc6740606e798cf8b823a9 (diff) | |
| download | chromium_src-d1b8fcccc251aab37bd522d237e3d7e8c3661a1b.zip chromium_src-d1b8fcccc251aab37bd522d237e3d7e8c3661a1b.tar.gz chromium_src-d1b8fcccc251aab37bd522d237e3d7e8c3661a1b.tar.bz2 | |
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
Diffstat (limited to 'chrome/renderer/extensions/user_script_slave.cc')
| -rw-r--r-- | chrome/renderer/extensions/user_script_slave.cc | 2 |
1 files changed, 2 insertions, 0 deletions
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]; |