| 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..503b6c0204cb254e788a4589c430e0381797eb59 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,11 +14,11 @@
|
| #clear {
|
| clear:left;
|
| }
|
| -#one {
|
| - background-color: lightblue;
|
| +#one {
|
| + background-color: lightblue;
|
| float: left;
|
| }
|
| -#two {
|
| +#two {
|
| background-color: lightgreen;
|
| }
|
| </style>
|
| @@ -25,46 +29,35 @@
|
| <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;
|
|
|
Chromium Code Reviews
Issue 457663002:
Convert more fullscreen tests to reftests (Closed)
Base URL: svn://svn.chromium.org/blink/trunk