summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webdevtoolsagent_impl.cc
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/glue/webdevtoolsagent_impl.cc')
-rw-r--r--webkit/glue/webdevtoolsagent_impl.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/webkit/glue/webdevtoolsagent_impl.cc b/webkit/glue/webdevtoolsagent_impl.cc
index 7267e4a..4f2053e 100644
--- a/webkit/glue/webdevtoolsagent_impl.cc
+++ b/webkit/glue/webdevtoolsagent_impl.cc
@@ -83,11 +83,11 @@ void WebDevToolsAgentImpl::Attach() {
new DebuggerAgentImpl(web_view_impl_,
debugger_agent_delegate_stub_.get(),
this));
+ Page* page = web_view_impl_->page();
dom_agent_impl_.set(new DomAgentImpl(dom_agent_delegate_stub_.get()));
// We are potentially attaching to the running page -> init agents with
// Document if any.
- Page* page = web_view_impl_->page();
Document* doc = page->mainFrame()->document();
if (doc) {
// Reuse existing context in case detached/attached.
@@ -308,6 +308,12 @@ void WebDevToolsAgentImpl::InitDevToolsAgentHost() {
v8::HandleScope scope;
v8::Context::Scope utility_scope(utility_context_);
InspectorController* ic = web_view_impl_->page()->inspectorController();
+ // There is a breaking change pending upstream. INSPECTORCONTROLLER was
+ // replaced with INSPECTORBACKEND. Following code should be replaced with:
+ // utility_context_->Global()->Set(
+ // v8::String::New("InspectorController"),
+ // V8DOMWrapper::convertToV8Object(V8ClassIndex::INSPECTORBACKEND,
+ // ic->inspectorBackend()));
utility_context_->Global()->Set(
v8::String::New("InspectorController"),
V8DOMWrapper::convertToV8Object(V8ClassIndex::INSPECTORCONTROLLER, ic));