Roll to WebKit 46490. DevTools: Migrate to the new ScriptObject API.

BUG=none
TEST=none

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21853 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 3 deletions

diff --git a/DEPS b/DEPS
index c5f849b..1df6d6c 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
 vars = {
   "webkit_trunk":
     "http://svn.webkit.org/repository/webkit/trunk",
-  "webkit_revision": "46489",
+  "webkit_revision": "46490",
 }
 
 
diff --git a/webkit/glue/webdevtoolsagent_impl.cc b/webkit/glue/webdevtoolsagent_impl.cc
index 3cbfca2..b6ca3ca 100644
--- a/webkit/glue/webdevtoolsagent_impl.cc
+++ b/webkit/glue/webdevtoolsagent_impl.cc
@@ -41,6 +41,8 @@ using WebCore::InspectorFrontend;
 using WebCore::InspectorResource;
 using WebCore::Node;
 using WebCore::Page;
+using WebCore::ScriptObject;
+using WebCore::ScriptState;
 using WebCore::ScriptValue;
 using WebCore::String;
 using WebCore::V8ClassIndex;
@@ -103,9 +105,10 @@ void WebDevToolsAgentImpl::Attach() {
     tools_agent_delegate_stub_->SetResourcesPanelEnabled(
         ic->resourceTrackingEnabled());
     v8::HandleScope scope;
+    ScriptState* state = scriptStateFromPage(web_view_impl_->page());
     ic->setFrontendProxyObject(
-        scriptStateFromPage(web_view_impl_->page()),
-        utility_context_->Global());
+        state,
+        ScriptObject(state, utility_context_->Global()));
     // Allow controller to send messages to the frontend.
     ic->setWindowVisible(true, false);
   }