From c41c46b8df74b1987afef3eb79894ebb95c8fc12 Mon Sep 17 00:00:00 2001
From: "commit-queue@webkit.org"
 <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon, 16 Apr 2012 15:51:07 +0000
Subject: [PATCH] [Qt] LayoutTest: Replace setTimeout with synchronous layout
 for frame flattening where possible.
 https://bugs.webkit.org/show_bug.cgi?id=84028

Patch by Zalan Bujtas <zbujtas@gmail.com> on 2012-04-16
Reviewed by Kenneth Rohde Christiansen.

It's safer (and faster) to force synchronous layout, than expecting a layout before setTimout(0) hits.

* fast/frames/flattening/crash-svg-document.html: Remove extra line so that non-svg builds don't report failure.
* fast/frames/flattening/frameset-flattening-advanced.html:
* fast/frames/flattening/frameset-flattening-grid.html:
* fast/frames/flattening/frameset-flattening-subframesets.html:
* fast/frames/flattening/iframe-flattening-fixed-height.html:
* fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling-with-js-forced-layout.html:
* fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling.html:
* fast/frames/flattening/iframe-flattening-fixed-width-and-height-zero-size.html:
* fast/frames/flattening/iframe-flattening-fixed-width.html:
* fast/frames/flattening/iframe-flattening-nested.html:
* fast/frames/flattening/iframe-flattening-offscreen.html:
* fast/frames/flattening/iframe-flattening-out-of-view-scroll-and-relayout.html:
* fast/frames/flattening/iframe-flattening-out-of-view.html:
* fast/frames/flattening/iframe-flattening-selection-crash.html:
* fast/frames/flattening/iframe-flattening-simple.html:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@114262 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 LayoutTests/ChangeLog                              | 25 +++++++++++++++++
 .../fast/frames/flattening/crash-svg-document.html |  4 +--
 .../flattening/frameset-flattening-advanced.html   | 13 +++------
 .../flattening/frameset-flattening-grid.html       | 17 +++++-------
 .../frameset-flattening-subframesets.html          | 13 +++------
 .../flattening/iframe-flattening-fixed-height.html | 13 +++------
 ...-height-no-scrolling-with-js-forced-layout.html | 13 +++------
 ...tening-fixed-width-and-height-no-scrolling.html | 13 +++------
 ...lattening-fixed-width-and-height-zero-size.html | 31 +++++++++++-----------
 .../flattening/iframe-flattening-fixed-width.html  | 13 +++------
 .../flattening/iframe-flattening-nested.html       | 13 +++------
 .../flattening/iframe-flattening-offscreen.html    | 13 +++------
 ...flattening-out-of-view-scroll-and-relayout.html |  2 +-
 .../flattening/iframe-flattening-out-of-view.html  | 13 +++------
 .../iframe-flattening-selection-crash.html         | 19 +++++--------
 .../flattening/iframe-flattening-simple.html       | 13 +++------
 16 files changed, 95 insertions(+), 133 deletions(-)

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 152f1ca..e568f33 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,28 @@
+2012-04-16  Zalan Bujtas  <zbujtas@gmail.com>
+
+        [Qt] LayoutTest: Replace setTimeout with synchronous layout for frame flattening where possible.
+        https://bugs.webkit.org/show_bug.cgi?id=84028
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        It's safer (and faster) to force synchronous layout, than expecting a layout before setTimout(0) hits.
+
+        * fast/frames/flattening/crash-svg-document.html: Remove extra line so that non-svg builds don't report failure.
+        * fast/frames/flattening/frameset-flattening-advanced.html:
+        * fast/frames/flattening/frameset-flattening-grid.html:
+        * fast/frames/flattening/frameset-flattening-subframesets.html:
+        * fast/frames/flattening/iframe-flattening-fixed-height.html:
+        * fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling-with-js-forced-layout.html:
+        * fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling.html:
+        * fast/frames/flattening/iframe-flattening-fixed-width-and-height-zero-size.html:
+        * fast/frames/flattening/iframe-flattening-fixed-width.html:
+        * fast/frames/flattening/iframe-flattening-nested.html:
+        * fast/frames/flattening/iframe-flattening-offscreen.html:
+        * fast/frames/flattening/iframe-flattening-out-of-view-scroll-and-relayout.html:
+        * fast/frames/flattening/iframe-flattening-out-of-view.html:
+        * fast/frames/flattening/iframe-flattening-selection-crash.html:
+        * fast/frames/flattening/iframe-flattening-simple.html:
+
 2012-04-16  Uday Kiran  <udaykiran@motorola.com>
 
         CSS3 Selectors failures on css3test.com
