[webkit-changes] [152507] branches/safari-537-branch

Tue, 09 Jul 2013 11:30:25 -0700

Title: [152507] branches/safari-537-branch

Diff

Modified: branches/safari-537-branch/LayoutTests/ChangeLog (152506 => 152507)


--- branches/safari-537-branch/LayoutTests/ChangeLog	2013-07-09 18:27:04 UTC (rev 152506)
+++ branches/safari-537-branch/LayoutTests/ChangeLog	2013-07-09 18:30:38 UTC (rev 152507)
@@ -1,5 +1,24 @@
 2013-07-09  Lucas Forschler  <[email protected]>
 
+        Merge r152424
+
+    2013-07-05  Zalan Bujtas  <[email protected]>
+
+            iframe constrained by max-width in full screen
+            https://bugs.webkit.org/show_bug.cgi?id=118250
+
+            Reviewed by Antti Koivisto.
+
+            Ensure that contents inside iframe can go full screen properly.
+
+            Set max-width and max-height values to the default 'none', so that iframes are not
+            constrained when entering full screen.
+
+            * fullscreen/full-screen-iframe-with-max-width-height-expected.txt: Added.
+            * fullscreen/full-screen-iframe-with-max-width-height.html: Added.
+
+2013-07-09  Lucas Forschler  <[email protected]>
+
         Merge r152422
 
     2013-07-05  Eric Carlson  <[email protected]>

Copied: branches/safari-537-branch/LayoutTests/fullscreen/full-screen-iframe-with-max-width-height-expected.txt (from rev 152424, trunk/LayoutTests/fullscreen/full-screen-iframe-with-max-width-height-expected.txt) (0 => 152507)


--- branches/safari-537-branch/LayoutTests/fullscreen/full-screen-iframe-with-max-width-height-expected.txt	                        (rev 0)
+++ branches/safari-537-branch/LayoutTests/fullscreen/full-screen-iframe-with-max-width-height-expected.txt	2013-07-09 18:30:38 UTC (rev 152507)
@@ -0,0 +1,4 @@
+
+EVENT(webkitfullscreenchange) TEST(frame.getBoundingClientRect().right == document.body.getBoundingClientRect().right && frame.getBoundingClientRect().bottom == document.body.getBoundingClientRect().bottom) OK
+END OF TEST
+

Copied: branches/safari-537-branch/LayoutTests/fullscreen/full-screen-iframe-with-max-width-height.html (from rev 152424, trunk/LayoutTests/fullscreen/full-screen-iframe-with-max-width-height.html) (0 => 152507)


--- branches/safari-537-branch/LayoutTests/fullscreen/full-screen-iframe-with-max-width-height.html	                        (rev 0)
+++ branches/safari-537-branch/LayoutTests/fullscreen/full-screen-iframe-with-max-width-height.html	2013-07-09 18:30:38 UTC (rev 152507)
@@ -0,0 +1,17 @@
+<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');
+        // 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");
+            runWithKeyDown(function(){ testDiv.webkitRequestFullScreen(); });
+        }
+    </script>
+</body>

Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (152506 => 152507)


--- branches/safari-537-branch/Source/WebCore/ChangeLog	2013-07-09 18:27:04 UTC (rev 152506)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog	2013-07-09 18:30:38 UTC (rev 152507)
@@ -1,5 +1,26 @@
 2013-07-09  Lucas Forschler  <[email protected]>
 
+        Merge r152424
+
+    2013-07-05  Zalan Bujtas  <[email protected]>
+
+            iframe constrained by max-width in full screen
+            https://bugs.webkit.org/show_bug.cgi?id=118250
+
+            Reviewed by Antti Koivisto.
+
+            Ensure that contents inside iframe can go full screen properly.
+
+            Set max-width and max-height values to the default 'none', so that iframes are not
+            constrained when entering full screen.
+
+            Test: fullscreen/full-screen-iframe-with-max-width-height.html
+
+            * css/fullscreen.css:
+            (iframe:-webkit-full-screen):
+
+2013-07-09  Lucas Forschler  <[email protected]>
+
         Merge r152422
 
     2013-07-05  Eric Carlson  <[email protected]>

Modified: branches/safari-537-branch/Source/WebCore/css/fullscreen.css (152506 => 152507)


--- branches/safari-537-branch/Source/WebCore/css/fullscreen.css	2013-07-09 18:27:04 UTC (rev 152506)
+++ branches/safari-537-branch/Source/WebCore/css/fullscreen.css	2013-07-09 18:30:38 UTC (rev 152507)
@@ -51,4 +51,6 @@
     width: 100% !important;
     left: 0 !important;
     top: 0 !important;
+    max-width: none !important;
+    max-height: none !important;
 }

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to