diff options
| author | yurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-23 08:21:35 +0000 |
|---|---|---|
| committer | yurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-23 08:21:35 +0000 |
| commit | 11187fbe4ce265572e69216fe85400ebdc362225 (patch) | |
| tree | a311606ff90250d9162f8e4ce0d67ce5424d1be5 /webkit | |
| parent | a1f8dc06f70e2002490c2a085406f0c026686d47 (diff) | |
| download | chromium_src-11187fbe4ce265572e69216fe85400ebdc362225.zip chromium_src-11187fbe4ce265572e69216fe85400ebdc362225.tar.gz chromium_src-11187fbe4ce265572e69216fe85400ebdc362225.tar.bz2 | |
DevTools: prepare for landing webkit change for 32554.
BUG=29068
Review URL: http://codereview.chromium.org/546105
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36957 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/devtools/js/devtools.js | 5 | ||||
| -rw-r--r-- | webkit/glue/devtools/js/inspector_controller_impl.js | 2 | ||||
| -rw-r--r-- | webkit/glue/webdevtoolsagent_impl.cc | 12 |
3 files changed, 17 insertions, 2 deletions
diff --git a/webkit/glue/devtools/js/devtools.js b/webkit/glue/devtools/js/devtools.js index b562a2f4..b71cf7a 100644 --- a/webkit/glue/devtools/js/devtools.js +++ b/webkit/glue/devtools/js/devtools.js @@ -526,3 +526,8 @@ InspectorFrontendHost.addResourceSourceToFrame = function(identifier, element) { originalAddToFrame.call(this, identifier, resource.mimeType, element); }; })(); + +WebInspector.pausedScript = function(callFrames) +{ + this.panels.scripts.debuggerPaused(callFrames); +}; diff --git a/webkit/glue/devtools/js/inspector_controller_impl.js b/webkit/glue/devtools/js/inspector_controller_impl.js index 9e0e539..a69bc34 100644 --- a/webkit/glue/devtools/js/inspector_controller_impl.js +++ b/webkit/glue/devtools/js/inspector_controller_impl.js @@ -236,7 +236,7 @@ devtools.InspectorBackendImpl.prototype.dispatchOnInjectedScript = function( */ devtools.InspectorBackendImpl.prototype.dispatchOnInjectedScript = function( callId, methodName, argsString, async) { - var injectedScriptId = 0; + var injectedScriptId = 1000000; RemoteToolsAgent.DispatchOnInjectedScript( callId, injectedScriptId, diff --git a/webkit/glue/webdevtoolsagent_impl.cc b/webkit/glue/webdevtoolsagent_impl.cc index 42dfadd..f0e8866 100644 --- a/webkit/glue/webdevtoolsagent_impl.cc +++ b/webkit/glue/webdevtoolsagent_impl.cc @@ -252,10 +252,20 @@ void WebDevToolsAgentImpl::DispatchOnInspectorController( void WebDevToolsAgentImpl::DispatchOnInjectedScript( int call_id, - int, + int injected_script_id, const String& function_name, const String& json_args, bool async) { + // TODO(yurys): get rid of this code once WebKit change is rolled. + if (injected_script_id != 1000000) { + GetInspectorController()->inspectorBackend()->dispatchOnInjectedScript( + call_id, + injected_script_id, + function_name, + json_args, + async); + return; + } String result; String exception; result = debugger_agent_impl_->ExecuteUtilityFunction(utility_context_, |