summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-05 20:00:09 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-05 20:00:09 +0000
commit5da05ed0027d36a635dbf3aa6bb48c399fbf1289 (patch)
treef3a2bccdce4040c6677f114fb8fc1b082f6e82d0 /content
parent4afd42ec3535c83db98a95f436242e87803f1d14 (diff)
downloadchromium_src-5da05ed0027d36a635dbf3aa6bb48c399fbf1289.zip
chromium_src-5da05ed0027d36a635dbf3aa6bb48c399fbf1289.tar.gz
chromium_src-5da05ed0027d36a635dbf3aa6bb48c399fbf1289.tar.bz2
Ensure that webkit is initialized before calling into it from devtools agent filter
BUG=none TEST=happier avi (and tree) Review URL: http://codereview.chromium.org/8802016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113001 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/renderer/devtools_agent_filter.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/content/renderer/devtools_agent_filter.cc b/content/renderer/devtools_agent_filter.cc
index 4e42ce3..69b5298 100644
--- a/content/renderer/devtools_agent_filter.cc
+++ b/content/renderer/devtools_agent_filter.cc
@@ -9,6 +9,7 @@
#include "content/common/devtools_messages.h"
#include "content/renderer/devtools_agent.h"
#include "content/renderer/plugin_channel_host.h"
+#include "content/renderer/render_thread.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
@@ -68,6 +69,7 @@ void DevToolsAgentFilter::OnFilterAdded(IPC::Channel* channel) {
void DevToolsAgentFilter::OnDispatchOnInspectorBackend(
const std::string& message) {
+ RenderThread::current()->EnsureWebKitInitialized();
if (!WebDevToolsAgent::shouldInterruptForMessage(
WebString::fromUTF8(message))) {
message_handled_ = false;