diff --git a/LayoutTests/fast/frames/flattening/crash-svg-document.html b/LayoutTests/fast/frames/flattening/crash-svg-document.html
index fe7ac42..eb03ea1 100644
--- a/LayoutTests/fast/frames/flattening/crash-svg-document.html
+++ b/LayoutTests/fast/frames/flattening/crash-svg-document.html
@@ -7,6 +7,4 @@ if (window.layoutTestController) {
 }
 
 </script>
-<iframe src="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg'></svg>"></iframe>
-Should not crash.
-</body>
\ No newline at end of file
+<iframe src="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg'></svg>"></iframe>Should not crash.</body>
diff --git a/LayoutTests/fast/frames/flattening/frameset-flattening-advanced.html b/LayoutTests/fast/frames/flattening/frameset-flattening-advanced.html
index 1d6d248..7cf994e 100644
--- a/LayoutTests/fast/frames/flattening/frameset-flattening-advanced.html
+++ b/LayoutTests/fast/frames/flattening/frameset-flattening-advanced.html
@@ -1,17 +1,12 @@
 <html>
 <head>
     <script type="text/javascript">
-        if (window.layoutTestController) {
-            layoutTestController.waitUntilDone();
-            layoutTestController.setFrameFlatteningEnabled(true);
-        }
-
         function test()
         {
-            setTimeout(function() {
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
-            }, 0);
+            if (window.layoutTestController)
+                layoutTestController.setFrameFlatteningEnabled(true);
+            // Force synchronous layout.
+            document.body.offsetHeight;
         }
     </script>
 </head>
diff --git a/LayoutTests/fast/frames/flattening/frameset-flattening-grid.html b/LayoutTests/fast/frames/flattening/frameset-flattening-grid.html
index de178d1..957c2ed 100644
--- a/LayoutTests/fast/frames/flattening/frameset-flattening-grid.html
+++ b/LayoutTests/fast/frames/flattening/frameset-flattening-grid.html
@@ -1,18 +1,13 @@
 <html>
 <head>
     <script type="text/javascript">
-        if (window.layoutTestController) {
-            layoutTestController.waitUntilDone();
+    function test()
+    {
+        if (window.layoutTestController)
             layoutTestController.setFrameFlatteningEnabled(true);
-        }
-
-        function test()
-        {
-            setTimeout(function() {
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
-            }, 0);
-        }
+        // Force synchronous layout.
+        document.body.offsetHeight;
+    }
     </script>
 </head>
 <frameset border=0 rows="100,400" cols="300,300" onload="test()">
diff --git a/LayoutTests/fast/frames/flattening/frameset-flattening-subframesets.html b/LayoutTests/fast/frames/flattening/frameset-flattening-subframesets.html
index 693f639..723198c 100644
--- a/LayoutTests/fast/frames/flattening/frameset-flattening-subframesets.html
+++ b/LayoutTests/fast/frames/flattening/frameset-flattening-subframesets.html
@@ -1,17 +1,12 @@
 <html>
 <head>
     <script type="text/javascript">
-        if (window.layoutTestController) {
-            layoutTestController.waitUntilDone();
-            layoutTestController.setFrameFlatteningEnabled(true);
-        }
-
         function test()
         {
-            setTimeout(function() {
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
-            }, 0);
+            if (window.layoutTestController)
+                layoutTestController.setFrameFlatteningEnabled(true);
+            // Force synchronous layout.
+            document.body.offsetHeight;
         }
     </script>
 </head>
diff --git a/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-height.html b/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-height.html
index 17e6117..0237c78 100644
--- a/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-height.html
+++ b/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-height.html
@@ -1,17 +1,12 @@
 <html>
 <head>
     <script type="text/javascript">
-        if (window.layoutTestController) {
-            layoutTestController.waitUntilDone();
-            layoutTestController.setFrameFlatteningEnabled(true);
-        }
-
         function test()
         {
-            setTimeout(function() {
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
-            }, 0);
+            if (window.layoutTestController)
+                layoutTestController.setFrameFlatteningEnabled(true);
+            // Force synchronous layout.
+            document.body.offsetHeight;
         }
     </script>
 </head>
