summaryrefslogtreecommitdiffstats
path: root/third_party/WebKit/LayoutTests/fast/animation
diff options
context:
space:
mode:
authorrniwa@webkit.org <rniwa@webkit.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538>2012-06-19 06:35:17 +0000
committerrniwa@webkit.org <rniwa@webkit.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538>2012-06-19 06:35:17 +0000
commit7946c149a5551bd110bd5ec791af86afa41eadad (patch)
tree702b6f9ea4381672f9be91fc010fa12138955649 /third_party/WebKit/LayoutTests/fast/animation
parent22e8b4c0c44973693b164f7b00cfa75c5b818fef (diff)
downloadchromium_src-7946c149a5551bd110bd5ec791af86afa41eadad.zip
chromium_src-7946c149a5551bd110bd5ec791af86afa41eadad.tar.gz
chromium_src-7946c149a5551bd110bd5ec791af86afa41eadad.tar.bz2
Use testRunner instead of layoutTestController in fast/animation, autoresize, backgrounds, block, body-propagation, borders, and box-* tests
https://bugs.webkit.org/show_bug.cgi?id=89422 Reviewed by Kent Tamura. * fast/animation/request-animation-frame-detach-element.html: * fast/animation/request-animation-frame-detach-element2.html: * fast/animation/request-animation-frame-disabled.html: * fast/animation/request-animation-frame-during-modal.html: * fast/animation/request-animation-frame-iframe.html: * fast/animation/script-tests/request-animation-frame-cancel.js: * fast/animation/script-tests/request-animation-frame-cancel2.js: * fast/animation/script-tests/request-animation-frame-disabled.js: * fast/animation/script-tests/request-animation-frame-timestamps-advance.js: * fast/animation/script-tests/request-animation-frame-timestamps.js: * fast/animation/script-tests/request-animation-frame-within-callback.js: * fast/animation/script-tests/request-animation-frame.js: * fast/autoresize/autoresize-with-iframe.html: * fast/autoresize/basic.html: * fast/autoresize/turn-off-autoresize.html: * fast/backgrounds/animated-gif-as-background.html: * fast/backgrounds/animated-svg-as-mask.html: * fast/backgrounds/background-fast-path-simple-color.html: * fast/backgrounds/background-fill-zero-area-crash.html: * fast/backgrounds/background-repeat-computed-style.html: * fast/backgrounds/multiple-backgrounds-assert.html: * fast/backgrounds/root-background-propagation.html: * fast/backgrounds/root-background-propagation2.html: * fast/backgrounds/size/contain-and-cover-zoomed.html: * fast/backgrounds/solid-color-context-restore.html: * fast/block/: * fast/borders/border-image-reset-by-border-shorthand.html: * fast/borders/border-image-slice-omission.html: * fast/borders/border-mixed-alpha.html: * fast/borders/border-radius-complex-inner.html: * fast/borders/border-radius-parsing.html: * fast/borders/negative-border-width.html: * fast/borders/outline-alpha-block.html: * fast/borders/outline-alpha-inline.html: * fast/box-shadow/box-shadow-clipped-slices.html: * fast/box-shadow/box-shadow-currentcolor.html: * fast/box-shadow/no-blur-multiple-offsets.html: * fast/box-shadow/resources/box-shadow-overflow-scroll.js: * fast/box-shadow/spread-multiple-inset.html: * fast/box-shadow/spread-multiple-normal.html: git-svn-id: svn://svn.chromium.org/blink/trunk@120681 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Diffstat (limited to 'third_party/WebKit/LayoutTests/fast/animation')
-rw-r--r--third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-detach-element.html12
-rw-r--r--third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-detach-element2.html12
-rw-r--r--third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-disabled.html4
-rw-r--r--third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-during-modal.html20
-rw-r--r--third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-iframe.html14
-rw-r--r--third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-cancel.js12
-rw-r--r--third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-cancel2.js12
-rw-r--r--third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-disabled.js12
-rw-r--r--third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-timestamps-advance.js8
-rw-r--r--third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-timestamps.js12
-rw-r--r--third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-within-callback.js16
-rw-r--r--third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame.js12
12 files changed, 73 insertions, 73 deletions
diff --git a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-detach-element.html b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-detach-element.html
index 2acd468..11d99af 100644
--- a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-detach-element.html
+++ b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-detach-element.html
@@ -1,8 +1,8 @@
<!DOCTYPE html>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
window.onload = function() {
var el = document.getElementsByTagName("iframe")[0];
@@ -12,10 +12,10 @@ window.onload = function() {
window.frames[1].webkitRequestAnimationFrame(function() {
});
- if (window.layoutTestController) {
+ if (window.testRunner) {
window.setTimeout(function() {
- layoutTestController.display();
- layoutTestController.notifyDone();
+ testRunner.display();
+ testRunner.notifyDone();
}, 50);
}
}
diff --git a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-detach-element2.html b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-detach-element2.html
index e2b022a..6d2a290 100644
--- a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-detach-element2.html
+++ b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-detach-element2.html
@@ -1,8 +1,8 @@
<!DOCTYPE html>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
window.onload = function() {
var el = document.getElementsByTagName("iframe")[0];
@@ -10,10 +10,10 @@ window.onload = function() {
el.parentNode.removeChild(el);
});
- if (window.layoutTestController) {
+ if (window.testRunner) {
window.setTimeout(function() {
- layoutTestController.display();
- layoutTestController.notifyDone();
+ testRunner.display();
+ testRunner.notifyDone();
}, 50);
}
}
diff --git a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-disabled.html b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-disabled.html
index bf17287..4921559a 100644
--- a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-disabled.html
+++ b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-disabled.html
@@ -2,8 +2,8 @@
<html>
<head>
<script>
-if (window.layoutTestController)
- window.layoutTestController.overridePreference("WebKitRequestAnimationFrameEnabled", "0");
+if (window.testRunner)
+ window.testRunner.overridePreference("WebKitRequestAnimationFrameEnabled", "0");
</script>
<script src="../js/resources/js-test-pre.js"></script>
</head>
diff --git a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-during-modal.html b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-during-modal.html
index 76de8f2..6d3fc34 100644
--- a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-during-modal.html
+++ b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-during-modal.html
@@ -4,8 +4,8 @@
<body>
<script type="text/javascript">
-if (window.layoutTestController)
- layoutTestController.setCanOpenWindows();
+if (window.testRunner)
+ testRunner.setCanOpenWindows();
description('Tests that requestAnimationFrame callbacks are not invoked while modal dialogs are displayed.');
@@ -14,26 +14,26 @@ onload = function()
debug('Setting callback');
window.webkitRequestAnimationFrame(function() { debug('Callback fired'); }, document.body);
debug('Showing modal dialog');
- var src = 'if (window.layoutTestController) {' +
- ' layoutTestController.display();' +
+ var src = 'if (window.testRunner) {' +
+ ' testRunner.display();' +
' window.close();' +
'} else {'+
' window.setTimeout(window.close, 10);'+
'}';
showModalDialog('data:text/html,<script>' + src + '</' + 'script>');
debug('Returned from modal dialog');
- if (window.layoutTestController) {;
- layoutTestController.display();
+ if (window.testRunner) {;
+ testRunner.display();
}
}
-if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+if (window.testRunner)
+ testRunner.waitUntilDone();
setTimeout(function() {
isSuccessfullyParsed();
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}, 200);
</script>
diff --git a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-iframe.html b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-iframe.html
index a8eb3fc..28edb87 100644
--- a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-iframe.html
+++ b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-iframe.html
@@ -10,16 +10,16 @@
var callbackInvoked = false;
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
// Called from subframe.
function doDisplay()
{
- if (window.layoutTestController)
- layoutTestController.display();
+ if (window.testRunner)
+ testRunner.display();
}
function doCheckResult()
@@ -30,8 +30,8 @@
function doTestDone()
{
isSuccessfullyParsed();
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
</script>
</body>
diff --git a/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-cancel.js b/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-cancel.js
index 53f8158..48c1a3f 100644
--- a/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-cancel.js
+++ b/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-cancel.js
@@ -7,18 +7,18 @@ var id = window.webkitRequestAnimationFrame(function() {
window.webkitCancelAnimationFrame(id);
-if (window.layoutTestController)
- layoutTestController.display();
+if (window.testRunner)
+ testRunner.display();
setTimeout(function() {
shouldBeFalse("callbackFired");
}, 100);
-if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+if (window.testRunner)
+ testRunner.waitUntilDone();
setTimeout(function() {
isSuccessfullyParsed();
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}, 200);
diff --git a/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-cancel2.js b/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-cancel2.js
index 38da6fe..1e2310b 100644
--- a/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-cancel2.js
+++ b/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-cancel2.js
@@ -14,19 +14,19 @@ secondCallbackId = window.webkitRequestAnimationFrame(function() {
callbackFired = true;
}, e);
-if (window.layoutTestController)
- layoutTestController.display();
+if (window.testRunner)
+ testRunner.display();
setTimeout(function() {
shouldBeFalse("callbackFired");
shouldBeTrue("cancelFired");
}, 100);
-if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+if (window.testRunner)
+ testRunner.waitUntilDone();
setTimeout(function() {
isSuccessfullyParsed();
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}, 200);
diff --git a/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-disabled.js b/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-disabled.js
index b6477b9..b4cb3c4 100644
--- a/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-disabled.js
+++ b/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-disabled.js
@@ -5,18 +5,18 @@ window.webkitRequestAnimationFrame(function() {
callbackInvoked = true;
});
-if (window.layoutTestController)
- layoutTestController.display();
+if (window.testRunner)
+ testRunner.display();
setTimeout(function() {
shouldBeFalse("callbackInvoked");
}, 100);
-if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+if (window.testRunner)
+ testRunner.waitUntilDone();
setTimeout(function() {
isSuccessfullyParsed();
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}, 200);
diff --git a/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-timestamps-advance.js b/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-timestamps-advance.js
index 2b8c518..7e44ee8 100644
--- a/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-timestamps-advance.js
+++ b/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-timestamps-advance.js
@@ -20,12 +20,12 @@ window.webkitRequestAnimationFrame(function(timestamp) {
finishJSTest();
});
busyWait(10);
- if (window.layoutTestController)
- layoutTestController.display();
+ if (window.testRunner)
+ testRunner.display();
});
-if (window.layoutTestController)
+if (window.testRunner)
window.setTimeout(function() {
- layoutTestController.display();
+ testRunner.display();
});
diff --git a/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-timestamps.js b/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-timestamps.js
index ab6d9ad..87100ff 100644
--- a/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-timestamps.js
+++ b/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-timestamps.js
@@ -20,11 +20,11 @@ window.webkitRequestAnimationFrame(function(timestamp) {
shouldBe("firstTimestamp", "secondTimestamp");
});
-if (window.layoutTestController)
- layoutTestController.display();
+if (window.testRunner)
+ testRunner.display();
-if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+if (window.testRunner)
+ testRunner.waitUntilDone();
setTimeout(function() {
shouldBeDefined("firstTimestamp");
@@ -32,6 +32,6 @@ setTimeout(function() {
setTimeout(function() {
isSuccessfullyParsed();
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}, 200);
diff --git a/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-within-callback.js b/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-within-callback.js
index e4398e0..943cf6f 100644
--- a/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-within-callback.js
+++ b/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-within-callback.js
@@ -15,17 +15,17 @@ window.webkitRequestAnimationFrame(function() {
}, e);
// This should fire the three already registered callbacks, but not the one dynamically registered.
-if (window.layoutTestController)
- layoutTestController.display();
+if (window.testRunner)
+ testRunner.display();
// This should fire the dynamically registered callback.
-if (window.layoutTestController)
- layoutTestController.display();
+if (window.testRunner)
+ testRunner.display();
-if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+if (window.testRunner)
+ testRunner.waitUntilDone();
setTimeout(function() {
isSuccessfullyParsed();
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}, 200);
diff --git a/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame.js b/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame.js
index 1647315..16d479f 100644
--- a/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame.js
+++ b/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame.js
@@ -6,18 +6,18 @@ window.webkitRequestAnimationFrame(function() {
callbackInvoked = true;
}, e);
-if (window.layoutTestController)
- layoutTestController.display();
+if (window.testRunner)
+ testRunner.display();
setTimeout(function() {
shouldBeTrue("callbackInvoked");
}, 100);
-if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+if (window.testRunner)
+ testRunner.waitUntilDone();
setTimeout(function() {
isSuccessfullyParsed();
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}, 200);
generated by cgit v1.1 at 2025-04-07 19:21:12 +0000