Commit 5da05ed0 authored by jochen@chromium.org's avatar jochen@chromium.org

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
parent 4afd42ec
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include "content/common/devtools_messages.h" #include "content/common/devtools_messages.h"
#include "content/renderer/devtools_agent.h" #include "content/renderer/devtools_agent.h"
#include "content/renderer/plugin_channel_host.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/WebDevToolsAgent.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
...@@ -68,6 +69,7 @@ void DevToolsAgentFilter::OnFilterAdded(IPC::Channel* channel) { ...@@ -68,6 +69,7 @@ void DevToolsAgentFilter::OnFilterAdded(IPC::Channel* channel) {
void DevToolsAgentFilter::OnDispatchOnInspectorBackend( void DevToolsAgentFilter::OnDispatchOnInspectorBackend(
const std::string& message) { const std::string& message) {
RenderThread::current()->EnsureWebKitInitialized();
if (!WebDevToolsAgent::shouldInterruptForMessage( if (!WebDevToolsAgent::shouldInterruptForMessage(
WebString::fromUTF8(message))) { WebString::fromUTF8(message))) {
message_handled_ = false; message_handled_ = false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment