diff options
| author | yurys@google.com <yurys@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-23 07:16:41 +0000 |
|---|---|---|
| committer | yurys@google.com <yurys@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-23 07:16:41 +0000 |
| commit | 6e704be1995d532844991add1de569020835f4f7 (patch) | |
| tree | f904096f9641a16599f2669d74b3f30243512a25 /webkit | |
| parent | 094a971632cffff0afddac0bbdad025c5b19f7e9 (diff) | |
| download | chromium_src-6e704be1995d532844991add1de569020835f4f7.zip chromium_src-6e704be1995d532844991add1de569020835f4f7.tar.gz chromium_src-6e704be1995d532844991add1de569020835f4f7.tar.bz2 | |
DevTools: repair eval on call frame.
evaluateInCallFrame is called on InjectedScriptAccess instead of InspectorController in ScriptsPanel.js so we need to update Chrome-specific devtools code.
Review URL: http://codereview.chromium.org/208059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26908 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/devtools/js/devtools.js | 8 | ||||
| -rw-r--r-- | webkit/glue/devtools/js/inspector_controller_impl.js | 10 |
2 files changed, 8 insertions, 10 deletions
diff --git a/webkit/glue/devtools/js/devtools.js b/webkit/glue/devtools/js/devtools.js index 8e1cd80..c1418f0 100644 --- a/webkit/glue/devtools/js/devtools.js +++ b/webkit/glue/devtools/js/devtools.js @@ -379,6 +379,14 @@ InjectedScriptAccess.getProperties = function( })() +InjectedScriptAccess.evaluateInCallFrame = function(callFrameId, code, + callback) +{ + devtools.tools.getDebuggerAgent().evaluateInCallFrame( + callFrameId, code, callback); +}; + + WebInspector.resourceTrackingWasEnabled = function() { InspectorController.resourceTrackingEnabled_ = true; diff --git a/webkit/glue/devtools/js/inspector_controller_impl.js b/webkit/glue/devtools/js/inspector_controller_impl.js index f642194..2b9f10a 100644 --- a/webkit/glue/devtools/js/inspector_controller_impl.js +++ b/webkit/glue/devtools/js/inspector_controller_impl.js @@ -227,16 +227,6 @@ devtools.InspectorControllerImpl.prototype.stopProfiling = function() { /** * @override */ -devtools.InspectorControllerImpl.prototype.evaluateInCallFrame = - function(callFrameId, code, callback) { - devtools.tools.getDebuggerAgent().evaluateInCallFrame(callFrameId, code, - callback); -}; - - -/** - * @override - */ devtools.InspectorControllerImpl.prototype.dispatchOnInjectedScript = function( callId, methodName, argsString) { var callback = function(result, isException) { |