DevTools: make pause work for script evaluations

webkit/glue/devtools/js/devtools.js

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview Tools is a main class that wires all components of the
  * DevTools frontend together. It is also responsible for overriding existing
  * WebInspector functionality while it is getting upstreamed into WebCore.
  */
 goog.provide('devtools.Tools');
@@ skipping 49 matching lines @@
   this.domAgent_.reset();
   this.debuggerAgent_.reset();
 
   this.domAgent_.getDocumentElementAsync();
 };
 
 
 /**
  * @param {string} script Script exression to be evaluated in the context of the
  *     inspected page.
- * @param {function(string):undefined} callback Function to call with the
- *     result.
+ * @param {function(Object|string, boolean):undefined} opt_callback Function to call
+ *     with the result.
  */
-devtools.ToolsAgent.prototype.evaluateJavaScript = function(script, callback) {
-  var callbackId = devtools.Callback.wrap(function(result) {
-    var pair = JSON.parse(result);
-    if (callback) {
-      callback(pair[0], pair[1]);
+devtools.ToolsAgent.prototype.evaluateJavaScript = function(script,
+    opt_callback) {
+  var callbackId = devtools.Callback.wrap(function(result, exception) {
+    if (opt_callback) {
+      if (exception) {
+        opt_callback(exception, true /* result is exception */);
+      } else {
+        opt_callback(JSON.parse(result), false);
+      }
     }
   });
-  RemoteToolsAgent.ExecuteUtilityFunction(callbackId,
-      'evaluate', JSON.stringify([script]));
+  RemoteToolsAgent.EvaluateJavaScript(callbackId, script);
 };
 
 
 /**
  * @return {devtools.DebuggerAgent} Debugger agent instance.
  */
 devtools.ToolsAgent.prototype.getDebuggerAgent = function() {
   return this.debuggerAgent_;
 };
 
@@ skipping 971 matching lines @@
   };
 
   var originalDragEnd = WebInspector.elementDragEnd;
   WebInspector.elementDragEnd = function() {
     originalDragEnd.apply(this, arguments);
 
     var glassPane = document.getElementById('glass-pane-for-drag');
     glassPane.parentElement.removeChild(glassPane);
   };
 })();