Use testRunner instead of layoutTestController in fast/canvas, clip, compact, constructors, cookies, and css* tests
https://bugs.webkit.org/show_bug.cgi?id=89431
Reviewed by Kent Tamura.
* fast/canvas/:
* fast/constructors/constructor-as-function-crash.html:
* fast/css-generated-content/absolute-position-inside-inline.html:
* fast/css-generated-content/after-with-first-letter-float-crash.html:
* fast/css-generated-content/attr-missing.html:
* fast/css-generated-content/before-content-with-list-marker-in-anon-block-crash.html:
* fast/css-generated-content/block-after.html:
* fast/css-generated-content/drag-state.html:
* fast/css-generated-content/empty-content-with-float-crash.html:
* fast/css-generated-content/first-letter-next-sibling-crash.html:
* fast/css-generated-content/first-letter-table-cell-format-block-crash.html:
* fast/css-generated-content/float-first-letter-siblings-convert-to-inline.html:
* fast/css-generated-content/floating-before-content-with-list-marker-crash.html:
* fast/css-generated-content/hit-test-generated-content.html:
* fast/css-generated-content/hover-style-change.html:
* fast/css-generated-content/inline-splitting-with-after-float-crash.html:
* fast/css-generated-content/malformed-url.html:
* fast/css-generated-content/positioned-background-hit-test-crash.html:
* fast/css-generated-content/positioned-div-with-floating-after-content-crash.html:
* fast/css-generated-content/positioned-generated-content-under-run-in-crash.html:
* fast/css-generated-content/remove-div-from-flexible-box-with-floating-after-content-crash.html:
* fast/css-generated-content/reset-content-to-initial.html:
* fast/css-generated-content/resources/pass.html:
* fast/css-generated-content/resources/positioned-div-with-floating-after-content-crash-frame2.html:
* fast/css-generated-content/spellingToolTip-assert.html:
* fast/css-generated-content/table-row-after-no-crash.html:
* fast/css-generated-content/table-with-scrollbar-corner.html:
* fast/css-generated-content/text-before-table-col-crash.html:
* fast/css-grid-layout/display-grid-set-get.html:
* fast/css-grid-layout/grid-columns-rows-get-set-multiple.html:
* fast/css-grid-layout/grid-columns-rows-get-set.html:
* fast/css-grid-layout/grid-item-column-row-get-set.html:
* fast/css/:
* platform/mac/fast/canvas/canvas-draw-xbm-image.html:
* platform/qt/fast/canvas/toDataURL-jpeg-alpha.html:
* platform/qt/fast/canvas/toDataURL-jpeg-primarycolors.html:
* platform/qt/fast/canvas/toDataURL-jpeg-quality-basic.html:
* platform/qt/fast/canvas/toDataURL-jpeg-quality-notnumber.html:
* platform/qt/fast/canvas/toDataURL-jpeg-quality-outsiderange.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@120683 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/fast/canvas/2d.backingStorePixelRatio.html b/LayoutTests/fast/canvas/2d.backingStorePixelRatio.html
index 9c0a9f7..921cc3c 100644
--- a/LayoutTests/fast/canvas/2d.backingStorePixelRatio.html
+++ b/LayoutTests/fast/canvas/2d.backingStorePixelRatio.html
@@ -5,20 +5,20 @@
document.getElementById("console").appendChild(document.createTextNode(message + "\n"));
}
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
var canvas1 = document.createElement("canvas");
var context1 = canvas1.getContext("2d");
- layoutTestController.waitUntilDone();
- layoutTestController.setBackingScaleFactor(2, function() {
+ testRunner.waitUntilDone();
+ testRunner.setBackingScaleFactor(2, function() {
var canvas2 = document.createElement("canvas");
var context2 = canvas2.getContext("2d");
log ("context1.webkitBackingStorePixelRatio is " + context1.webkitBackingStorePixelRatio);
log ("context2.webkitBackingStorePixelRatio is " + context2.webkitBackingStorePixelRatio);
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
});
} else {
log ("When not run inside DumpRenderTree or WebKitTestRunner, this test just prints the value of");
diff --git a/LayoutTests/fast/canvas/2d.fillText.gradient.html b/LayoutTests/fast/canvas/2d.fillText.gradient.html
index cfb6317..8f6d0e9 100644
--- a/LayoutTests/fast/canvas/2d.fillText.gradient.html
+++ b/LayoutTests/fast/canvas/2d.fillText.gradient.html
@@ -21,8 +21,8 @@
ctx.fillText("I", -5, 100);
}
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
var canvas = document.getElementById('c');
var ctx = canvas.getContext("2d");
diff --git a/LayoutTests/fast/canvas/2d.imageDataHD.html b/LayoutTests/fast/canvas/2d.imageDataHD.html
index b392bbd..617e71c 100644
--- a/LayoutTests/fast/canvas/2d.imageDataHD.html
+++ b/LayoutTests/fast/canvas/2d.imageDataHD.html
@@ -1,6 +1,6 @@
<pre id="console"></pre>
<script>
- layoutTestController.dumpAsText();
+ testRunner.dumpAsText();
function log(message)
{
@@ -48,11 +48,11 @@
log("FAIL: Pixel " + i + " is not blue: " + formatColor(r, g, b, a) + ".");
}
- if (!window.layoutTestController)
+ if (!window.testRunner)
log("This test requires WebKitTestRunner or DumpRenderTree.");
- layoutTestController.waitUntilDone();
- layoutTestController.setBackingScaleFactor(2, function() {
+ testRunner.waitUntilDone();
+ testRunner.setBackingScaleFactor(2, function() {
var canvas = document.createElement("canvas");
canvas.width = 8;
canvas.height = 8;
@@ -113,6 +113,6 @@
} else
log("High-DPI canvas is not enabled.");
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
});
</script>
diff --git a/LayoutTests/fast/canvas/2d.text.draw.fill.maxWidth.gradient.html b/LayoutTests/fast/canvas/2d.text.draw.fill.maxWidth.gradient.html
index 235b385..8675e35 100644
--- a/LayoutTests/fast/canvas/2d.text.draw.fill.maxWidth.gradient.html
+++ b/LayoutTests/fast/canvas/2d.text.draw.fill.maxWidth.gradient.html
@@ -43,13 +43,13 @@
else
document.getElementById("console").innerHTML = "TEST FAILED";
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
var canvas = document.getElementById('c');
diff --git a/LayoutTests/fast/canvas/2d.text.draw.fill.maxWidth.negative.html b/LayoutTests/fast/canvas/2d.text.draw.fill.maxWidth.negative.html
index 2c03ccf..683d5f1 100644
--- a/LayoutTests/fast/canvas/2d.text.draw.fill.maxWidth.negative.html
+++ b/LayoutTests/fast/canvas/2d.text.draw.fill.maxWidth.negative.html
@@ -38,13 +38,13 @@
else
document.getElementById("console").innerHTML = "TEST FAILED";
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
var canvas = document.getElementById('c');
diff --git a/LayoutTests/fast/canvas/2d.text.draw.fill.maxWidth.veryLarge.html b/LayoutTests/fast/canvas/2d.text.draw.fill.maxWidth.veryLarge.html
index 7d2243b..e2a5812 100644
--- a/LayoutTests/fast/canvas/2d.text.draw.fill.maxWidth.veryLarge.html
+++ b/LayoutTests/fast/canvas/2d.text.draw.fill.maxWidth.veryLarge.html
@@ -38,13 +38,13 @@
else
document.getElementById("console").innerHTML = "TEST FAILED";
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
var canvas = document.getElementById('c');
diff --git a/LayoutTests/fast/canvas/2d.text.draw.fill.maxWidth.verySmall.html b/LayoutTests/fast/canvas/2d.text.draw.fill.maxWidth.verySmall.html
index 91956cc..b98b1c9 100644
--- a/LayoutTests/fast/canvas/2d.text.draw.fill.maxWidth.verySmall.html
+++ b/LayoutTests/fast/canvas/2d.text.draw.fill.maxWidth.verySmall.html
@@ -38,13 +38,13 @@
else
document.getElementById("console").innerHTML = "TEST FAILED";
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
var canvas = document.getElementById('c');
diff --git a/LayoutTests/fast/canvas/DrawImageSinglePixelStretch.html b/LayoutTests/fast/canvas/DrawImageSinglePixelStretch.html
index b76d29d..8ce02d3 100644
--- a/LayoutTests/fast/canvas/DrawImageSinglePixelStretch.html
+++ b/LayoutTests/fast/canvas/DrawImageSinglePixelStretch.html
@@ -9,9 +9,9 @@
var image, ctx;
function init () {
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
var canvas = document.getElementById("c");
@@ -42,8 +42,8 @@
else
result.innerHTML = "FAILED";
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
function areAllRowsUniform(ctx) {
diff --git a/LayoutTests/fast/canvas/access-zero-sized-canvas.html b/LayoutTests/fast/canvas/access-zero-sized-canvas.html
index 33524da..3796142 100644
--- a/LayoutTests/fast/canvas/access-zero-sized-canvas.html
+++ b/LayoutTests/fast/canvas/access-zero-sized-canvas.html
@@ -1,8 +1,8 @@
This test ensures that accessing the context of a zero sized canvas does not crash.
<canvas id="canvas" width="0" height="0"></canvas><br />
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
var context = document.getElementById("canvas").getContext("2d");
context.fillStyle = "green";
diff --git a/LayoutTests/fast/canvas/arc-crash.html b/LayoutTests/fast/canvas/arc-crash.html
index f17a3e6..d5ac97d 100644
--- a/LayoutTests/fast/canvas/arc-crash.html
+++ b/LayoutTests/fast/canvas/arc-crash.html
@@ -29,8 +29,8 @@
context.fillStyle = '#0f0';
context.fillRect(0, 0, canvas.width, canvas.height);
debug("Test passed.");
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
}
</script>
<title>borkedness</title>
diff --git a/LayoutTests/fast/canvas/arc360.html b/LayoutTests/fast/canvas/arc360.html
index ddd110a..43d06fa 100644
--- a/LayoutTests/fast/canvas/arc360.html
+++ b/LayoutTests/fast/canvas/arc360.html
@@ -2,8 +2,8 @@
<p>Test canvas arc() start / end points when the arc is >= 360 degrees. The result should be a circle with two line segments connected to the left hand side, towards the top left and bottom left corners.
<canvas id="mycanvas" width="400" height="400"></canvas>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+if (window.testRunner)
+ testRunner.dumpAsText(true);
var canvas = document.getElementById('mycanvas');
var ctx = canvas.getContext('2d');
diff --git a/LayoutTests/fast/canvas/canvas-as-image-incremental-repaint.html b/LayoutTests/fast/canvas/canvas-as-image-incremental-repaint.html
index 10f35cc..e8ffc4d 100644
--- a/LayoutTests/fast/canvas/canvas-as-image-incremental-repaint.html
+++ b/LayoutTests/fast/canvas/canvas-as-image-incremental-repaint.html
@@ -10,18 +10,18 @@
</style>
<script type="application/x-javascript">
- if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+ if (window.testRunner)
+ testRunner.waitUntilDone();
var canvasContext;
function runRepaintTest()
{
canvasContext = document.getCSSCanvasContext("2d", "squares", 300, 300);
- if (window.layoutTestController) {
+ if (window.testRunner) {
document.body.offsetTop;
- layoutTestController.display();
+ testRunner.display();
repaintTest();
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
} else {
setTimeout(repaintTest, 2000);
}
diff --git a/LayoutTests/fast/canvas/canvas-before-css.html b/LayoutTests/fast/canvas/canvas-before-css.html
index 0d723ee..515f11c 100644
--- a/LayoutTests/fast/canvas/canvas-before-css.html
+++ b/LayoutTests/fast/canvas/canvas-before-css.html
@@ -6,8 +6,8 @@
<p>If the canvas below is black, then we managed to draw before loading stylesheets. Hooray!</p>
<canvas id="mycanvas" width="400" height="200"></canvas>
<script type="application/x-javascript">
- if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+ if (window.testRunner)
+ testRunner.dumpAsText(true);
var canvas = document.getElementById("mycanvas");
canvas.getContext("2d").fillRect(0, 0, canvas.width, canvas.height);
diff --git a/LayoutTests/fast/canvas/canvas-bg-multiple-removal.html b/LayoutTests/fast/canvas/canvas-bg-multiple-removal.html
index 898cf87..de04017 100644
--- a/LayoutTests/fast/canvas/canvas-bg-multiple-removal.html
+++ b/LayoutTests/fast/canvas/canvas-bg-multiple-removal.html
@@ -1,16 +1,16 @@
<html>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
window.onload = function()
{
if (location.hash == "#2") {
document.body.innerHTML = "PASSED: Duplicate webkit-canvas styles removed without crash.";
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
} else {
if (location.hash)
location.hash = "#" + (parseInt(location.hash.slice(1)) + 1).toString();
diff --git a/LayoutTests/fast/canvas/canvas-composite-alpha.html b/LayoutTests/fast/canvas/canvas-composite-alpha.html
index 7612b8a..1510d2d 100644
--- a/LayoutTests/fast/canvas/canvas-composite-alpha.html
+++ b/LayoutTests/fast/canvas/canvas-composite-alpha.html
@@ -3,9 +3,9 @@
<title>A canvas globalCompositeOperation test with alpha blending</title>
<!-- This test was inspired by http://canvex.lazyilluminati.com/misc/compositex.html -->
<script type="application/x-javascript">
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
var compositeTypes = [
@@ -433,8 +433,8 @@
{
drawTable(useFillRect);
drawTable(usePathAndFill);
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
</script>
<style type="text/css">
diff --git a/LayoutTests/fast/canvas/canvas-composite-fill-repaint.html b/LayoutTests/fast/canvas/canvas-composite-fill-repaint.html
index 3217b01..ff5e081 100644
--- a/LayoutTests/fast/canvas/canvas-composite-fill-repaint.html
+++ b/LayoutTests/fast/canvas/canvas-composite-fill-repaint.html
@@ -6,8 +6,8 @@
<script>
var compositeTypes = ['source-in','copy'];
- if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+ if (window.testRunner)
+ testRunner.dumpAsText(true);
for (i = 0; i < compositeTypes.length; i++) {
var canvas = document.getElementById('canvas-' + compositeTypes[i]);
diff --git a/LayoutTests/fast/canvas/canvas-composite-transformclip.html b/LayoutTests/fast/canvas/canvas-composite-transformclip.html
index 7a16059..4029cc9 100644
--- a/LayoutTests/fast/canvas/canvas-composite-transformclip.html
+++ b/LayoutTests/fast/canvas/canvas-composite-transformclip.html
@@ -4,8 +4,8 @@
<meta name="DC.creator" content="Kamiel Martinet, http://www.martinet.nl/">
<meta name="DC.publisher" content="Mozilla Developer Center, http://developer.mozilla.org">
<script type="application/x-javascript">
- if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+ if (window.testRunner)
+ testRunner.dumpAsText(true);
// This test should show a table of canvas elements. The canvas elements have transforms
// applied, and onto the background a blue square is drawn, either fully opaque or with some
diff --git a/LayoutTests/fast/canvas/canvas-composite.html b/LayoutTests/fast/canvas/canvas-composite.html
index 6151a10..fdc417e 100644
--- a/LayoutTests/fast/canvas/canvas-composite.html
+++ b/LayoutTests/fast/canvas/canvas-composite.html
@@ -4,8 +4,8 @@
<meta name="DC.creator" content="Kamiel Martinet, http://www.martinet.nl/">
<meta name="DC.publisher" content="Mozilla Developer Center, http://developer.mozilla.org">
<script type="application/x-javascript">
- if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+ if (window.testRunner)
+ testRunner.dumpAsText(true);
var compositeTypes = [
'source-over','source-in','source-out','source-atop',
diff --git a/LayoutTests/fast/canvas/canvas-empty-image-pattern.html b/LayoutTests/fast/canvas/canvas-empty-image-pattern.html
index e224a88..1eb21a2 100644
--- a/LayoutTests/fast/canvas/canvas-empty-image-pattern.html
+++ b/LayoutTests/fast/canvas/canvas-empty-image-pattern.html
@@ -2,8 +2,8 @@
<title>Canvas test: filling a pattern with an empty image should not crash.</title>
<canvas id="canvas" class="output" width="100" height="100"><p class="fallback">FAIL (fallback content)</p></canvas>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+if (window.testRunner)
+ testRunner.dumpAsText(true);
var canvas = document.getElementById("canvas").getContext("2d");
canvas.fillStyle = canvas.createPattern(new Image, "repeat")
diff --git a/LayoutTests/fast/canvas/canvas-getImageData-large-crash.html b/LayoutTests/fast/canvas/canvas-getImageData-large-crash.html
index 6ac1da8..6c763be 100644
--- a/LayoutTests/fast/canvas/canvas-getImageData-large-crash.html
+++ b/LayoutTests/fast/canvas/canvas-getImageData-large-crash.html
@@ -1,8 +1,8 @@
<html>
<head>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText(false);
+if (window.testRunner)
+ testRunner.dumpAsText(false);
var canvas = document.createElement("canvas");
canvas.getContext("2d").getImageData(10, 0xffffffff, 2147483647,10);
diff --git a/LayoutTests/fast/canvas/canvas-getImageData-largeNonintegralDimensions.html b/LayoutTests/fast/canvas/canvas-getImageData-largeNonintegralDimensions.html
index 343e4d4..5ce9293 100644
--- a/LayoutTests/fast/canvas/canvas-getImageData-largeNonintegralDimensions.html
+++ b/LayoutTests/fast/canvas/canvas-getImageData-largeNonintegralDimensions.html
@@ -1,8 +1,8 @@
<html>
PASS!
<script>
-if (window.layoutTestController)
- window.layoutTestController.dumpAsText();
+if (window.testRunner)
+ window.testRunner.dumpAsText();
var canvas = document.createElement("canvas");
var ctx = canvas.getContext("2d");
diff --git a/LayoutTests/fast/canvas/canvas-getImageData.html b/LayoutTests/fast/canvas/canvas-getImageData.html
index 5eaacfd..2a407f2 100644
--- a/LayoutTests/fast/canvas/canvas-getImageData.html
+++ b/LayoutTests/fast/canvas/canvas-getImageData.html
@@ -1,8 +1,8 @@
This test ensures that getImageData works correctly.
<div id="log"></div>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
var canvas = document.createElement("canvas");
canvas.width = 200;
diff --git a/LayoutTests/fast/canvas/canvas-hides-fallback.html b/LayoutTests/fast/canvas/canvas-hides-fallback.html
index 8f6125b..c31da53 100644
--- a/LayoutTests/fast/canvas/canvas-hides-fallback.html
+++ b/LayoutTests/fast/canvas/canvas-hides-fallback.html
@@ -1,7 +1,7 @@
<head>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
<body>
diff --git a/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-patterns.html b/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-patterns.html
index cc1ecd4..8531d54 100644
--- a/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-patterns.html
+++ b/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-patterns.html
@@ -62,8 +62,8 @@
}
function draw() {
- if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+ if (window.testRunner)
+ testRunner.dumpAsText(true);
var image = createImage();
drawFillRect(document.getElementById('unsmoothedFillRect'), image,
diff --git a/LayoutTests/fast/canvas/canvas-incremental-repaint-2.html b/LayoutTests/fast/canvas/canvas-incremental-repaint-2.html
index 2969e57..e6dcd29 100644
--- a/LayoutTests/fast/canvas/canvas-incremental-repaint-2.html
+++ b/LayoutTests/fast/canvas/canvas-incremental-repaint-2.html
@@ -12,18 +12,18 @@
</style>
<script type="text/javascript" charset="utf-8">
- if (window.layoutTestController) {
- layoutTestController.dumpAsText(true);
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText(true);
+ testRunner.waitUntilDone();
}
function runRepaintTest()
{
- if (window.layoutTestController) {
+ if (window.testRunner) {
document.body.offsetTop;
- layoutTestController.display();
+ testRunner.display();
repaintTest();
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
} else {
setTimeout(repaintTest, 0);
}
diff --git a/LayoutTests/fast/canvas/canvas-incremental-repaint.html b/LayoutTests/fast/canvas/canvas-incremental-repaint.html
index b7d2313..ed68dfe 100644
--- a/LayoutTests/fast/canvas/canvas-incremental-repaint.html
+++ b/LayoutTests/fast/canvas/canvas-incremental-repaint.html
@@ -12,19 +12,19 @@
</style>
<script type="text/javascript" charset="utf-8">
- if (window.layoutTestController) {
- layoutTestController.dumpAsText(true);
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText(true);
+ testRunner.waitUntilDone();
}
var appleImage;
function runRepaintTest()
{
- if (window.layoutTestController) {
+ if (window.testRunner) {
document.body.offsetTop;
- layoutTestController.display();
+ testRunner.display();
repaintTest();
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
} else {
setTimeout(repaintTest, 0);
}
diff --git a/LayoutTests/fast/canvas/canvas-largedraws.html b/LayoutTests/fast/canvas/canvas-largedraws.html
index 3285469..a5f1bc8 100644
--- a/LayoutTests/fast/canvas/canvas-largedraws.html
+++ b/LayoutTests/fast/canvas/canvas-largedraws.html
@@ -2,8 +2,8 @@
<html>
<body>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function newCanvasContext() {
canvas = document.createElement("canvas");
diff --git a/LayoutTests/fast/canvas/canvas-path-with-inf-nan-dimensions.html b/LayoutTests/fast/canvas/canvas-path-with-inf-nan-dimensions.html
index cfb9294..8d767fa 100644
--- a/LayoutTests/fast/canvas/canvas-path-with-inf-nan-dimensions.html
+++ b/LayoutTests/fast/canvas/canvas-path-with-inf-nan-dimensions.html
@@ -1,8 +1,8 @@
<canvas width="200" height="200" id="canvas">FAIL: no canvas support</canvas>
<div id="log"></div>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
var canvas = document.getElementById("canvas").getContext("2d");
//four tests
diff --git a/LayoutTests/fast/canvas/canvas-resize-after-paint-without-layout.html b/LayoutTests/fast/canvas/canvas-resize-after-paint-without-layout.html
index 6aa01c9..5432be3 100644
--- a/LayoutTests/fast/canvas/canvas-resize-after-paint-without-layout.html
+++ b/LayoutTests/fast/canvas/canvas-resize-after-paint-without-layout.html
@@ -14,8 +14,8 @@
</style>
<script src="resources/repaint.js"></script>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+ if (window.testRunner)
+ testRunner.dumpAsText(true);
function runTest() {
var canvas = document.getElementById('canvas');
diff --git a/LayoutTests/fast/canvas/canvas-resize-after-paint.html b/LayoutTests/fast/canvas/canvas-resize-after-paint.html
index 9573cbf..9e960bf 100644
--- a/LayoutTests/fast/canvas/canvas-resize-after-paint.html
+++ b/LayoutTests/fast/canvas/canvas-resize-after-paint.html
@@ -2,8 +2,8 @@
<canvas id="c" width=100 height=100></canvas>
<!-- Tests that resizing a canvas to very large dimensions after a composite does not crash -->
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
var c = document.getElementById("c");
function resize() {
@@ -11,8 +11,8 @@
c.height = "10000";
}
-if (window.layoutTestController) {
- layoutTestController.display(); // Force a composite at normal width/height to ensure we have a compositing layer for the canvas.
+if (window.testRunner) {
+ testRunner.display(); // Force a composite at normal width/height to ensure we have a compositing layer for the canvas.
resize();
} else
window.setTimeout(resize, 0);
diff --git a/LayoutTests/fast/canvas/canvas-resize-reset.html b/LayoutTests/fast/canvas/canvas-resize-reset.html
index d4cadec..ecbbfb8 100644
--- a/LayoutTests/fast/canvas/canvas-resize-reset.html
+++ b/LayoutTests/fast/canvas/canvas-resize-reset.html
@@ -7,8 +7,8 @@
<p>There should be nothing below. Bug 8994. </p>
<p><canvas width="200" height="100">FAIL</canvas></p>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+ if (window.testRunner)
+ testRunner.dumpAsText(true);
var canvas = document.getElementsByTagName('canvas')[0];
var context = canvas.getContext('2d');
diff --git a/LayoutTests/fast/canvas/canvas-skia-excessive-size.html b/LayoutTests/fast/canvas/canvas-skia-excessive-size.html
index b6142ad..627841c 100644
--- a/LayoutTests/fast/canvas/canvas-skia-excessive-size.html
+++ b/LayoutTests/fast/canvas/canvas-skia-excessive-size.html
@@ -8,8 +8,8 @@
}
function test()
{
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var canvas = document.getElementById("bigCanvas");
var width = canvas.width;
diff --git a/LayoutTests/fast/canvas/canvas-text-alignment.html b/LayoutTests/fast/canvas/canvas-text-alignment.html
index 5a0a61a..7c3c985 100644
--- a/LayoutTests/fast/canvas/canvas-text-alignment.html
+++ b/LayoutTests/fast/canvas/canvas-text-alignment.html
@@ -2,8 +2,8 @@
<body>
<canvas id="canvas" width=600 height=600 style="border:5px solid black">
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+if (window.testRunner)
+ testRunner.dumpAsText(true);
var ctx = document.getElementById('canvas').getContext('2d');
var lingrad = ctx.createLinearGradient(0,0,600,600);
diff --git a/LayoutTests/fast/canvas/canvas-text-baseline.html b/LayoutTests/fast/canvas/canvas-text-baseline.html
index bcd3375..a4f27de 100644
--- a/LayoutTests/fast/canvas/canvas-text-baseline.html
+++ b/LayoutTests/fast/canvas/canvas-text-baseline.html
@@ -2,8 +2,8 @@
<body>
<canvas id="canvas" width=600 height=300 style="border:5px solid black">
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+if (window.testRunner)
+ testRunner.dumpAsText(true);
var ctx = document.getElementById('canvas').getContext('2d');
diff --git a/LayoutTests/fast/canvas/canvas-toDataURL-crash.html b/LayoutTests/fast/canvas/canvas-toDataURL-crash.html
index f058dec..703600d 100644
--- a/LayoutTests/fast/canvas/canvas-toDataURL-crash.html
+++ b/LayoutTests/fast/canvas/canvas-toDataURL-crash.html
@@ -6,6 +6,6 @@
var url = canvas.toDataURL();
var p = document.getElementById('console');
p.innerHTML = "PASS";
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
diff --git a/LayoutTests/fast/canvas/canvas-toDataURL-jpeg-crash.html b/LayoutTests/fast/canvas/canvas-toDataURL-jpeg-crash.html
index b278d8c..cd4c042 100644
--- a/LayoutTests/fast/canvas/canvas-toDataURL-jpeg-crash.html
+++ b/LayoutTests/fast/canvas/canvas-toDataURL-jpeg-crash.html
@@ -6,6 +6,6 @@
var test = document.getElementById('canvas').toDataURL('image/jpeg');
// Test passes if we don't crash.
document.getElementById('log').innerHTML = 'PASS';
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
diff --git a/LayoutTests/fast/canvas/canvas-toDataURL-webp.html b/LayoutTests/fast/canvas/canvas-toDataURL-webp.html
index 260dccb..9c3d0db 100644
--- a/LayoutTests/fast/canvas/canvas-toDataURL-webp.html
+++ b/LayoutTests/fast/canvas/canvas-toDataURL-webp.html
@@ -2,9 +2,9 @@
<pre id="log"></pre>
<img id="result">
<script>
-if (window.layoutTestController) {
- window.layoutTestController.dumpAsText(pixelTest = true);
- window.layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ window.testRunner.dumpAsText(pixelTest = true);
+ window.testRunner.waitUntilDone();
}
function webpDataURLTest()
@@ -19,8 +19,8 @@
else
document.getElementById('result').src = dataURL;
- if (window.layoutTestController)
- window.layoutTestController.notifyDone();
+ if (window.testRunner)
+ window.testRunner.notifyDone();
}
var image = new Image();
diff --git a/LayoutTests/fast/canvas/canvas-transform-identity.html b/LayoutTests/fast/canvas/canvas-transform-identity.html
index 85d7ac4..2ff8aba 100644
--- a/LayoutTests/fast/canvas/canvas-transform-identity.html
+++ b/LayoutTests/fast/canvas/canvas-transform-identity.html
@@ -5,8 +5,8 @@
<title>Canvas test: 2d.transformation.transform.identity</title>
<canvas id="canvas" class="output" width="100" height="100"><p class="fallback">FAIL (fallback content)</p></canvas>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+if (window.testRunner)
+ testRunner.dumpAsText(true);
var canvas = document.getElementById("canvas").getContext("2d");
canvas.fillStyle = '#f00';
diff --git a/LayoutTests/fast/canvas/canvas-transform-infinity.html b/LayoutTests/fast/canvas/canvas-transform-infinity.html
index 90e36ad..84ae4c0 100644
--- a/LayoutTests/fast/canvas/canvas-transform-infinity.html
+++ b/LayoutTests/fast/canvas/canvas-transform-infinity.html
@@ -5,8 +5,8 @@
<title>Canvas test: 2d.transformation.transform.infinity</title>
<canvas id="canvas" class="output" width="100" height="100"><p class="fallback">FAIL (fallback content)</p></canvas>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+if (window.testRunner)
+ testRunner.dumpAsText(true);
var ctx = document.getElementById("canvas").getContext("2d");
ctx.fillStyle = '#f00';
diff --git a/LayoutTests/fast/canvas/canvas-transform-multiply.html b/LayoutTests/fast/canvas/canvas-transform-multiply.html
index cd8ba62..9afedeb 100644
--- a/LayoutTests/fast/canvas/canvas-transform-multiply.html
+++ b/LayoutTests/fast/canvas/canvas-transform-multiply.html
@@ -5,8 +5,8 @@
<title>Canvas test: 2d.transformation.transform.multiply</title>
<canvas id="canvas" class="output" width="100" height="100"><p class="fallback">FAIL (fallback content)</p></canvas>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+if (window.testRunner)
+ testRunner.dumpAsText(true);
var ctx = document.getElementById("canvas").getContext("2d");
ctx.fillStyle = '#f00';
diff --git a/LayoutTests/fast/canvas/canvas-transform-nan.html b/LayoutTests/fast/canvas/canvas-transform-nan.html
index ce3e33f..f832a54 100644
--- a/LayoutTests/fast/canvas/canvas-transform-nan.html
+++ b/LayoutTests/fast/canvas/canvas-transform-nan.html
@@ -5,8 +5,8 @@
<title>Canvas test: 2d.transformation.transform.nan</title>
<canvas id="canvas" class="output" width="100" height="100"><p class="fallback">FAIL (fallback content)</p></canvas>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+if (window.testRunner)
+ testRunner.dumpAsText(true);
var ctx = document.getElementById("canvas").getContext("2d");
ctx.fillStyle = '#f00';
diff --git a/LayoutTests/fast/canvas/canvas-transform-non-invertible.html b/LayoutTests/fast/canvas/canvas-transform-non-invertible.html
index acf88af..92b6fbc 100644
--- a/LayoutTests/fast/canvas/canvas-transform-non-invertible.html
+++ b/LayoutTests/fast/canvas/canvas-transform-non-invertible.html
@@ -7,8 +7,8 @@
<title>Canvas test: 2d.transformation.transform.non-invertible</title>
<canvas id="canvas" class="output" width="100" height="100"><p class="fallback">FAIL (fallback content)</p></canvas>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+if (window.testRunner)
+ testRunner.dumpAsText(true);
var ctx = document.getElementById("canvas").getContext("2d");
ctx.fillStyle = '#0f0';
diff --git a/LayoutTests/fast/canvas/canvas-transform-skewed.html b/LayoutTests/fast/canvas/canvas-transform-skewed.html
index 1cfa1c2..d314dca 100644
--- a/LayoutTests/fast/canvas/canvas-transform-skewed.html
+++ b/LayoutTests/fast/canvas/canvas-transform-skewed.html
@@ -5,8 +5,8 @@
<title>Canvas test: 2d.transformation.transform.skewed</title>
<canvas id="canvas" class="output" width="100" height="100"><p class="fallback">FAIL (fallback content)</p></canvas>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+if (window.testRunner)
+ testRunner.dumpAsText(true);
var ctx = document.getElementById("canvas").getContext("2d");
// Create green with a red square ring inside it
diff --git a/LayoutTests/fast/canvas/canvas-transforms-during-path.html b/LayoutTests/fast/canvas/canvas-transforms-during-path.html
index e5543e9..c3ad85e 100644
--- a/LayoutTests/fast/canvas/canvas-transforms-during-path.html
+++ b/LayoutTests/fast/canvas/canvas-transforms-during-path.html
@@ -1,8 +1,8 @@
<html>
<head>
<script type="text/javascript">
- if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+ if (window.testRunner)
+ testRunner.dumpAsText(true);
function main() {
var g = document.getElementById("c").getContext("2d");
diff --git a/LayoutTests/fast/canvas/canvas-with-incorrect-args.html b/LayoutTests/fast/canvas/canvas-with-incorrect-args.html
index a193645..e3185d6 100644
--- a/LayoutTests/fast/canvas/canvas-with-incorrect-args.html
+++ b/LayoutTests/fast/canvas/canvas-with-incorrect-args.html
@@ -485,8 +485,8 @@
context.fillStyle = '#0f0';
context.fillRect(0, 0, canvas.width, canvas.height);
}
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
}
</script>
<title>Canvas test of doom</title>
diff --git a/LayoutTests/fast/canvas/canvasDrawingIntoSelf.html b/LayoutTests/fast/canvas/canvasDrawingIntoSelf.html
index 6a36e4a..5c3af71 100644
--- a/LayoutTests/fast/canvas/canvasDrawingIntoSelf.html
+++ b/LayoutTests/fast/canvas/canvasDrawingIntoSelf.html
@@ -1,8 +1,8 @@
If this renders correctly you should see one big friendly green square.
<canvas id="canvas" width="200" height="200" ></canvas>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+if (window.testRunner)
+ testRunner.dumpAsText(true);
var canvas = document.getElementById("canvas");
var context = canvas.getContext("2d");
diff --git a/LayoutTests/fast/canvas/canvas_arc_largeangles.html b/LayoutTests/fast/canvas/canvas_arc_largeangles.html
index ef4c2be..04cae0c 100644
--- a/LayoutTests/fast/canvas/canvas_arc_largeangles.html
+++ b/LayoutTests/fast/canvas/canvas_arc_largeangles.html
@@ -3,8 +3,8 @@
<body>
<a id="result"></a>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
canvas = document.createElement("canvas");
document.body.appendChild(canvas);
diff --git a/LayoutTests/fast/canvas/change-context.html b/LayoutTests/fast/canvas/change-context.html
index 57970d8..9e24759 100644
--- a/LayoutTests/fast/canvas/change-context.html
+++ b/LayoutTests/fast/canvas/change-context.html
@@ -1,8 +1,8 @@
This test ensures that changing the context does not crash.
<canvas id="canvas"></canvas><br />
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
var canvas = document.getElementById("canvas");
var ctx1 = canvas.getContext("2d");
diff --git a/LayoutTests/fast/canvas/check-stale-putImageData.html b/LayoutTests/fast/canvas/check-stale-putImageData.html
index d7790fe..85b45cb 100644
--- a/LayoutTests/fast/canvas/check-stale-putImageData.html
+++ b/LayoutTests/fast/canvas/check-stale-putImageData.html
@@ -9,8 +9,8 @@
<script type="text/javascript">
-if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+if (window.testRunner)
+ testRunner.dumpAsText(true);
var canvas = document.getElementById( 'canvas' );
var context = canvas.getContext( '2d' );
diff --git a/LayoutTests/fast/canvas/crash-set-font.html b/LayoutTests/fast/canvas/crash-set-font.html
index 108e281..232e926 100644
--- a/LayoutTests/fast/canvas/crash-set-font.html
+++ b/LayoutTests/fast/canvas/crash-set-font.html
@@ -2,8 +2,8 @@
<html>
<head>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
oContext2d = document.getCSSCanvasContext("2d","",0,0);
oContext2d.font = "small-caps .0ex G";
diff --git a/LayoutTests/fast/canvas/create-pattern-does-not-crash.html b/LayoutTests/fast/canvas/create-pattern-does-not-crash.html
index e2db81d..cbaf680 100644
--- a/LayoutTests/fast/canvas/create-pattern-does-not-crash.html
+++ b/LayoutTests/fast/canvas/create-pattern-does-not-crash.html
@@ -4,8 +4,8 @@
<script>
window.onload = function ()
{
- if (window.layoutTestController)
- window.layoutTestController.dumpAsText();
+ if (window.testRunner)
+ window.testRunner.dumpAsText();
var canvas = document.getElementById('c');
var ctx = canvas.getContext('2d');
var p = ctx.createPattern(canvas, 'no-repeat');
diff --git a/LayoutTests/fast/canvas/drawImage-with-globalAlpha.html b/LayoutTests/fast/canvas/drawImage-with-globalAlpha.html
index bf5d5dc..fbbab96 100644
--- a/LayoutTests/fast/canvas/drawImage-with-globalAlpha.html
+++ b/LayoutTests/fast/canvas/drawImage-with-globalAlpha.html
@@ -4,8 +4,8 @@
There should be a green square, followed by 6 squares of shades of green from white to full green.<br>
<canvas id="canvas" width="700" height="100" ></canvas>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+if (window.testRunner)
+ testRunner.dumpAsText(true);
var canvas = document.getElementById("canvas");
var context = canvas.getContext("2d");
diff --git a/LayoutTests/fast/canvas/drawImage-with-invalid-args.html b/LayoutTests/fast/canvas/drawImage-with-invalid-args.html
index 578f86f..0e8bcdf 100644
--- a/LayoutTests/fast/canvas/drawImage-with-invalid-args.html
+++ b/LayoutTests/fast/canvas/drawImage-with-invalid-args.html
@@ -16,8 +16,8 @@
}
function draw() {
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var ctx = document.getElementById('canvas').getContext('2d');
diff --git a/LayoutTests/fast/canvas/drawImage.html b/LayoutTests/fast/canvas/drawImage.html
index e6bb156..aa902d4 100644
--- a/LayoutTests/fast/canvas/drawImage.html
+++ b/LayoutTests/fast/canvas/drawImage.html
@@ -2,8 +2,8 @@
<canvas id="canvas" width="200" height="200" ></canvas>
<canvas id="canvas2" width="200" height="200" style="display:none" ></canvas>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+if (window.testRunner)
+ testRunner.dumpAsText(true);
var canvas = document.getElementById("canvas");
var canvas2 = document.getElementById("canvas2");
diff --git a/LayoutTests/fast/canvas/drawImageFromRect_withToDataURLAsSource.html b/LayoutTests/fast/canvas/drawImageFromRect_withToDataURLAsSource.html
index 2e01258..04512ef 100644
--- a/LayoutTests/fast/canvas/drawImageFromRect_withToDataURLAsSource.html
+++ b/LayoutTests/fast/canvas/drawImageFromRect_withToDataURLAsSource.html
@@ -4,8 +4,8 @@
function init()
{
- if (window.layoutTestController)
- window.layoutTestController.dumpAsText();
+ if (window.testRunner)
+ window.testRunner.dumpAsText();
var imgCanvas = document.getElementById("c1");
var imgCanvas2 = document.getElementById("c2");
diff --git a/LayoutTests/fast/canvas/fill-stroke-clip-reset-path.html b/LayoutTests/fast/canvas/fill-stroke-clip-reset-path.html
index 2960331..671e10d 100644
--- a/LayoutTests/fast/canvas/fill-stroke-clip-reset-path.html
+++ b/LayoutTests/fast/canvas/fill-stroke-clip-reset-path.html
@@ -3,10 +3,10 @@
<script>
function testOne(operation, quirk)
{
- if (window.layoutTestController){
- layoutTestController.dumpAsText(true);
- if (layoutTestController.setUseDashboardCompatibilityMode)
- layoutTestController.setUseDashboardCompatibilityMode(quirk);
+ if (window.testRunner){
+ testRunner.dumpAsText(true);
+ if (testRunner.setUseDashboardCompatibilityMode)
+ testRunner.setUseDashboardCompatibilityMode(quirk);
}
var canvas = document.getElementById(operation + "-" + (quirk ? "" : "no-") + "quirk");
diff --git a/LayoutTests/fast/canvas/fillrect-gradient-zero-stops.html b/LayoutTests/fast/canvas/fillrect-gradient-zero-stops.html
index b4a46c8..d39e128 100644
--- a/LayoutTests/fast/canvas/fillrect-gradient-zero-stops.html
+++ b/LayoutTests/fast/canvas/fillrect-gradient-zero-stops.html
@@ -3,8 +3,8 @@
The canvas below should show a gradient with zero stops, which according to the specification is filled with transparant black, ie. not visible. This tests <a href="http://bugs.webkit.org/show_bug.cgi?id=13784">Bug 13784, REGRESSION (r13744-13750): Crash with empty gradient when drawing to canvas</a></p>
<canvas id="c"></canvas>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+if (window.testRunner)
+ testRunner.dumpAsText(true);
window.onload = function () {
var ctx = document.getElementById('c').getContext('2d');
diff --git a/LayoutTests/fast/canvas/fillrect_gradient.html b/LayoutTests/fast/canvas/fillrect_gradient.html
index 198ab6d..268d0a2 100644
--- a/LayoutTests/fast/canvas/fillrect_gradient.html
+++ b/LayoutTests/fast/canvas/fillrect_gradient.html
@@ -7,8 +7,8 @@
The column on the left contains linear gradients, the column on the right radial gradients.<br>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+ if (window.testRunner)
+ testRunner.dumpAsText(true);
var counter = 1;
function Test(description, gradient) {
diff --git a/LayoutTests/fast/canvas/font-update.html b/LayoutTests/fast/canvas/font-update.html
index 51e0baf..5e8f003 100644
--- a/LayoutTests/fast/canvas/font-update.html
+++ b/LayoutTests/fast/canvas/font-update.html
@@ -13,15 +13,15 @@
ctx.fillText("B", 0, 100);
ctx.fillStyle = "green";
canvas.parentNode.removeChild(canvas);
- if (window.layoutTestController) {
- layoutTestController.dumpAsText(true);
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText(true);
+ testRunner.waitUntilDone();
}
setTimeout(function()
{
ctx.fillText("A", 0, 100);
document.body.appendChild(canvas);
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}, 50);
</script>
diff --git a/LayoutTests/fast/canvas/getPutImageDataPairTest.html b/LayoutTests/fast/canvas/getPutImageDataPairTest.html
index 4d61ff96..94ac797 100644
--- a/LayoutTests/fast/canvas/getPutImageDataPairTest.html
+++ b/LayoutTests/fast/canvas/getPutImageDataPairTest.html
@@ -6,8 +6,8 @@
<br>
Result: <a id="result"></a>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
var canvas = document.getElementById("c");
var ctx = canvas.getContext("2d");
diff --git a/LayoutTests/fast/canvas/gradient-add-second-start-end-stop.html b/LayoutTests/fast/canvas/gradient-add-second-start-end-stop.html
index c1a5536..0ba0909 100644
--- a/LayoutTests/fast/canvas/gradient-add-second-start-end-stop.html
+++ b/LayoutTests/fast/canvas/gradient-add-second-start-end-stop.html
@@ -1,8 +1,8 @@
<body>
<canvas id="c" width="600" height="100"></canvas>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+if (window.testRunner)
+ testRunner.dumpAsText(true);
var canvas = document.getElementById("c");
var ctx = canvas.getContext("2d");
diff --git a/LayoutTests/fast/canvas/image-object-in-canvas.html b/LayoutTests/fast/canvas/image-object-in-canvas.html
index f99ac90..f5488bb 100644
--- a/LayoutTests/fast/canvas/image-object-in-canvas.html
+++ b/LayoutTests/fast/canvas/image-object-in-canvas.html
@@ -35,15 +35,15 @@
c4.translate(- i.width / 2, - i.height / 2);
c4.fillRect(0, 0, i.width, i.height);
- if (window.layoutTestController) {
- layoutTestController.notifyDone();
+ if (window.testRunner) {
+ testRunner.notifyDone();
}
}
function runTests() {
- if (window.layoutTestController) {
- layoutTestController.dumpAsText(true);
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText(true);
+ testRunner.waitUntilDone();
}
i = new Image();
diff --git a/LayoutTests/fast/canvas/image-pattern-rotate.html b/LayoutTests/fast/canvas/image-pattern-rotate.html
index 067de5d..60955b7 100644
--- a/LayoutTests/fast/canvas/image-pattern-rotate.html
+++ b/LayoutTests/fast/canvas/image-pattern-rotate.html
@@ -27,15 +27,15 @@
canvases.appendChild(div);
}
- if (window.layoutTestController) {
- layoutTestController.notifyDone();
+ if (window.testRunner) {
+ testRunner.notifyDone();
}
}
function runTests() {
- if (window.layoutTestController) {
- layoutTestController.dumpAsText(true);
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText(true);
+ testRunner.waitUntilDone();
}
img = new Image();
diff --git a/LayoutTests/fast/canvas/invalid-set-font-crash.html b/LayoutTests/fast/canvas/invalid-set-font-crash.html
index 1e04bf7..5bfc970 100644
--- a/LayoutTests/fast/canvas/invalid-set-font-crash.html
+++ b/LayoutTests/fast/canvas/invalid-set-font-crash.html
@@ -1,8 +1,8 @@
<html>
<head>
<script type="text/javascript">
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function init()
{
diff --git a/LayoutTests/fast/canvas/patternfill-repeat.html b/LayoutTests/fast/canvas/patternfill-repeat.html
index a0197ef..93b8a2a 100644
--- a/LayoutTests/fast/canvas/patternfill-repeat.html
+++ b/LayoutTests/fast/canvas/patternfill-repeat.html
@@ -4,9 +4,9 @@
<title>createPattern repeat test</title>
<style> canvas { border:solid #000 } </style>
<script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText(true);
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText(true);
+ testRunner.waitUntilDone();
}
window.onload = function(){
var i = new Image();
@@ -40,8 +40,8 @@
ctx.strokeRect(0, 0, 150, 150);
ctx.fillRect(0, 0, 150, 150);
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
}
</script>
diff --git a/LayoutTests/fast/canvas/quadraticCurveTo.xml b/LayoutTests/fast/canvas/quadraticCurveTo.xml
index a8f6ef1..116d216 100644
--- a/LayoutTests/fast/canvas/quadraticCurveTo.xml
+++ b/LayoutTests/fast/canvas/quadraticCurveTo.xml
@@ -7,8 +7,8 @@
<head>
<title>Context2D.quadraticCurveTo Test Case</title>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+ if (window.testRunner)
+ testRunner.dumpAsText(true);
var ctx;
var current_point;
diff --git a/LayoutTests/fast/canvas/resize-while-save-active.html b/LayoutTests/fast/canvas/resize-while-save-active.html
index 8bbe2b1..0a8efbf 100644
--- a/LayoutTests/fast/canvas/resize-while-save-active.html
+++ b/LayoutTests/fast/canvas/resize-while-save-active.html
@@ -5,8 +5,8 @@
<body>
<canvas id="mycanvas" width="512" height="512"></canvas>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText()
+if (window.testRunner)
+ testRunner.dumpAsText()
var canvas = document.getElementById('mycanvas');
var ctx = canvas.getContext('2d');
ctx.fillStyle = "rgb(255,165,0)";
diff --git a/LayoutTests/fast/canvas/resources/canvas-composite-image-common.js b/LayoutTests/fast/canvas/resources/canvas-composite-image-common.js
index 8c957c7..e5e3ae7 100644
--- a/LayoutTests/fast/canvas/resources/canvas-composite-image-common.js
+++ b/LayoutTests/fast/canvas/resources/canvas-composite-image-common.js
@@ -1,6 +1,6 @@
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
// This test should show a table of canvas elements. Onto the background of each a blue
@@ -374,6 +374,6 @@
//rebaseline(context, i, j);
}
}
- if (layoutTestController)
- layoutTestController.notifyDone();
+ if (testRunner)
+ testRunner.notifyDone();
}
diff --git a/LayoutTests/fast/canvas/resources/repaint.js b/LayoutTests/fast/canvas/resources/repaint.js
index c9a8873..e4b713a 100644
--- a/LayoutTests/fast/canvas/resources/repaint.js
+++ b/LayoutTests/fast/canvas/resources/repaint.js
@@ -1,8 +1,8 @@
function runRepaintTest()
{
- if (window.layoutTestController) {
+ if (window.testRunner) {
document.body.offsetTop;
- layoutTestController.display();
+ testRunner.display();
repaintTest();
} else {
setTimeout(repaintTest, 100);
diff --git a/LayoutTests/fast/canvas/script-inside-canvas-fallback.html b/LayoutTests/fast/canvas/script-inside-canvas-fallback.html
index a7da0c0..7ff7dd1 100644
--- a/LayoutTests/fast/canvas/script-inside-canvas-fallback.html
+++ b/LayoutTests/fast/canvas/script-inside-canvas-fallback.html
@@ -1,7 +1,7 @@
<head>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
<body>
diff --git a/LayoutTests/fast/canvas/script-tests/canvas-drawImage-incomplete.js b/LayoutTests/fast/canvas/script-tests/canvas-drawImage-incomplete.js
index 0277f83..c5094a2 100644
--- a/LayoutTests/fast/canvas/script-tests/canvas-drawImage-incomplete.js
+++ b/LayoutTests/fast/canvas/script-tests/canvas-drawImage-incomplete.js
@@ -1,7 +1,7 @@
description("Test that drawImage() does nothing with an incomplete image or video");
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
var canvas = document.createElement("canvas");
var ctx = canvas.getContext('2d');
diff --git a/LayoutTests/fast/canvas/script-tests/canvas-gradient-addStop-error.js b/LayoutTests/fast/canvas/script-tests/canvas-gradient-addStop-error.js
index 19846c5..8ea4f5c 100644
--- a/LayoutTests/fast/canvas/script-tests/canvas-gradient-addStop-error.js
+++ b/LayoutTests/fast/canvas/script-tests/canvas-gradient-addStop-error.js
@@ -6,9 +6,9 @@
var gradient = ctx.createRadialGradient(0, 0, 0, 100, 0, 0);
shouldThrow("gradient.addColorStop(1, 'rgb(NaN%, NaN%, NaN%)')");
-if (this.layoutTestController) {
+if (this.testRunner) {
debug("Switching to dashboard compatibility mode. Invalid color strings should no longer cause an exception.");
- layoutTestController.setUseDashboardCompatibilityMode(true);
+ testRunner.setUseDashboardCompatibilityMode(true);
} else {
debug("The following tests will fail in the browser as we can only enable dashboard compatibility mode in DRT.")
}
diff --git a/LayoutTests/fast/canvas/script-tests/canvas-imageSmoothingEnabled-repaint.js b/LayoutTests/fast/canvas/script-tests/canvas-imageSmoothingEnabled-repaint.js
index f8c0833..6576a1a 100644
--- a/LayoutTests/fast/canvas/script-tests/canvas-imageSmoothingEnabled-repaint.js
+++ b/LayoutTests/fast/canvas/script-tests/canvas-imageSmoothingEnabled-repaint.js
@@ -41,7 +41,7 @@
function TestControllerPaint() {
while (drawIterations > 0) {
draw();
- layoutTestController.display();
+ testRunner.display();
drawIterations = drawIterations - 1;
}
draw();
@@ -61,7 +61,7 @@
function onLoadHandler()
{
- if (window.layoutTestController) {
+ if (window.testRunner) {
TestControllerPaint();
} else {
BrowserPaint();
diff --git a/LayoutTests/fast/canvas/setWidthResetAfterForcedRender.html b/LayoutTests/fast/canvas/setWidthResetAfterForcedRender.html
index ec44e23..8fba175 100644
--- a/LayoutTests/fast/canvas/setWidthResetAfterForcedRender.html
+++ b/LayoutTests/fast/canvas/setWidthResetAfterForcedRender.html
@@ -4,8 +4,8 @@
<head>
<script src="resources/repaint.js"></script>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+if (window.testRunner)
+ testRunner.dumpAsText(true);
function repaintTest()
{
diff --git a/LayoutTests/fast/canvas/shadow-huge-blur.html b/LayoutTests/fast/canvas/shadow-huge-blur.html
index 5bd9dd0..ff17646 100644
--- a/LayoutTests/fast/canvas/shadow-huge-blur.html
+++ b/LayoutTests/fast/canvas/shadow-huge-blur.html
@@ -1,8 +1,8 @@
<!DOCTYPE HTML>
<body>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText()
+if (window.testRunner)
+ testRunner.dumpAsText()
document.body.appendChild(document.createElement("p")).appendChild(document.createTextNode("This test passes if it does not cause a crash"));
var canvas = document.body.appendChild(document.createElement("canvas"));
diff --git a/LayoutTests/fast/canvas/shadow-offset-1.html b/LayoutTests/fast/canvas/shadow-offset-1.html
index 1e50980..f4289d1 100644
--- a/LayoutTests/fast/canvas/shadow-offset-1.html
+++ b/LayoutTests/fast/canvas/shadow-offset-1.html
@@ -2,8 +2,8 @@
<body>
<script src="resources/shadow-offset.js"></script>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+if (window.testRunner)
+ testRunner.dumpAsText(true);
setter = function(ctx, offsetX, offsetY) {
ctx.shadowOffsetX = offsetX;
diff --git a/LayoutTests/fast/canvas/shadow-offset-2.html b/LayoutTests/fast/canvas/shadow-offset-2.html
index ae69610..5291336 100644
--- a/LayoutTests/fast/canvas/shadow-offset-2.html
+++ b/LayoutTests/fast/canvas/shadow-offset-2.html
@@ -2,8 +2,8 @@
<body>
<script src="resources/shadow-offset.js"></script>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+if (window.testRunner)
+ testRunner.dumpAsText(true);
setter = function(ctx, offsetX, offsetY) {
ctx.setShadow(offsetX, offsetY, 0, 0.5);
diff --git a/LayoutTests/fast/canvas/shadow-offset-3.html b/LayoutTests/fast/canvas/shadow-offset-3.html
index 0b8f4fd..5d2bda6 100644
--- a/LayoutTests/fast/canvas/shadow-offset-3.html
+++ b/LayoutTests/fast/canvas/shadow-offset-3.html
@@ -2,8 +2,8 @@
<body>
<script src="resources/shadow-offset.js"></script>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+if (window.testRunner)
+ testRunner.dumpAsText(true);
setter = function(ctx, offsetX, offsetY) {
ctx.setShadow(offsetX, offsetY, 0, "green");
diff --git a/LayoutTests/fast/canvas/shadow-offset-4.html b/LayoutTests/fast/canvas/shadow-offset-4.html
index a301c50..2d6e6d0 100644
--- a/LayoutTests/fast/canvas/shadow-offset-4.html
+++ b/LayoutTests/fast/canvas/shadow-offset-4.html
@@ -2,8 +2,8 @@
<body>
<script src="resources/shadow-offset.js"></script>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+if (window.testRunner)
+ testRunner.dumpAsText(true);
setter = function(ctx, offsetX, offsetY) {
ctx.setShadow(offsetX, offsetY, 0, "green", 0.9);
diff --git a/LayoutTests/fast/canvas/shadow-offset-5.html b/LayoutTests/fast/canvas/shadow-offset-5.html
index b7b5b94..c60e3cd 100644
--- a/LayoutTests/fast/canvas/shadow-offset-5.html
+++ b/LayoutTests/fast/canvas/shadow-offset-5.html
@@ -2,8 +2,8 @@
<body>
<script src="resources/shadow-offset.js"></script>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+if (window.testRunner)
+ testRunner.dumpAsText(true);
setter = function(ctx, offsetX, offsetY) {
ctx.setShadow(offsetX, offsetY, 0, 0, 0.5, 0, 0.9);
diff --git a/LayoutTests/fast/canvas/shadow-offset-6.html b/LayoutTests/fast/canvas/shadow-offset-6.html
index b9f8c97..459ca90 100644
--- a/LayoutTests/fast/canvas/shadow-offset-6.html
+++ b/LayoutTests/fast/canvas/shadow-offset-6.html
@@ -2,8 +2,8 @@
<body>
<script src="resources/shadow-offset.js"></script>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+if (window.testRunner)
+ testRunner.dumpAsText(true);
setter = function(ctx, offsetX, offsetY) {
ctx.setShadow(offsetX, offsetY, 0, 0.2, 0.9);
diff --git a/LayoutTests/fast/canvas/shadow-offset-7.html b/LayoutTests/fast/canvas/shadow-offset-7.html
index b53e765..522aa7d 100644
--- a/LayoutTests/fast/canvas/shadow-offset-7.html
+++ b/LayoutTests/fast/canvas/shadow-offset-7.html
@@ -2,8 +2,8 @@
<body>
<script src="resources/shadow-offset.js"></script>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+if (window.testRunner)
+ testRunner.dumpAsText(true);
setter = function(ctx, offsetX, offsetY) {
ctx.setShadow(offsetX, offsetY, 0, 1, 0, 1, 0, 0.9);
diff --git a/LayoutTests/fast/canvas/strokeText-missing-args.html b/LayoutTests/fast/canvas/strokeText-missing-args.html
index ffbb5a6..1bd20c7 100644
--- a/LayoutTests/fast/canvas/strokeText-missing-args.html
+++ b/LayoutTests/fast/canvas/strokeText-missing-args.html
@@ -2,8 +2,8 @@
<html>
<body>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
try {
document.createElement('canvas').getContext('2d').strokeText();
} catch (err) {
diff --git a/LayoutTests/fast/canvas/svg-taint.html b/LayoutTests/fast/canvas/svg-taint.html
index 4ce479a..46cd240 100644
--- a/LayoutTests/fast/canvas/svg-taint.html
+++ b/LayoutTests/fast/canvas/svg-taint.html
@@ -1,9 +1,9 @@
<html>
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function log(message) {
@@ -30,8 +30,8 @@
log('Oh dear -- missing exception!');
} catch (e) {
log('Exception: ' + e.name);
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
}
</script>
diff --git a/LayoutTests/fast/canvas/toDataURL-alpha.html b/LayoutTests/fast/canvas/toDataURL-alpha.html
index 0d0f848..b3dd654 100644
--- a/LayoutTests/fast/canvas/toDataURL-alpha.html
+++ b/LayoutTests/fast/canvas/toDataURL-alpha.html
@@ -3,8 +3,8 @@
<head>
<title>canvas toDataURL alpha png bug</title>
<script type="text/javascript">
-if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+if (window.testRunner)
+ testRunner.dumpAsText(true);
function load() {
var context = document.getElementById("c").getContext("2d");
diff --git a/LayoutTests/fast/canvas/toDataURL-noData.html b/LayoutTests/fast/canvas/toDataURL-noData.html
index e74f741..5ea7bcb 100644
--- a/LayoutTests/fast/canvas/toDataURL-noData.html
+++ b/LayoutTests/fast/canvas/toDataURL-noData.html
@@ -1,8 +1,8 @@
<html>
<head>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function log(msg)
{
diff --git a/LayoutTests/fast/canvas/toDataURL-supportedTypes.html b/LayoutTests/fast/canvas/toDataURL-supportedTypes.html
index 99195fa..02475d8 100644
--- a/LayoutTests/fast/canvas/toDataURL-supportedTypes.html
+++ b/LayoutTests/fast/canvas/toDataURL-supportedTypes.html
@@ -5,8 +5,8 @@
pre { display: inline-block; margin: 5px; }
</style>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function draw()
{
diff --git a/LayoutTests/fast/canvas/unclosed-canvas-1.html b/LayoutTests/fast/canvas/unclosed-canvas-1.html
index 2993c88..0b5da79 100644
--- a/LayoutTests/fast/canvas/unclosed-canvas-1.html
+++ b/LayoutTests/fast/canvas/unclosed-canvas-1.html
@@ -1,7 +1,7 @@
<head>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
<body>
diff --git a/LayoutTests/fast/canvas/unclosed-canvas-2.html b/LayoutTests/fast/canvas/unclosed-canvas-2.html
index 13b8fe3..5dc3e189 100644
--- a/LayoutTests/fast/canvas/unclosed-canvas-2.html
+++ b/LayoutTests/fast/canvas/unclosed-canvas-2.html
@@ -1,7 +1,7 @@
<head>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
<body>
diff --git a/LayoutTests/fast/canvas/unclosed-canvas-3.html b/LayoutTests/fast/canvas/unclosed-canvas-3.html
index 55551fc..9c7ea46 100644
--- a/LayoutTests/fast/canvas/unclosed-canvas-3.html
+++ b/LayoutTests/fast/canvas/unclosed-canvas-3.html
@@ -1,7 +1,7 @@
<head>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
<body>
diff --git a/LayoutTests/fast/canvas/unclosed-canvas-4.html b/LayoutTests/fast/canvas/unclosed-canvas-4.html
index 1138ff8..586a920 100644
--- a/LayoutTests/fast/canvas/unclosed-canvas-4.html
+++ b/LayoutTests/fast/canvas/unclosed-canvas-4.html
@@ -1,7 +1,7 @@
<head>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
<body>
diff --git a/LayoutTests/fast/canvas/webgl/canvas-2d-webgl-texture.html b/LayoutTests/fast/canvas/webgl/canvas-2d-webgl-texture.html
index 701f726..411b034 100755
--- a/LayoutTests/fast/canvas/webgl/canvas-2d-webgl-texture.html
+++ b/LayoutTests/fast/canvas/webgl/canvas-2d-webgl-texture.html
@@ -9,9 +9,9 @@
var wtu = WebGLTestUtils;
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
var canvas;
@@ -34,8 +34,8 @@
wtu.drawQuad(gl);
wtu.checkCanvasRect(gl, 0, 0, 1, 1, [0, 0, 200, 255], "Should have rendered blue.", 1);
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
window.onload = function()
diff --git a/LayoutTests/fast/canvas/webgl/canvas-test.html b/LayoutTests/fast/canvas/webgl/canvas-test.html
index 5abe62d..0ef144c 100644
--- a/LayoutTests/fast/canvas/webgl/canvas-test.html
+++ b/LayoutTests/fast/canvas/webgl/canvas-test.html
@@ -135,8 +135,8 @@
canvas.style.height = "25px";
var intervalId;
intervalId = window.setInterval(function() {
- if (window.layoutTestController)
- layoutTestController.display();
+ if (window.testRunner)
+ testRunner.display();
if (canvas.clientWidth == 100 &&
canvas.clientHeight == 25) {
window.clearInterval(intervalId);
diff --git a/LayoutTests/fast/canvas/webgl/context-destroyed-crash.html b/LayoutTests/fast/canvas/webgl/context-destroyed-crash.html
index 7a616e7..002eb04 100644
--- a/LayoutTests/fast/canvas/webgl/context-destroyed-crash.html
+++ b/LayoutTests/fast/canvas/webgl/context-destroyed-crash.html
@@ -4,9 +4,9 @@
</head>
<body>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function gc()
@@ -36,8 +36,8 @@
extension.loseContext();
document.body.innerHTML = "PASS";
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
</script>
</body>
diff --git a/LayoutTests/fast/canvas/webgl/css-webkit-canvas-repaint.html b/LayoutTests/fast/canvas/webgl/css-webkit-canvas-repaint.html
index 99d054f..11628a6 100644
--- a/LayoutTests/fast/canvas/webgl/css-webkit-canvas-repaint.html
+++ b/LayoutTests/fast/canvas/webgl/css-webkit-canvas-repaint.html
@@ -94,9 +94,9 @@
gl.drawArrays(gl.TRIANGLES, 0, 3);
}
- if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.overridePreference("WebKitWebGLEnabled", "1");
}
initialize();
@@ -105,8 +105,8 @@
draw(0.7, 0, 0);
setTimeout(function() {
draw(0, 0.5, 0);
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}, 100);
}, 100);
</script>
diff --git a/LayoutTests/fast/canvas/webgl/css-webkit-canvas.html b/LayoutTests/fast/canvas/webgl/css-webkit-canvas.html
index d5a18a1..3b84057 100644
--- a/LayoutTests/fast/canvas/webgl/css-webkit-canvas.html
+++ b/LayoutTests/fast/canvas/webgl/css-webkit-canvas.html
@@ -94,8 +94,8 @@
gl.drawArrays(gl.TRIANGLES, 0, 3);
}
- if (window.layoutTestController)
- layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
+ if (window.testRunner)
+ testRunner.overridePreference("WebKitWebGLEnabled", "1");
initialize();
draw(0, 0.5, 0);
diff --git a/LayoutTests/fast/canvas/webgl/gl-teximage.html b/LayoutTests/fast/canvas/webgl/gl-teximage.html
index 7f98ed0..e8c16dd 100644
--- a/LayoutTests/fast/canvas/webgl/gl-teximage.html
+++ b/LayoutTests/fast/canvas/webgl/gl-teximage.html
@@ -93,7 +93,7 @@
// When running in WebKit's test harness, we don't want to print the
// pixel value when the test passes, because different machines might
// have different results and we record the text output.
- var inDumpRenderTree = window.layoutTestController;
+ var inDumpRenderTree = window.testRunner;
for (var ii = 0; ii < 4; ++ii) {
if (Math.abs(buf[off + ii] - color[ii]) > allowedRange) {
testFailed(msg + subMsg);
diff --git a/LayoutTests/fast/canvas/webgl/premultiplyalpha-test.html b/LayoutTests/fast/canvas/webgl/premultiplyalpha-test.html
index e29d5f1..f8acc05 100644
--- a/LayoutTests/fast/canvas/webgl/premultiplyalpha-test.html
+++ b/LayoutTests/fast/canvas/webgl/premultiplyalpha-test.html
@@ -72,9 +72,9 @@
var canvas;
var premultipledAlpha;
-if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.overridePreference("WebKitWebGLEnabled", "1");
}
description("Test the WebGL premultipledAlpha context creation flag.");
@@ -154,8 +154,8 @@
setTimeout(loadTexture, 0);
}
} else {
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
finishTest();
}
}
diff --git a/LayoutTests/fast/canvas/webgl/resources/webgl-test.js b/LayoutTests/fast/canvas/webgl/resources/webgl-test.js
index be257c1..01a6a04 100644
--- a/LayoutTests/fast/canvas/webgl/resources/webgl-test.js
+++ b/LayoutTests/fast/canvas/webgl/resources/webgl-test.js
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Differences with respect to Khronos version of webgl-test.js
-if (window.layoutTestController)
- layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
+if (window.testRunner)
+ testRunner.overridePreference("WebKitWebGLEnabled", "1");
function assertMsg(assertion, msg) {
if (assertion) {
@@ -12,18 +12,18 @@
}
function initNonKhronosFramework(waitUntilDone) {
- if (window.layoutTestController) {
- layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.overridePreference("WebKitWebGLEnabled", "1");
+ testRunner.dumpAsText();
if (waitUntilDone) {
- layoutTestController.waitUntilDone();
+ testRunner.waitUntilDone();
}
}
}
function nonKhronosFrameworkNotifyDone() {
- if (window.layoutTestController) {
- layoutTestController.notifyDone();
+ if (window.testRunner) {
+ testRunner.notifyDone();
}
}
diff --git a/LayoutTests/fast/canvas/webgl/texImage2DImageDataTest.html b/LayoutTests/fast/canvas/webgl/texImage2DImageDataTest.html
index 0c5bc2b..41ea405 100644
--- a/LayoutTests/fast/canvas/webgl/texImage2DImageDataTest.html
+++ b/LayoutTests/fast/canvas/webgl/texImage2DImageDataTest.html
@@ -51,9 +51,9 @@
function init()
{
- if (window.layoutTestController) {
- layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.overridePreference("WebKitWebGLEnabled", "1");
+ testRunner.dumpAsText();
}
// Set up a canvas to get image data from
var canvas2d = document.getElementById("texcanvas");
diff --git a/LayoutTests/fast/canvas/webgl/texture-color-profile.html b/LayoutTests/fast/canvas/webgl/texture-color-profile.html
index f80f797..ed9e70b 100644
--- a/LayoutTests/fast/canvas/webgl/texture-color-profile.html
+++ b/LayoutTests/fast/canvas/webgl/texture-color-profile.html
@@ -55,7 +55,7 @@
// When running in WebKit's test harness, we don't want to print the
// pixel value when the test passes, because different machines might
// have different results and we record the text output.
- var inDumpRenderTree = window.layoutTestController;
+ var inDumpRenderTree = window.testRunner;
for (var ii = 0; ii < 4; ++ii) {
if (Math.abs(buf[off + ii] - color[ii]) > allowedRange) {
testFailed(msg + subMsg);
diff --git a/LayoutTests/fast/canvas/webgl/webgl-composite-modes-repaint.html b/LayoutTests/fast/canvas/webgl/webgl-composite-modes-repaint.html
index 468182e..ff37163 100644
--- a/LayoutTests/fast/canvas/webgl/webgl-composite-modes-repaint.html
+++ b/LayoutTests/fast/canvas/webgl/webgl-composite-modes-repaint.html
@@ -47,9 +47,9 @@
var ctxs = []
-if (window.layoutTestController) {
- layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
- layoutTestController.dumpAsText(true);
+if (window.testRunner) {
+ testRunner.overridePreference("WebKitWebGLEnabled", "1");
+ testRunner.dumpAsText(true);
document.getElementById("description").style.position = "absolute";
document.getElementById("description").style.top = "-5000px";
}
diff --git a/LayoutTests/fast/canvas/webgl/webgl-composite-modes.html b/LayoutTests/fast/canvas/webgl/webgl-composite-modes.html
index 669d9c7..5cfb5f6 100644
--- a/LayoutTests/fast/canvas/webgl/webgl-composite-modes.html
+++ b/LayoutTests/fast/canvas/webgl/webgl-composite-modes.html
@@ -45,9 +45,9 @@
var ctxs = []
-if (window.layoutTestController) {
- layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
- layoutTestController.dumpAsText(true);
+if (window.testRunner) {
+ testRunner.overridePreference("WebKitWebGLEnabled", "1");
+ testRunner.dumpAsText(true);
document.getElementById("description").style.position = "absolute";
document.getElementById("description").style.top = "-5000px";
}
diff --git a/LayoutTests/fast/canvas/webgl/webgl-texture-binding-preserved.html b/LayoutTests/fast/canvas/webgl/webgl-texture-binding-preserved.html
index b71cd8d..f7c93fc 100755
--- a/LayoutTests/fast/canvas/webgl/webgl-texture-binding-preserved.html
+++ b/LayoutTests/fast/canvas/webgl/webgl-texture-binding-preserved.html
@@ -12,9 +12,9 @@
var wtu = WebGLTestUtils;
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
var canvas;
@@ -27,8 +27,8 @@
wtu.drawQuad(context);
wtu.checkCanvasRect(context, 0, 0, 1, 1, [0, 0, 255, 255], "Should have rendered blue.", 1);
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
window.onload = function()
diff --git a/LayoutTests/fast/canvas/webgl/webgl-viewport-parameters-preserved.html b/LayoutTests/fast/canvas/webgl/webgl-viewport-parameters-preserved.html
index 1e68746..dbf3a80 100755
--- a/LayoutTests/fast/canvas/webgl/webgl-viewport-parameters-preserved.html
+++ b/LayoutTests/fast/canvas/webgl/webgl-viewport-parameters-preserved.html
@@ -12,9 +12,9 @@
var wtu = WebGLTestUtils;
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
var canvas;
@@ -29,8 +29,8 @@
testPassed("Viewport not corrupted.");
}
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
window.onload = function()
diff --git a/LayoutTests/fast/canvas/webgl/worker-data-view-test.html b/LayoutTests/fast/canvas/webgl/worker-data-view-test.html
index 799b72c..3db9935 100644
--- a/LayoutTests/fast/canvas/webgl/worker-data-view-test.html
+++ b/LayoutTests/fast/canvas/webgl/worker-data-view-test.html
@@ -13,15 +13,15 @@
var worker = new Worker("resources/worker-data-view-test.js");
worker.onmessage = function(event) {
log(event.data);
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
};
worker.postMessage("start");
}
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
</script>
</head>
diff --git a/LayoutTests/fast/canvas/zero-size-fill-rect.html b/LayoutTests/fast/canvas/zero-size-fill-rect.html
index a0963b1..ae4cc62 100644
--- a/LayoutTests/fast/canvas/zero-size-fill-rect.html
+++ b/LayoutTests/fast/canvas/zero-size-fill-rect.html
@@ -9,8 +9,8 @@
<head>
<script type="text/javascript">
window.onload = function() {
- if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+ if (window.testRunner)
+ testRunner.dumpAsText(true);
var canvas = document.getElementById("test");
var context = canvas.getContext("2d");
