DevTools: populate scopes with local variables when on a breakpoint. This feature was broken by one of the recent WebKit rolls.

Review URL: http://codereview.chromium.org/202021

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

2 files changed, 24 insertions, 40 deletions

diff --git a/webkit/glue/devtools/js/devtools.js b/webkit/glue/devtools/js/devtools.js
index f47d2cc..5086f80 100644
--- a/webkit/glue/devtools/js/devtools.js
+++ b/webkit/glue/devtools/js/devtools.js
@@ -291,11 +291,11 @@ WebInspector.ScriptsPanel.prototype.__defineGetter__(
 
 
 /*
- * @override	
- * TODO(mnaganov): Restore l10n when it will be agreed that it is needed.	
- */	
-WebInspector.UIString = function(string) {	
-  return String.vsprintf(string, Array.prototype.slice.call(arguments, 1));	
+ * @override
+ * TODO(mnaganov): Restore l10n when it will be agreed that it is needed.
+ */
+WebInspector.UIString = function(string) {
+  return String.vsprintf(string, Array.prototype.slice.call(arguments, 1));
 };
 
 
@@ -362,14 +362,31 @@ WebInspector.UIString = function(string) {
 })();
 
 
+(function () {
+var orig = InjectedScriptAccess.getProperties;
+InjectedScriptAccess.getProperties = function(
+    objectProxy, ignoreHasOwnProperty, callback) {
+  if (objectProxy.isScope) {
+    devtools.tools.getDebuggerAgent().resolveScope(objectProxy.objectId,
+        callback);
+  } else if (objectProxy.isV8Ref) {
+    devtools.tools.getDebuggerAgent().resolveChildren(objectProxy.objectId,
+        callback, true);
+  } else {
+    orig.apply(this, arguments);
+  }
+};
+})()
+
+
 WebInspector.resourceTrackingWasEnabled = function()
 {
     InspectorController.resourceTrackingEnabled_ = true;
     this.panels.resources.resourceTrackingWasEnabled();
-}
+};
 
 WebInspector.resourceTrackingWasDisabled = function()
 {
     InspectorController.resourceTrackingEnabled_ = false;
     this.panels.resources.resourceTrackingWasDisabled();
-}
+};
diff --git a/webkit/glue/devtools/js/inspector_controller_impl.js b/webkit/glue/devtools/js/inspector_controller_impl.js
index 359a02b..5bf19b7 100644
--- a/webkit/glue/devtools/js/inspector_controller_impl.js
+++ b/webkit/glue/devtools/js/inspector_controller_impl.js
@@ -237,24 +237,6 @@ devtools.InspectorControllerImpl.prototype.evaluateInCallFrame =
 /**
  * @override
  */
-devtools.InspectorControllerImpl.prototype.getProperties = function(
-    objectProxy, ignoreHasOwnProperty, callback) {
-  if (objectProxy.isScope) {
-    devtools.tools.getDebuggerAgent().resolveScope(objectProxy.objectId,
-        callback);
-  } else if (objectProxy.isV8Ref) {
-    devtools.tools.getDebuggerAgent().resolveChildren(objectProxy.objectId,
-        callback, true);
-  } else {
-    this.callInjectedScript_('getProperties', objectProxy,
-        ignoreHasOwnProperty, callback);
-  }
-};
-
-
-/**
- * @override
- */
 devtools.InspectorControllerImpl.prototype.dispatchOnInjectedScript = function(
     callId, methodName, argsString) {
   var callback = function(result, isException) {
@@ -270,21 +252,6 @@ devtools.InspectorControllerImpl.prototype.dispatchOnInjectedScript = function(
 
 
 /**
- * This method allows calling a methods on InjectedScript object in the
- * inspected page.
- */
-devtools.InspectorControllerImpl.prototype.callInjectedScript_ =
-    function(methodName, var_arg) {
-  var allArgs = Array.prototype.slice.call(arguments);
-  var callback = allArgs[allArgs.length - 1];
-  var args = Array.prototype.slice.call(allArgs, 0, allArgs.length - 1);
-  RemoteToolsAgent.ExecuteUtilityFunction(
-      devtools.InspectorControllerImpl.parseWrap_(callback),
-      'InjectedScript', JSON.stringify(args));
-};
-
-
-/**
  * Installs delegating handler into the inspector controller.
  * @param {string} methodName Method to install delegating handler for.
  */