Title: [134745] trunk/Source/WebCore
Revision
134745
Author
pfeld...@chromium.org
Date
2012-11-14 22:57:37 -0800 (Wed, 14 Nov 2012)

Log Message

Not reviewed: fixing inspector tests under Qt.

* inspector/front-end/TestController.js:
* inspector/front-end/utilities.js:
(.):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (134744 => 134745)


--- trunk/Source/WebCore/ChangeLog	2012-11-15 06:51:10 UTC (rev 134744)
+++ trunk/Source/WebCore/ChangeLog	2012-11-15 06:57:37 UTC (rev 134745)
@@ -1,3 +1,11 @@
+2012-11-14  Pavel Feldman  <pfeld...@chromium.org>
+
+        Not reviewed: fixing inspector tests under Qt.
+
+        * inspector/front-end/TestController.js:
+        * inspector/front-end/utilities.js:
+        (.):
+
 2012-11-14  Kentaro Hara  <hara...@chromium.org>
 
         Unreviewed. Rebaselined run-bindings-tests.

Modified: trunk/Source/WebCore/inspector/front-end/TestController.js (134744 => 134745)


--- trunk/Source/WebCore/inspector/front-end/TestController.js	2012-11-15 06:51:10 UTC (rev 134744)
+++ trunk/Source/WebCore/inspector/front-end/TestController.js	2012-11-15 06:57:37 UTC (rev 134745)
@@ -45,6 +45,7 @@
 
 WebInspector.evaluateForTestInFrontend = function(callId, script)
 {
+    WebInspector.isUnderTest = true;
     function invokeMethod()
     {
         try {

Modified: trunk/Source/WebCore/inspector/front-end/utilities.js (134744 => 134745)


--- trunk/Source/WebCore/inspector/front-end/utilities.js	2012-11-15 06:51:10 UTC (rev 134744)
+++ trunk/Source/WebCore/inspector/front-end/utilities.js	2012-11-15 06:57:37 UTC (rev 134745)
@@ -878,6 +878,13 @@
 {
     this._observer = new WebKitMutationObserver(handler);
     NonLeakingMutationObserver._instances.push(this);
+    if (!window.testRunner && !WebInspector.isUnderTest && !NonLeakingMutationObserver._unloadListener) {
+        NonLeakingMutationObserver._unloadListener = function() {
+            while (NonLeakingMutationObserver._instances.length)
+                NonLeakingMutationObserver._instances[NonLeakingMutationObserver._instances.length - 1].disconnect();
+        };
+        window.addEventListener("unload", NonLeakingMutationObserver._unloadListener, false);
+    }
 }
 
 NonLeakingMutationObserver._instances = [];
@@ -902,10 +909,3 @@
     }
 }
 
-if (!window.testRunner) {
-    window.addEventListener("unload", function() {
-        while (NonLeakingMutationObserver._instances.length)
-            NonLeakingMutationObserver._instances[NonLeakingMutationObserver._instances.length - 1].disconnect();
-    }, false);
-}
-
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to