Chromium Code Reviews Chromium Code Reviews
Issue 457663002:
Convert more fullscreen tests to reftests (Closed)
Base URL: svn://svn.chromium.org/blink/trunk| Index: LayoutTests/fullscreen/full-screen-placeholder.html |
| diff --git a/LayoutTests/fullscreen/full-screen-placeholder.html b/LayoutTests/fullscreen/full-screen-placeholder.html |
| index 60a1c5ffc8691c22c2eb3deb9851585aed809195..20a92b5438c8f6d1dfdf85279bda2b3ef8f0759d 100644 |
| --- a/LayoutTests/fullscreen/full-screen-placeholder.html |
| +++ b/LayoutTests/fullscreen/full-screen-placeholder.html |
| @@ -1,6 +1,10 @@ |
| +<!DOCTYPE html> |
| +<script> |
| + var runPixelTests = true; |
| +</script> |
| <script src="full-screen-test.js"></script> |
| <style> |
| -#float { |
| +#float { |
| margin: 10px 0 0 10px; |
| height: 50px; |
| width: 50px; |
| @@ -10,61 +14,50 @@ |
| #clear { |
| clear:left; |
| } |
| -#one { |
| - background-color: lightblue; |
| +#one { |
| + background-color: lightblue; |
| float: left; |
| } |
| -#two { |
| +#two { |
| background-color: lightgreen; |
| } |
| </style> |
| <body> |
| -<div>This layout test checks that the offset positions of the blue and green divs does not change when the red div enters full-screen mode. Press <button onclick="document.getElementById('float').webkitRequestFullScreen()">go full-screen</a> to begin.</div> |
|
falken
2014/08/11 02:34:04
I don't feel too strongly about it but I find thes
philipj_slow
2014/08/11 11:22:08
Having dummy buttons in the expected results felt
falken
2014/08/12 00:17:59
I see, thanks for bringing them back. goFullScreen
|
| +<div>This layout test checks that the offset positions of the blue and green divs does not change when the red div enters full-screen mode.</div> |
| <div id="float"></div> |
| <div id="one">One</div> |
| <div id="clear" /> |
| <span id="two">Two</span> |
| <script> |
| - var one = document.getElementById('one'); |
| - var two = document.getElementById('two'); |
| - |
| // 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 { |
| - var oneState = {'offsetLeft': one.offsetLeft, 'offsetTop': one.offsetTop }; |
| - var twoState = {'offsetLeft': two.offsetLeft, 'offsetTop': two.offsetTop }; |
| - |
| - |
| var callback; |
| var fullscreenChanged = function(event) |
| { |
| if (callback) |
| callback(event) |
| }; |
| - waitForEvent(document, 'webkitfullscreenchange', fullscreenChanged); |
| - |
| - var div = document.getElementById('float'); |
| + document.onwebkitfullscreenchange = fullscreenChanged; |
| - var divEnteredFullScreen = function() { |
| - testExpected("document.webkitCurrentFullScreenElement", div); |
| - testExpected("one.offsetLeft", oneState.offsetLeft); |
| - testExpected("one.offsetTop", oneState.offsetTop); |
| - testExpected("two.offsetLeft", twoState.offsetLeft); |
| - testExpected("two.offsetTop", twoState.offsetTop); |
| - callback = cancelledFullScreen; |
| - runWithKeyDown(function(){document.webkitCancelFullScreen()}); |
| + var div = document.getElementById("float"); |
| + |
| + var divEnteredFullScreen = function() |
| + { |
| + if (document.webkitCurrentFullScreenElement == div) { |
| + callback = cancelledFullScreen; |
| + runWithKeyDown(function(){document.webkitCancelFullScreen()}); |
| + } |
| }; |
| - |
| - var cancelledFullScreen = function() { |
| - testExpected("document.webkitCurrentFullScreenElement", null); |
| - testExpected("one.offsetLeft", oneState.offsetLeft); |
| - testExpected("one.offsetTop", oneState.offsetTop); |
| - testExpected("two.offsetLeft", twoState.offsetLeft); |
| - testExpected("two.offsetTop", twoState.offsetTop); |
| - callback = null; |
| - endTest(); |
| + |
| + var cancelledFullScreen = function() |
| + { |
| + if (document.webkitCurrentFullScreenElement == null) { |
| + callback = null; |
| + endTest(); |
| + } |
| }; |
| callback = divEnteredFullScreen; |
