summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/devtools/js/devtools.js8
-rw-r--r--webkit/glue/devtools/js/inspector_controller_impl.js10
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) {