summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webdevtoolsagent_impl.cc
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-27 22:30:33 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-27 22:30:33 +0000
commite39d842f6ef5e80b11df7f30d94c7c597ced4b11 (patch)
tree3241045adb5cf32de4906b07d0c7fdf85735082c /webkit/glue/webdevtoolsagent_impl.cc
parentea0f18bbf4ecd16dc6ace8f33c99fc29cd97c01f (diff)
downloadchromium_src-e39d842f6ef5e80b11df7f30d94c7c597ced4b11.zip
chromium_src-e39d842f6ef5e80b11df7f30d94c7c597ced4b11.tar.gz
chromium_src-e39d842f6ef5e80b11df7f30d94c7c597ced4b11.tar.bz2
Update WebKit to r46426.
TBR=levin BUG=none TEST=none Review URL: http://codereview.chromium.org/160204 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21722 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webdevtoolsagent_impl.cc')
-rw-r--r--webkit/glue/webdevtoolsagent_impl.cc9
1 files changed, 2 insertions, 7 deletions
diff --git a/webkit/glue/webdevtoolsagent_impl.cc b/webkit/glue/webdevtoolsagent_impl.cc
index d61f3b7..3cbfca2 100644
--- a/webkit/glue/webdevtoolsagent_impl.cc
+++ b/webkit/glue/webdevtoolsagent_impl.cc
@@ -317,15 +317,10 @@ 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));
+ V8DOMWrapper::convertToV8Object(V8ClassIndex::INSPECTORBACKEND,
+ ic->inspectorBackend()));
}
// static