Title: [88347] trunk/LayoutTests
Revision
88347
Author
apav...@chromium.org
Date
2011-06-08 07:52:16 -0700 (Wed, 08 Jun 2011)

Log Message

2011-06-08  Alexander Pavlov  <apav...@chromium.org>

        [Qt, Chromium] Unreviewed attempt to fix tests on Qt and Chromium.

        * inspector/styles/styles-disable-then-change.html:
        * inspector/styles/styles-disable-then-enable.html:
        * inspector/styles/styles-update-from-js.html:
        * inspector/styles/up-down-numerics-and-colors.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (88346 => 88347)


--- trunk/LayoutTests/ChangeLog	2011-06-08 14:12:52 UTC (rev 88346)
+++ trunk/LayoutTests/ChangeLog	2011-06-08 14:52:16 UTC (rev 88347)
@@ -1,5 +1,14 @@
 2011-06-08  Alexander Pavlov  <apav...@chromium.org>
 
+        [Qt, Chromium] Unreviewed attempt to fix tests on Qt and Chromium.
+
+        * inspector/styles/styles-disable-then-change.html:
+        * inspector/styles/styles-disable-then-enable.html:
+        * inspector/styles/styles-update-from-js.html:
+        * inspector/styles/up-down-numerics-and-colors.html:
+
+2011-06-08  Alexander Pavlov  <apav...@chromium.org>
+
         [Qt] Unreviewed, attempt to make test pass on Qt.
 
         * inspector/styles/styles-update-from-js.html:

Modified: trunk/LayoutTests/inspector/styles/styles-disable-then-change.html (88346 => 88347)


--- trunk/LayoutTests/inspector/styles/styles-disable-then-change.html	2011-06-08 14:12:52 UTC (rev 88346)
+++ trunk/LayoutTests/inspector/styles/styles-disable-then-change.html	2011-06-08 14:52:16 UTC (rev 88347)
@@ -26,7 +26,7 @@
 
         var treeItem = InspectorTest.getElementStylePropertyTreeItem("font-weight");
         treeItem.applyStyleText("color: green", true);
-        InspectorTest.runAfterPendingDispatches(step3);
+        InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step3);
     }
 
     function step3()

Modified: trunk/LayoutTests/inspector/styles/styles-disable-then-enable.html (88346 => 88347)


--- trunk/LayoutTests/inspector/styles/styles-disable-then-enable.html	2011-06-08 14:12:52 UTC (rev 88346)
+++ trunk/LayoutTests/inspector/styles/styles-disable-then-enable.html	2011-06-08 14:52:16 UTC (rev 88347)
@@ -16,7 +16,7 @@
         InspectorTest.dumpStyleTreeItem(treeItem, "");
 
         treeItem.toggleEnabled({ target: { checked: false } });
-        InspectorTest.runAfterPendingDispatches(step2);
+        InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step2);
     }
 
     function step2()
@@ -26,7 +26,7 @@
         InspectorTest.dumpStyleTreeItem(treeItem, "");
 
         treeItem.toggleEnabled({ target: { checked: true } });
-        InspectorTest.runAfterPendingDispatches(step3);
+        InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step3);
     }
 
     function step3()

Modified: trunk/LayoutTests/inspector/styles/styles-update-from-js.html (88346 => 88347)


--- trunk/LayoutTests/inspector/styles/styles-update-from-js.html	2011-06-08 14:12:52 UTC (rev 88346)
+++ trunk/LayoutTests/inspector/styles/styles-update-from-js.html	2011-06-08 14:52:16 UTC (rev 88347)
@@ -29,26 +29,31 @@
 
     function snifferCallback()
     {
-        switch (sniffCount++) {
-            case 0:
-                InspectorTest.evaluateInPage("modifyStyleAttribute()");
-                break;
-            case 1:
-                InspectorTest.addResult("Modified \"style\" attribute");
-                dumpAttributeAndStyles();
-                InspectorTest.evaluateInPage("modifyCSSText()");
-                break;
-            case 2:
-                InspectorTest.addResult("Modified cssText");
-                dumpAttributeAndStyles();
-                InspectorTest.evaluateInPage("modifyParsedAttributes()");
-                break;
-            case 3:
-                InspectorTest.addResult("Modified parsed attributes");
-                dumpAttributeAndStyles();
-                InspectorTest.completeTest();
-                break;
+        function innerCallback()
+        {
+            switch (sniffCount++) {
+                case 0:
+                    InspectorTest.evaluateInPage("modifyStyleAttribute()");
+                    break;
+                case 1:
+                    InspectorTest.addResult("Modified \"style\" attribute");
+                    dumpAttributeAndStyles();
+                    InspectorTest.evaluateInPage("modifyCSSText()");
+                    break;
+                case 2:
+                    InspectorTest.addResult("Modified cssText");
+                    dumpAttributeAndStyles();
+                    InspectorTest.evaluateInPage("modifyParsedAttributes()");
+                    break;
+                case 3:
+                    InspectorTest.addResult("Modified parsed attributes");
+                    dumpAttributeAndStyles();
+                    InspectorTest.completeTest();
+                    break;
+            }
         }
+
+        InspectorTest.runAfterPendingDispatches(innerCallback);
     }
 
     function dumpAttributeAndStyles()

Modified: trunk/LayoutTests/inspector/styles/up-down-numerics-and-colors.html (88346 => 88347)


--- trunk/LayoutTests/inspector/styles/up-down-numerics-and-colors.html	2011-06-08 14:12:52 UTC (rev 88346)
+++ trunk/LayoutTests/inspector/styles/up-down-numerics-and-colors.html	2011-06-08 14:52:16 UTC (rev 88347)
@@ -20,7 +20,8 @@
     InspectorTest.runTestSuite([
         function testInit1(next)
         {
-            InspectorTest.selectNodeWithId("inspected", next);
+            InspectorTest.selectNodeWithId("inspected");
+            InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", next);
         },
 
         function testInit2(next)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to