Title: [153557] branches/safari-537-branch/LayoutTests
- Revision
- 153557
- Author
- [email protected]
- Date
- 2013-07-31 18:25:21 -0700 (Wed, 31 Jul 2013)
Log Message
Merge r152847
2013-07-18 Zalan Bujtas <[email protected]>
fullscreen/full-screen-iframe-with-max-width-height.html is flaky
https://bugs.webkit.org/show_bug.cgi?id=118820
Reviewed by Andreas Kling.
Don't start the test until after the iframe has finished loading.
* fullscreen/full-screen-iframe-with-max-width-height-expected.txt:
* fullscreen/full-screen-iframe-with-max-width-height.html:
* platform/mac/TestExpectations:
Modified Paths
Diff
Modified: branches/safari-537-branch/LayoutTests/ChangeLog (153556 => 153557)
--- branches/safari-537-branch/LayoutTests/ChangeLog 2013-08-01 01:09:25 UTC (rev 153556)
+++ branches/safari-537-branch/LayoutTests/ChangeLog 2013-08-01 01:25:21 UTC (rev 153557)
@@ -1,3 +1,20 @@
+2013-07-31 Simon Fraser <[email protected]>
+
+ Merge r152847
+
+ 2013-07-18 Zalan Bujtas <[email protected]>
+
+ fullscreen/full-screen-iframe-with-max-width-height.html is flaky
+ https://bugs.webkit.org/show_bug.cgi?id=118820
+
+ Reviewed by Andreas Kling.
+
+ Don't start the test until after the iframe has finished loading.
+
+ * fullscreen/full-screen-iframe-with-max-width-height-expected.txt:
+ * fullscreen/full-screen-iframe-with-max-width-height.html:
+ * platform/mac/TestExpectations:
+
2013-07-31 Lucas Forschler <[email protected]>
Merge r153511
Modified: branches/safari-537-branch/LayoutTests/fullscreen/full-screen-iframe-with-max-width-height-expected.txt (153556 => 153557)
--- branches/safari-537-branch/LayoutTests/fullscreen/full-screen-iframe-with-max-width-height-expected.txt 2013-08-01 01:09:25 UTC (rev 153556)
+++ branches/safari-537-branch/LayoutTests/fullscreen/full-screen-iframe-with-max-width-height-expected.txt 2013-08-01 01:25:21 UTC (rev 153557)
@@ -1,4 +1,4 @@
-EVENT(webkitfullscreenchange) TEST(frame.getBoundingClientRect().right == document.body.getBoundingClientRect().right && frame.getBoundingClientRect().bottom == document.body.getBoundingClientRect().bottom) OK
+EVENT(webkitfullscreenchange) TEST(testFrame.getBoundingClientRect().right == document.body.getBoundingClientRect().right && testFrame.getBoundingClientRect().bottom == document.body.getBoundingClientRect().bottom) OK
END OF TEST
Modified: branches/safari-537-branch/LayoutTests/fullscreen/full-screen-iframe-with-max-width-height.html (153556 => 153557)
--- branches/safari-537-branch/LayoutTests/fullscreen/full-screen-iframe-with-max-width-height.html 2013-08-01 01:09:25 UTC (rev 153556)
+++ branches/safari-537-branch/LayoutTests/fullscreen/full-screen-iframe-with-max-width-height.html 2013-08-01 01:25:21 UTC (rev 153557)
@@ -1,17 +1,25 @@
-<body style="margin: 0px;">
- <iframe id='fullscreenFrame' src='' style='max-width: 10px; max-height: 10px;' frameborder='0' webkitallowfullscreen></iframe>
- <script src=''></script>
- <script>
- var frame = document.getElementById('fullscreenFrame');
- var testDiv = frame.contentWindow.document.getElementById('testDiv');
+<html>
+<head>
+ <script>
+ var testFrame;
+ var testDiv;
+
+ function runTest() {
+ testFrame = document.getElementById('fullscreenFrame');
+ testDiv = testFrame.contentWindow.document.getElementById('testDiv');
// Bail out early if the full screen API is not enabled or is missing:
if (Element.prototype.webkitRequestFullScreen == undefined) {
logResult(false, "Element.prototype.webkitRequestFullScreen == undefined");
endTest();
} else {
// Test if the iframe expands full screen when max-width/max-height are set.
- waitForEventTestAndEnd(document, 'webkitfullscreenchange', "frame.getBoundingClientRect().right == document.body.getBoundingClientRect().right && frame.getBoundingClientRect().bottom == document.body.getBoundingClientRect().bottom");
+ waitForEventTestAndEnd(document, 'webkitfullscreenchange', "testFrame.getBoundingClientRect().right == document.body.getBoundingClientRect().right && testFrame.getBoundingClientRect().bottom == document.body.getBoundingClientRect().bottom");
runWithKeyDown(function(){ testDiv.webkitRequestFullScreen(); });
}
- </script>
+ }
+ </script>
+ <script src=''></script>
+</head>
+<body style="margin: 0px;">
+ <iframe _onload_='runTest();' id='fullscreenFrame' src='' style='max-width: 10px; max-height: 10px;' frameborder='0' webkitallowfullscreen></iframe>
</body>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