diff --git a/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling-with-js-forced-layout.html b/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling-with-js-forced-layout.html
index 142febb..880a9e5 100644
--- a/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling-with-js-forced-layout.html
+++ b/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling-with-js-forced-layout.html
@@ -1,18 +1,13 @@
 <html>
 <head>
     <script type="text/javascript">
-        if (window.layoutTestController) {
-            layoutTestController.waitUntilDone();
-            layoutTestController.dumpAsText();
-            layoutTestController.setFrameFlatteningEnabled(true);
-        }
 
         function test()
         {
-            setTimeout(function() {
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
-            }, 0);
+            if (window.layoutTestController) {
+                layoutTestController.dumpAsText();
+                layoutTestController.setFrameFlatteningEnabled(true);
+            }
         }
     </script>
 </head>
diff --git a/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling.html b/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling.html
index 440c684..fb86714 100644
--- a/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling.html
+++ b/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling.html
@@ -1,17 +1,12 @@
 <html>
 <head>
     <script type="text/javascript">
-        if (window.layoutTestController) {
-            layoutTestController.waitUntilDone();
-            layoutTestController.setFrameFlatteningEnabled(true);
-        }
-
         function test()
         {
-            setTimeout(function() {
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
-            }, 0);
+            if (window.layoutTestController)
+                layoutTestController.setFrameFlatteningEnabled(true);
+            // Force synchronous layout.
+            document.body.offsetHeight;
         }
     </script>
 </head>
diff --git a/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-zero-size.html b/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-zero-size.html
index 8811f9a..82c9f6f 100644
--- a/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-zero-size.html
+++ b/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-zero-size.html
@@ -1,25 +1,24 @@
 <html>
 <head>
     <script type="text/javascript">
-        if (window.layoutTestController) {
-            layoutTestController.dumpAsText();
-            layoutTestController.waitUntilDone();
-            layoutTestController.setFrameFlatteningEnabled(true);
-        }
 
         function test()
         {
-            setTimeout(function() {
-                var theframe = document.getElementById("theframe");
-                var width = parseInt(getComputedStyle(theframe).width);
-                var height = parseInt(getComputedStyle(theframe).height);
-                var pass = false;
-                if (width == 0 && height == 0)
-                    pass = true;
-                document.getElementById("console").innerText = pass ? "PASS" : "FAIL";
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
-            }, 0);
+            if (window.layoutTestController) {
+                layoutTestController.dumpAsText();
+                layoutTestController.setFrameFlatteningEnabled(true);
+            }
+
+            // Force synchronous layout.
+            document.body.offsetHeight;
+
+            var theframe = document.getElementById("theframe");
+            var width = parseInt(getComputedStyle(theframe).width);
+            var height = parseInt(getComputedStyle(theframe).height);
+            var pass = false;
+            if (width == 0 && height == 0)
+                pass = true;
+            document.getElementById("console").innerText = pass ? "PASS" : "FAIL";
         }
     </script>
 </head>
diff --git a/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width.html b/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width.html
index 549b77e..a724797 100644
--- a/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width.html
+++ b/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width.html
@@ -1,17 +1,12 @@
 <html>
 <head>
     <script type="text/javascript">
-        if (window.layoutTestController) {
-            layoutTestController.waitUntilDone();
-            layoutTestController.setFrameFlatteningEnabled(true);
-        }
-
         function test()
         {
-            setTimeout(function() {
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
-            }, 0);
+            if (window.layoutTestController)
+                layoutTestController.setFrameFlatteningEnabled(true);
+            // Force synchronous layout.
+            document.body.offsetHeight;
         }
     </script>
 </head>
diff --git a/LayoutTests/fast/frames/flattening/iframe-flattening-nested.html b/LayoutTests/fast/frames/flattening/iframe-flattening-nested.html
index 344c3f5..f0653ad 100644
--- a/LayoutTests/fast/frames/flattening/iframe-flattening-nested.html
+++ b/LayoutTests/fast/frames/flattening/iframe-flattening-nested.html
@@ -7,17 +7,12 @@
         }
     </style>
     <script type="text/javascript">
-        if (window.layoutTestController) {
-            layoutTestController.waitUntilDone();
-            layoutTestController.setFrameFlatteningEnabled(true);
-        }
-
         function test()
         {
-            setTimeout(function() {
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
-            }, 0);
+            if (window.layoutTestController)
+                layoutTestController.setFrameFlatteningEnabled(true);
+            // Force synchronous layout.
+            document.body.offsetHeight;
         }
     </script>
 </head>
