summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-25 10:21:47 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-25 10:21:47 +0000
commit566ec8d208e7ed30ffe954f6fa4b7bb9ec2df856 (patch)
tree8d0c08ca55b55ba57e625c976be4b1729c9284e9 /webkit/glue
parent1cf38fa7f9493a4e84a42e05abfc812e19220fea (diff)
downloadchromium_src-566ec8d208e7ed30ffe954f6fa4b7bb9ec2df856.zip
chromium_src-566ec8d208e7ed30ffe954f6fa4b7bb9ec2df856.tar.gz
chromium_src-566ec8d208e7ed30ffe954f6fa4b7bb9ec2df856.tar.bz2
DevTools: Add hints for the DEPs roll of InspectorBackend.
Review URL: http://codereview.chromium.org/160101 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21616 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/webdevtoolsagent_impl.cc8
-rw-r--r--webkit/glue/webdevtoolsclient_impl.cc16
2 files changed, 23 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));
diff --git a/webkit/glue/webdevtoolsclient_impl.cc b/webkit/glue/webdevtoolsclient_impl.cc
index 19c0867..4c25481 100644
--- a/webkit/glue/webdevtoolsclient_impl.cc
+++ b/webkit/glue/webdevtoolsclient_impl.cc
@@ -68,6 +68,11 @@ class ToolsAgentNativeDelegateImpl : public ToolsAgentNativeDelegate {
InspectorController* ic = frame_->frame()->page()->inspectorController();
if (request.frame && request.frame->attached()) {
+ // There is a breaking change pending upstream. addSourceToFrame now
+ // lives in InspectorBackend. Following code should be replaced with:
+ // ic->inspectorBackend()->addSourceToFrame(request.mime_type,
+ // content,
+ // request.frame.get());
ic->addSourceToFrame(request.mime_type, content, request.frame.get());
}
}
@@ -163,6 +168,13 @@ WebDevToolsClientImpl::WebDevToolsClientImpl(
dev_tools_host_->AddProtoFunction(
"loaded",
WebDevToolsClientImpl::JsLoaded);
+ // There is a breaking change pending upstream.
+ // v8InspectorControllerSearchCallback is now
+ // v8InspectorBackendSearchCallback.
+ // Following code should be replaced with:
+ // dev_tools_host_->AddProtoFunction(
+ // "search",
+ // WebCore::V8Custom::v8InspectorBackendSearchCallback);
dev_tools_host_->AddProtoFunction(
"search",
WebCore::V8Custom::v8InspectorControllerSearchCallback);
@@ -273,6 +285,10 @@ v8::Handle<v8::Value> WebDevToolsClientImpl::JsAddSourceToFrame(
Page* page = V8Proxy::retrieveFrameForEnteredContext()->page();
InspectorController* inspectorController = page->inspectorController();
+ // There is a breaking change pending upstream. Following code should be
+ // replaced with:
+ // return WebCore::v8Boolean(inspectorController->inspectorBackend()->
+ // addSourceToFrame(mime_type, source_string, node));
return WebCore::v8Boolean(inspectorController->
addSourceToFrame(mime_type, source_string, node));
}