Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

1 files changed, 6 insertions, 27 deletions

diff --git a/Source/WebCore/inspector/front-end/TestController.js b/Source/WebCore/inspector/front-end/TestController.js
index 3bfe28c..e6783f9 100644
--- a/Source/WebCore/inspector/front-end/TestController.js
+++ b/Source/WebCore/inspector/front-end/TestController.js
@@ -28,40 +28,20 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-WebInspector.TestController = function(callId)
+WebInspector.TestController = function()
 {
-    this._callId = callId;
-    this._waitUntilDone = false;
-    this.results = [];
 }
 
 WebInspector.TestController.prototype = {
-    waitUntilDone: function()
+    notifyDone: function(callId, result)
     {
-        this._waitUntilDone = true;
-    },
-
-    notifyDone: function(result)
-    {
-        if (typeof result === "undefined" && this.results.length)
-            result = this.results;
         var message = typeof result === "undefined" ? "\"<undefined>\"" : JSON.stringify(result);
-        InspectorBackend.didEvaluateForTestInFrontend(this._callId, message);
-    },
-
-    runAfterPendingDispatches: function(callback)
-    {
-        if (WebInspector.pendingDispatches === 0) {
-            callback();
-            return;
-        }
-        setTimeout(this.runAfterPendingDispatches.bind(this), 0, callback);
+        InspectorAgent.didEvaluateForTestInFrontend(callId, message);
     }
 }
 
 WebInspector.evaluateForTestInFrontend = function(callId, script)
 {
-    var controller = new WebInspector.TestController(callId);
     function invokeMethod()
     {
         try {
@@ -71,11 +51,10 @@ WebInspector.evaluateForTestInFrontend = function(callId, script)
             else
                 result = window.eval(script);
 
-            if (!controller._waitUntilDone)
-                controller.notifyDone(result);
+            WebInspector.TestController.prototype.notifyDone(callId, result);
         } catch (e) {
-            controller.notifyDone(e.toString());
+            WebInspector.testController.prototype.notifyDone(callId, e.toString());
         }
     }
-    controller.runAfterPendingDispatches(invokeMethod);
+    InspectorBackend.runAfterPendingDispatches(invokeMethod);
 }