Title: [141042] trunk/LayoutTests
Revision
141042
Author
[email protected]
Date
2013-01-28 20:38:18 -0800 (Mon, 28 Jan 2013)

Log Message

fix multi-touch-inside-iframes Layout test
https://bugs.webkit.org/show_bug.cgi?id=108113

Patch by Min Qin <[email protected]> on 2013-01-28
Reviewed by Adam Barth.

The ordering of OnLoad() of the 2 child iframes is racy.
Fixed by assigning title from the parent frame.

* fast/events/touch/multi-touch-inside-iframes.html:
* fast/events/touch/resources/multi-touch-inside-iframes2.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (141041 => 141042)


--- trunk/LayoutTests/ChangeLog	2013-01-29 04:37:59 UTC (rev 141041)
+++ trunk/LayoutTests/ChangeLog	2013-01-29 04:38:18 UTC (rev 141042)
@@ -1,3 +1,16 @@
+2013-01-28  Min Qin  <[email protected]>
+
+        fix multi-touch-inside-iframes Layout test
+        https://bugs.webkit.org/show_bug.cgi?id=108113
+
+        Reviewed by Adam Barth.
+
+        The ordering of OnLoad() of the 2 child iframes is racy.
+        Fixed by assigning title from the parent frame.
+
+        * fast/events/touch/multi-touch-inside-iframes.html:
+        * fast/events/touch/resources/multi-touch-inside-iframes2.html:
+
 2013-01-28  Simon Fraser  <[email protected]>
 
         position:fixed that doesn't render any content should not force compositing

Modified: trunk/LayoutTests/fast/events/touch/multi-touch-inside-iframes.html (141041 => 141042)


--- trunk/LayoutTests/fast/events/touch/multi-touch-inside-iframes.html	2013-01-29 04:37:59 UTC (rev 141041)
+++ trunk/LayoutTests/fast/events/touch/multi-touch-inside-iframes.html	2013-01-29 04:38:18 UTC (rev 141042)
@@ -106,6 +106,8 @@
 }
 
 function runTest() {
+    document.getElementById("iframe1").contentWindow.document.title = "iframe1";
+    document.getElementById("iframe2").contentWindow.document.title = "iframe2";
     if (window.eventSender) {
         eventSender.clearTouchPoints();
         // Touch the center of iframe1. 50px is offset to iframe1 in main frame,
@@ -163,11 +165,6 @@
 if (window.testRunner) {
     testRunner.waitUntilDone();
 }
-
-function getTitle() {
-    title++;
-    return  'iframe' + title;
-}
 </script>
 </body>
 </html>

Modified: trunk/LayoutTests/fast/events/touch/resources/multi-touch-inside-iframes2.html (141041 => 141042)


--- trunk/LayoutTests/fast/events/touch/resources/multi-touch-inside-iframes2.html	2013-01-29 04:37:59 UTC (rev 141041)
+++ trunk/LayoutTests/fast/events/touch/resources/multi-touch-inside-iframes2.html	2013-01-29 04:38:18 UTC (rev 141042)
@@ -6,6 +6,6 @@
 document.addEventListener("touchmove", function() { parent.onTouch(event, document.title); }, false);
 </script>
 </head>
-<body _onload_="document.title=parent.getTitle()">
+<body>
 </body>
 </html>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to