diff --git a/LayoutTests/fast/frames/flattening/iframe-flattening-offscreen.html b/LayoutTests/fast/frames/flattening/iframe-flattening-offscreen.html
index 5c50b7f..a966513 100644
--- a/LayoutTests/fast/frames/flattening/iframe-flattening-offscreen.html
+++ b/LayoutTests/fast/frames/flattening/iframe-flattening-offscreen.html
@@ -1,17 +1,12 @@
 <html>
 <head>
     <script type="text/javascript">
-        if (window.layoutTestController) {
-            layoutTestController.waitUntilDone();
-            layoutTestController.setFrameFlatteningEnabled(true);
-        }
-
         function test()
         {
-            setTimeout(function() {
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
-            }, 0);
+            if (window.layoutTestController)
+                layoutTestController.setFrameFlatteningEnabled(true);
+            // Force synchronous layout.
+            document.body.offsetHeight;
         }
     </script>
 </head>
diff --git a/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view-scroll-and-relayout.html b/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view-scroll-and-relayout.html
index e427a26..a99251c 100644
--- a/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view-scroll-and-relayout.html
+++ b/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view-scroll-and-relayout.html
@@ -10,7 +10,7 @@
         {
             setTimeout(function() {
                 scrollTo(1200, 0);
-                var i = document.body.offsetWidth;
+                document.body.offsetWidth;
                 if (window.layoutTestController)
                     layoutTestController.notifyDone();
             }, 0);
diff --git a/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view.html b/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view.html
index 4fb43da..e245560 100644
--- a/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view.html
+++ b/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view.html
@@ -1,17 +1,12 @@
 <html>
 <head>
     <script type="text/javascript">
-        if (window.layoutTestController) {
-            layoutTestController.waitUntilDone();
-            layoutTestController.setFrameFlatteningEnabled(true);
-        }
-
         function test()
         {
-            setTimeout(function() {
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
-            }, 0);
+            if (window.layoutTestController)
+                layoutTestController.setFrameFlatteningEnabled(true);
+            // Force synchronous layout.
+            document.body.offsetHeight;
         }
     </script>
 </head>
diff --git a/LayoutTests/fast/frames/flattening/iframe-flattening-selection-crash.html b/LayoutTests/fast/frames/flattening/iframe-flattening-selection-crash.html
index 7f35bd3..496100f 100644
--- a/LayoutTests/fast/frames/flattening/iframe-flattening-selection-crash.html
+++ b/LayoutTests/fast/frames/flattening/iframe-flattening-selection-crash.html
@@ -1,20 +1,15 @@
 <html>
 <head>
     <script type="text/javascript">
-        if (window.layoutTestController) {
-            layoutTestController.dumpAsText();
-            layoutTestController.waitUntilDone();
-            layoutTestController.setFrameFlatteningEnabled(true);
-        }
-
-        setTimeout(function() {
-            if (window.layoutTestController)
-                layoutTestController.notifyDone();
-        }, 500);
-
         function test() {
-            if (window.layoutTestController)
+            if (window.layoutTestController) {
+                layoutTestController.dumpAsText();
                 layoutTestController.setFrameFlatteningEnabled(true);
+            }
+
+            // Force synchronous layout.
+            document.body.offsetHeight;
+
             document.getElementById("if").contentWindow.document.getElementById('in').focus();
             document.getElementById("if").contentWindow.document.getElementById('p').style.top = "20px";
         }
diff --git a/LayoutTests/fast/frames/flattening/iframe-flattening-simple.html b/LayoutTests/fast/frames/flattening/iframe-flattening-simple.html
index c2c955a..6721bb4 100644
--- a/LayoutTests/fast/frames/flattening/iframe-flattening-simple.html
+++ b/LayoutTests/fast/frames/flattening/iframe-flattening-simple.html
@@ -1,17 +1,12 @@
 <html>
 <head>
     <script type="text/javascript">
-        if (window.layoutTestController) {
-            layoutTestController.waitUntilDone();
-            layoutTestController.setFrameFlatteningEnabled(true);
-        }
-
         function test()
         {
-            setTimeout(function() {
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
-            }, 0);
+            if (window.layoutTestController)
+                layoutTestController.setFrameFlatteningEnabled(true);
+            // Force synchronous layout.
+            document.body.offsetHeight;
         }
     </script>
 </head>
-- 
2.7.4