Diff
Modified: trunk/LayoutTests/ChangeLog (120189 => 120190)
--- trunk/LayoutTests/ChangeLog 2012-06-13 12:31:17 UTC (rev 120189)
+++ trunk/LayoutTests/ChangeLog 2012-06-13 12:34:26 UTC (rev 120190)
@@ -1,3 +1,40 @@
+2012-06-13 Ryosuke Niwa <[email protected]>
+
+ Fonts, fullscreen, gamepad, and html5lib tests should use testRunner instead of layoutTestController
+ https://bugs.webkit.org/show_bug.cgi?id=88959
+
+ Reviewed by Darin Adler.
+
+ * fonts/valid-standard-font.html:
+ * fullscreen/anonymous-block-merge-crash.html:
+ * fullscreen/full-screen-element-stack.html:
+ * fullscreen/full-screen-frameset.html:
+ * fullscreen/full-screen-iframe-zIndex.html:
+ * fullscreen/full-screen-keyboard-disabled.html:
+ * fullscreen/full-screen-keyboard-enabled.html:
+ * fullscreen/full-screen-remove-ancestor-during-transition.html:
+ * fullscreen/full-screen-remove-sibling.html:
+ * fullscreen/full-screen-render-inline.html:
+ * fullscreen/full-screen-request-rejected.html:
+ * fullscreen/full-screen-request-removed.html:
+ * fullscreen/full-screen-restrictions.html:
+ * fullscreen/full-screen-stacking-context.html:
+ * fullscreen/full-screen-test.js:
+ (runWithKeyDown):
+ (endTest):
+ * fullscreen/full-screen-zIndex-after.html:
+ * fullscreen/full-screen-zIndex.html:
+ * fullscreen/non-ancestor-iframe.html:
+ * fullscreen/parent-flow-inline-with-block-child.html:
+ * fullscreen/video-controls-override.html:
+ * html5lib/resources/runner.js:
+ (run):
+ * html5lib/webkit-resumer.html:
+ * platform/gtk/fonts/custom-font-missing-glyphs.html:
+ * platform/gtk/fonts/font-face-with-complex-text.html:
+ * platform/gtk/fonts/font-family-fallback.html:
+ * platform/gtk/fonts/synthetic-oblique-positioning.html:
+
2012-06-13 Kristóf Kosztyó <[email protected]>
[Qt] Unreviewed gardening. Skip new failing tests.
Modified: trunk/LayoutTests/fonts/valid-standard-font.html (120189 => 120190)
--- trunk/LayoutTests/fonts/valid-standard-font.html 2012-06-13 12:31:17 UTC (rev 120189)
+++ trunk/LayoutTests/fonts/valid-standard-font.html 2012-06-13 12:34:26 UTC (rev 120190)
@@ -3,15 +3,15 @@
<!-- WebKit assumes that -webkit-body is a valid font. The font-family:inherit will crash on load if it isn't -->
<input style="font-family:inherit"/>
<script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
window.setTimeout(runTest, 0);
function runTest() {
document.getElementById("result").innerText = "PASS";
- if (window.layoutTestController) {
- layoutTestController.notifyDone();
+ if (window.testRunner) {
+ testRunner.notifyDone();
}
}
</script>
Modified: trunk/LayoutTests/fullscreen/anonymous-block-merge-crash.html (120189 => 120190)
--- trunk/LayoutTests/fullscreen/anonymous-block-merge-crash.html 2012-06-13 12:31:17 UTC (rev 120189)
+++ trunk/LayoutTests/fullscreen/anonymous-block-merge-crash.html 2012-06-13 12:34:26 UTC (rev 120190)
@@ -8,7 +8,7 @@
document._onwebkitfullscreenchange_ = function(event) {
document.body.appendChild(document.createElement('div'));
document.webkitCancelFullScreen();
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
};
runWithKeyDown(function(){span.webkitRequestFullScreen()});
Modified: trunk/LayoutTests/fullscreen/full-screen-element-stack.html (120189 => 120190)
--- trunk/LayoutTests/fullscreen/full-screen-element-stack.html 2012-06-13 12:31:17 UTC (rev 120189)
+++ trunk/LayoutTests/fullscreen/full-screen-element-stack.html 2012-06-13 12:34:26 UTC (rev 120190)
@@ -20,14 +20,14 @@
var _oneEnteredFullscreen_ = function() {
testExpected("document.webkitFullscreenElement.id", "one");
callback = twoEnteredFullscreen;
- if (window.layoutTestController)
+ if (window.testRunner)
runWithKeyDown(function() { two.webkitRequestFullscreen(); });
};
var twoEnteredFullscreen = function() {
testExpected("document.webkitFullscreenElement.id", "two");
callback = twoExitedFullscreen;
- if (window.layoutTestController)
+ if (window.testRunner)
document.webkitExitFullscreen();
};
@@ -37,7 +37,7 @@
};
callback = oneEnteredFullscreen;
- if (window.layoutTestController)
+ if (window.testRunner)
runWithKeyDown(function() { one.webkitRequestFullscreen(); });
}
</script>
@@ -54,4 +54,4 @@
<button _onclick_="document.webkitExitFullscreen()">Exit full screen (two)</button>
</div>
</div>
-</body>
\ No newline at end of file
+</body>
Modified: trunk/LayoutTests/fullscreen/full-screen-frameset.html (120189 => 120190)
--- trunk/LayoutTests/fullscreen/full-screen-frameset.html 2012-06-13 12:31:17 UTC (rev 120189)
+++ trunk/LayoutTests/fullscreen/full-screen-frameset.html 2012-06-13 12:34:26 UTC (rev 120190)
@@ -1,7 +1,7 @@
<script src=""
<script>
-if (window.layoutTestController)
- layoutTestController.dumpChildFramesAsText();
+if (window.testRunner)
+ testRunner.dumpChildFramesAsText();
var waitingFor = 2;
function runTest() {
@@ -12,8 +12,8 @@
waitForEvent(frame.contentDocument, 'webkitfullscreenchange', function() {
consoleWrite("FAIL - entered full screen!");
endTest();
- if (layoutTestController)
- layoutTestController.notifyDone();
+ if (testRunner)
+ testRunner.notifyDone();
});
runWithKeyDown(function() {
@@ -21,8 +21,8 @@
setTimeout(function() {
consoleWrite("SUCCEED - did not enter full screen!");
endTest();
- if (layoutTestController)
- layoutTestController.notifyDone();
+ if (testRunner)
+ testRunner.notifyDone();
}, 50);
frame.contentDocument.documentElement.webkitRequestFullScreen();
Modified: trunk/LayoutTests/fullscreen/full-screen-iframe-zIndex.html (120189 => 120190)
--- trunk/LayoutTests/fullscreen/full-screen-iframe-zIndex.html 2012-06-13 12:31:17 UTC (rev 120189)
+++ trunk/LayoutTests/fullscreen/full-screen-iframe-zIndex.html 2012-06-13 12:34:26 UTC (rev 120190)
@@ -49,4 +49,4 @@
Click <button _onclick_="goFullScreen()">go full screen</button> to run the test.</div>
<div id="block2"></div>
<iframe webkitallowfullscreen src="" id="block1"></iframe>
- </body>
\ No newline at end of file
+ </body>
Modified: trunk/LayoutTests/fullscreen/full-screen-keyboard-disabled.html (120189 => 120190)
--- trunk/LayoutTests/fullscreen/full-screen-keyboard-disabled.html 2012-06-13 12:31:17 UTC (rev 120189)
+++ trunk/LayoutTests/fullscreen/full-screen-keyboard-disabled.html 2012-06-13 12:34:26 UTC (rev 120190)
@@ -19,7 +19,7 @@
var spanEnteredFullScreen = function() {
callback = null;
testExpected("document.webkitIsFullScreen", true);
- if (window.layoutTestController && eventSender.keyDown) {
+ if (window.testRunner && eventSender.keyDown) {
waitForEvent(document, 'keypress', keyPressed);
eventSender.keyDown('a', []);
eventSender.keyDown(' ', []);
Modified: trunk/LayoutTests/fullscreen/full-screen-keyboard-enabled.html (120189 => 120190)
--- trunk/LayoutTests/fullscreen/full-screen-keyboard-enabled.html 2012-06-13 12:31:17 UTC (rev 120189)
+++ trunk/LayoutTests/fullscreen/full-screen-keyboard-enabled.html 2012-06-13 12:34:26 UTC (rev 120190)
@@ -19,7 +19,7 @@
var spanEnteredFullScreen = function() {
callback = null;
testExpected("document.webkitIsFullScreen", true);
- if (window.layoutTestController && eventSender.keyDown) {
+ if (window.testRunner && eventSender.keyDown) {
waitForEvent(document, 'keypress', keyPressed);
eventSender.keyDown('a', []);
}
Modified: trunk/LayoutTests/fullscreen/full-screen-remove-ancestor-during-transition.html (120189 => 120190)
--- trunk/LayoutTests/fullscreen/full-screen-remove-ancestor-during-transition.html 2012-06-13 12:31:17 UTC (rev 120189)
+++ trunk/LayoutTests/fullscreen/full-screen-remove-ancestor-during-transition.html 2012-06-13 12:34:26 UTC (rev 120190)
@@ -1,14 +1,14 @@
<script src=""
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function runWithKeyDown(fn)
{
document.addEventListener('keydown', function() { fn(); }, false);
- if (window.layoutTestController) {
+ if (window.testRunner) {
eventSender.keyDown('a');
}
}
@@ -29,8 +29,8 @@
iframe.parentNode.removeChild(iframe);
gc();
setTimeout(function () {
- if (window.layoutTestController) {
- layoutTestController.notifyDone();
+ if (window.testRunner) {
+ testRunner.notifyDone();
}
}, 0);
}, 0);
Modified: trunk/LayoutTests/fullscreen/full-screen-remove-sibling.html (120189 => 120190)
--- trunk/LayoutTests/fullscreen/full-screen-remove-sibling.html 2012-06-13 12:31:17 UTC (rev 120189)
+++ trunk/LayoutTests/fullscreen/full-screen-remove-sibling.html 2012-06-13 12:34:26 UTC (rev 120190)
@@ -24,4 +24,4 @@
}
runWithKeyDown(goFullScreen);
}
-</script>
\ No newline at end of file
+</script>
Modified: trunk/LayoutTests/fullscreen/full-screen-render-inline.html (120189 => 120190)
--- trunk/LayoutTests/fullscreen/full-screen-render-inline.html 2012-06-13 12:31:17 UTC (rev 120189)
+++ trunk/LayoutTests/fullscreen/full-screen-render-inline.html 2012-06-13 12:34:26 UTC (rev 120190)
@@ -7,8 +7,8 @@
<summary>a<span>b<div>c</div>d</span>e</summary>
<script>
if ("webkitRequestFullScreen" in Element.prototype) {
- if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+ if (window.testRunner)
+ testRunner.waitUntilDone();
document.body.offsetTop;
var span = document.getElementsByTagName('span')[0];
@@ -18,8 +18,8 @@
document.webkitCancelFullScreen();
}, 0)
} else {
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
};
Modified: trunk/LayoutTests/fullscreen/full-screen-request-rejected.html (120189 => 120190)
--- trunk/LayoutTests/fullscreen/full-screen-request-rejected.html 2012-06-13 12:31:17 UTC (rev 120189)
+++ trunk/LayoutTests/fullscreen/full-screen-request-rejected.html 2012-06-13 12:34:26 UTC (rev 120190)
@@ -11,8 +11,8 @@
logResult("Entered full screen.", false);
endTest();
});
- if (layoutTestController)
- layoutTestController.setPopupBlockingEnabled(true);
+ if (testRunner)
+ testRunner.setPopupBlockingEnabled(true);
waitForEventAndEnd(document, 'webkitfullscreenerror');
document.documentElement.webkitRequestFullScreen();
}
Modified: trunk/LayoutTests/fullscreen/full-screen-request-removed.html (120189 => 120190)
--- trunk/LayoutTests/fullscreen/full-screen-request-removed.html 2012-06-13 12:31:17 UTC (rev 120189)
+++ trunk/LayoutTests/fullscreen/full-screen-request-removed.html 2012-06-13 12:34:26 UTC (rev 120190)
@@ -12,8 +12,8 @@
consoleWrite("SUCCEED - did not enter full screen!");
});
- if (layoutTestController)
- layoutTestController.setPopupBlockingEnabled(true);
+ if (testRunner)
+ testRunner.setPopupBlockingEnabled(true);
var div = document.createElement('div');
document.documentElement.appendChild(div);
Modified: trunk/LayoutTests/fullscreen/full-screen-restrictions.html (120189 => 120190)
--- trunk/LayoutTests/fullscreen/full-screen-restrictions.html 2012-06-13 12:31:17 UTC (rev 120189)
+++ trunk/LayoutTests/fullscreen/full-screen-restrictions.html 2012-06-13 12:34:26 UTC (rev 120190)
@@ -61,7 +61,7 @@
div.webkitRequestFullscreen();
};
- if (typeof(layoutTestController) != 'undefined')
- layoutTestController.setPopupBlockingEnabled(true);
+ if (typeof(testRunner) != 'undefined')
+ testRunner.setPopupBlockingEnabled(true);
}
</script>
Modified: trunk/LayoutTests/fullscreen/full-screen-stacking-context.html (120189 => 120190)
--- trunk/LayoutTests/fullscreen/full-screen-stacking-context.html 2012-06-13 12:31:17 UTC (rev 120189)
+++ trunk/LayoutTests/fullscreen/full-screen-stacking-context.html 2012-06-13 12:34:26 UTC (rev 120190)
@@ -59,4 +59,4 @@
<div id="zero">
<video id="video"></video>
</div>
- </body>
\ No newline at end of file
+ </body>
Modified: trunk/LayoutTests/fullscreen/full-screen-test.js (120189 => 120190)
--- trunk/LayoutTests/fullscreen/full-screen-test.js 2012-06-13 12:31:17 UTC (rev 120189)
+++ trunk/LayoutTests/fullscreen/full-screen-test.js 2012-06-13 12:34:26 UTC (rev 120190)
@@ -4,16 +4,16 @@
logConsole();
-if (window.layoutTestController) {
- layoutTestController.dumpAsText(runPixelTests);
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText(runPixelTests);
+ testRunner.waitUntilDone();
}
function runWithKeyDown(fn)
{
// FIXME: WKTR does not yet support the keyDown() message. Do a mouseDown here
// instead until keyDown support is added.
- var eventName = !window.layoutTestController || eventSender.keyDown ? 'keypress' : 'mousedown'
+ var eventName = !window.testRunner || eventSender.keyDown ? 'keypress' : 'mousedown'
function thunk() {
document.removeEventListener(eventName, thunk, false);
@@ -21,7 +21,7 @@
}
document.addEventListener(eventName, thunk, false);
- if (window.layoutTestController) {
+ if (window.testRunner) {
if (eventSender.keyDown)
eventSender.keyDown(" ", []);
else
@@ -145,8 +145,8 @@
{
consoleWrite("END OF TEST");
testEnded = true;
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
function logResult(success, text)
Modified: trunk/LayoutTests/fullscreen/full-screen-zIndex-after.html (120189 => 120190)
--- trunk/LayoutTests/fullscreen/full-screen-zIndex-after.html 2012-06-13 12:31:17 UTC (rev 120189)
+++ trunk/LayoutTests/fullscreen/full-screen-zIndex-after.html 2012-06-13 12:34:26 UTC (rev 120190)
@@ -57,4 +57,4 @@
<div id="block3">
<div id="block1"></div>
</div>
- </body>
\ No newline at end of file
+ </body>
Modified: trunk/LayoutTests/fullscreen/full-screen-zIndex.html (120189 => 120190)
--- trunk/LayoutTests/fullscreen/full-screen-zIndex.html 2012-06-13 12:31:17 UTC (rev 120189)
+++ trunk/LayoutTests/fullscreen/full-screen-zIndex.html 2012-06-13 12:34:26 UTC (rev 120190)
@@ -47,4 +47,4 @@
Click <button _onclick_="goFullScreen()">go full screen</button> to run the test.</div>
<div id="block2"></div>
<div id="block1"></div>
- </body>
\ No newline at end of file
+ </body>
Modified: trunk/LayoutTests/fullscreen/non-ancestor-iframe.html (120189 => 120190)
--- trunk/LayoutTests/fullscreen/non-ancestor-iframe.html 2012-06-13 12:31:17 UTC (rev 120189)
+++ trunk/LayoutTests/fullscreen/non-ancestor-iframe.html 2012-06-13 12:34:26 UTC (rev 120190)
@@ -23,6 +23,6 @@
target.webkitRequestFullscreen();
};
- if (window.layoutTestController)
+ if (window.testRunner)
runWithKeyDown(startTest);
-</script>
\ No newline at end of file
+</script>
Modified: trunk/LayoutTests/fullscreen/parent-flow-inline-with-block-child.html (120189 => 120190)
--- trunk/LayoutTests/fullscreen/parent-flow-inline-with-block-child.html 2012-06-13 12:31:17 UTC (rev 120189)
+++ trunk/LayoutTests/fullscreen/parent-flow-inline-with-block-child.html 2012-06-13 12:34:26 UTC (rev 120190)
@@ -12,8 +12,8 @@
<script>
if ("webkitRequestFullScreen" in Element.prototype) {
- if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+ if (window.testRunner)
+ testRunner.waitUntilDone();
var callback;
var fullscreenChanged = function(event)
@@ -31,8 +31,8 @@
setTimeout(function () {
span.appendChild(document.createElement('div'));
callback = function() {
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
document.webkitCancelFullScreen();
}, 0);
Modified: trunk/LayoutTests/fullscreen/video-controls-override.html (120189 => 120190)
--- trunk/LayoutTests/fullscreen/video-controls-override.html 2012-06-13 12:31:17 UTC (rev 120189)
+++ trunk/LayoutTests/fullscreen/video-controls-override.html 2012-06-13 12:34:26 UTC (rev 120190)
@@ -33,10 +33,10 @@
};
var cancelledFullScreen = function() {
- if (window.layoutTestController)
+ if (window.testRunner)
testExpected("document.defaultView.getComputedStyle(panel)['display']", 'none');
else
- logResult(false, "window.layoutTestController == undefined");
+ logResult(false, "window.testRunner == undefined");
endTest();
};
Modified: trunk/LayoutTests/html5lib/resources/runner.js (120189 => 120190)
--- trunk/LayoutTests/html5lib/resources/runner.js 2012-06-13 12:31:17 UTC (rev 120189)
+++ trunk/LayoutTests/html5lib/resources/runner.js 2012-06-13 12:34:26 UTC (rev 120190)
@@ -30,8 +30,8 @@
document.writeln("<p>Script did not run</p>");
document.writeln("<iframe></iframe>");
-if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+if (window.testRunner)
+ testRunner.waitUntilDone();
Markup.noAutoDump();
Markup.useHTML5libOutputFormat();
@@ -77,8 +77,8 @@
}
xhr.send(null);
} else {
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
}
Modified: trunk/LayoutTests/html5lib/webkit-resumer.html (120189 => 120190)
--- trunk/LayoutTests/html5lib/webkit-resumer.html 2012-06-13 12:31:17 UTC (rev 120189)
+++ trunk/LayoutTests/html5lib/webkit-resumer.html 2012-06-13 12:34:26 UTC (rev 120190)
@@ -32,8 +32,8 @@
<p>Script did not run</p>
<iframe></iframe>
<script>
-if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+if (window.testRunner)
+ testRunner.waitUntilDone();
Markup.noAutoDump();
Markup.useHTML5libOutputFormat();
@@ -101,8 +101,8 @@
}
xhr.send(null);
} else {
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
}
Modified: trunk/LayoutTests/platform/gtk/fonts/custom-font-missing-glyphs.html (120189 => 120190)
--- trunk/LayoutTests/platform/gtk/fonts/custom-font-missing-glyphs.html 2012-06-13 12:31:17 UTC (rev 120189)
+++ trunk/LayoutTests/platform/gtk/fonts/custom-font-missing-glyphs.html 2012-06-13 12:34:26 UTC (rev 120190)
@@ -7,11 +7,11 @@
}
</style>
<script>
-if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.waitUntilDone();
document._onreadystatechange_ = function() {
if (document.readyState === 'complete')
- setTimeout(function() {layoutTestController.notifyDone();}, 100);
+ setTimeout(function() {testRunner.notifyDone();}, 100);
};
}
</script>
Modified: trunk/LayoutTests/platform/gtk/fonts/font-face-with-complex-text.html (120189 => 120190)
--- trunk/LayoutTests/platform/gtk/fonts/font-face-with-complex-text.html 2012-06-13 12:31:17 UTC (rev 120189)
+++ trunk/LayoutTests/platform/gtk/fonts/font-face-with-complex-text.html 2012-06-13 12:34:26 UTC (rev 120190)
@@ -9,11 +9,11 @@
body { text-rendering: geometricPrecision; }
</style>
<script>
-if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.waitUntilDone();
document._onreadystatechange_ = function() {
if (document.readyState === 'complete')
- setTimeout(function() {layoutTestController.notifyDone();}, 100);
+ setTimeout(function() {testRunner.notifyDone();}, 100);
};
}
</script>
Modified: trunk/LayoutTests/platform/gtk/fonts/font-family-fallback.html (120189 => 120190)
--- trunk/LayoutTests/platform/gtk/fonts/font-family-fallback.html 2012-06-13 12:31:17 UTC (rev 120189)
+++ trunk/LayoutTests/platform/gtk/fonts/font-family-fallback.html 2012-06-13 12:34:26 UTC (rev 120190)
@@ -1,8 +1,8 @@
<html>
<head>
<script language="_javascript_" type="text/_javascript_">
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function test() {
var realWidth = document.getElementById("courier").offsetWidth;
Modified: trunk/LayoutTests/platform/gtk/fonts/synthetic-oblique-positioning.html (120189 => 120190)
--- trunk/LayoutTests/platform/gtk/fonts/synthetic-oblique-positioning.html 2012-06-13 12:31:17 UTC (rev 120189)
+++ trunk/LayoutTests/platform/gtk/fonts/synthetic-oblique-positioning.html 2012-06-13 12:34:26 UTC (rev 120190)
@@ -11,11 +11,11 @@
<body>
<script>
-if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.waitUntilDone();
document._onreadystatechange_ = function() {
if (document.readyState === 'complete')
- setTimeout(function() {layoutTestController.notifyDone();}, 100);
+ setTimeout(function() {testRunner.notifyDone();}, 100);
};
}
</script>
