[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[joepeck at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 1596738e84c303189be7072b3828a11340612074
Author: joepeck at webkit.org <joepeck at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 28 06:43:00 2009 +0000

    2009-10-27  Joseph Pecoraro  <joepeck at webkit.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: Move runAfterPendingDispatches to TestController for Clarity
            https://bugs.webkit.org/show_bug.cgi?id=30844
    
            * inspector/front-end/TestController.js:
            (WebInspector.TestController.prototype.runAfterPendingDispatches):
            * inspector/front-end/inspector.js: moved runAfterPendingDispatches
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50199 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index db9df1a..e593cff 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-27  Joseph Pecoraro  <joepeck at webkit.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: Move runAfterPendingDispatches to TestController for Clarity
+        https://bugs.webkit.org/show_bug.cgi?id=30844
+
+        * inspector/console-format-collections.html: updated to reflect TestController change
+
 2009-10-27  Chris Fleizach  <cfleizach at apple.com>
 
         No review.
diff --git a/LayoutTests/inspector/console-format-collections.html b/LayoutTests/inspector/console-format-collections.html
index 35a96df..93154b9 100644
--- a/LayoutTests/inspector/console-format-collections.html
+++ b/LayoutTests/inspector/console-format-collections.html
@@ -62,7 +62,7 @@ Tests that console nicely formats HTML Collections and NodeLists.
 function dumpMessages(testController)
 {
     testController.waitUntilDone();
-    WebInspector.runAfterPendingDispatches(function() {
+    testController.runAfterPendingDispatches(function() {
         var result = [];
         var messages = WebInspector.console.messages;
         for (var i = 0; i < messages.length; ++i)
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4848555..36bd52c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-27  Joseph Pecoraro  <joepeck at webkit.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: Move runAfterPendingDispatches to TestController for Clarity
+        https://bugs.webkit.org/show_bug.cgi?id=30844
+
+        * inspector/front-end/TestController.js:
+        (WebInspector.TestController.prototype.runAfterPendingDispatches):
+        * inspector/front-end/inspector.js: moved runAfterPendingDispatches
+
 2009-10-27  Darin Fisher  <darin at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/inspector/front-end/TestController.js b/WebCore/inspector/front-end/TestController.js
index 8da59e7..12e1ac7 100644
--- a/WebCore/inspector/front-end/TestController.js
+++ b/WebCore/inspector/front-end/TestController.js
@@ -44,6 +44,16 @@ WebInspector.TestController.prototype = {
     {
         var message = typeof result === "undefined" ? "<undefined>" : JSON.stringify(result);
         InspectorController.didEvaluateForTestInFrontend(this._callId, message);
+    },
+
+    runAfterPendingDispatches: function(callback)
+    {
+        if (WebInspector.pendingDispatches === 0) {
+            callback();
+            return;
+        }
+
+        setTimeout(this.runAfterPendingDispatches.bind(this), 0, callback);
     }
 }
 
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index da6697c..424139f 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -504,16 +504,6 @@ WebInspector.dispatch = function() {
     setTimeout(delayDispatch, 0);
 }
 
-WebInspector.runAfterPendingDispatches = function(callback)
-{
-    if (WebInspector.pendingDispatches === 0) {
-        callback();
-        return;
-    }
-
-    setTimeout(WebInspector.runAfterPendingDispatches, 0, callback);
-}
-
 WebInspector.windowUnload = function(event)
 {
     InspectorController.windowUnloading();

-- 
WebKit Debian packaging