diff options
| author | jamesr@google.com <jamesr@google.com@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2011-01-25 20:01:12 +0000 |
|---|---|---|
| committer | jamesr@google.com <jamesr@google.com@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2011-01-25 20:01:12 +0000 |
| commit | 308ee2e9cda05bdf32b21fe1c10d2293719d726e (patch) | |
| tree | 9426a000cc81922b2774f4019597016d171a9d3a /third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-within-callback.html | |
| parent | 3f052c9d02c424634d1e793bc8ec12882783c997 (diff) | |
| download | chromium_src-308ee2e9cda05bdf32b21fe1c10d2293719d726e.zip chromium_src-308ee2e9cda05bdf32b21fe1c10d2293719d726e.tar.gz chromium_src-308ee2e9cda05bdf32b21fe1c10d2293719d726e.tar.bz2 | |
2011-01-25 James Robinson <jamesr@chromium.org>
Reviewed by Mihai Parparita.
Convert requestAnimationFrame tests to be script-tests
https://bugs.webkit.org/show_bug.cgi?id=53109
This converts the new requestAnimationFrame tests to be proper script-tests using make-script-test-wrapper.
* fast/animation/request-animation-frame-cancel-expected.txt:
* fast/animation/request-animation-frame-cancel.html:
* fast/animation/request-animation-frame-cancel2-expected.txt:
* fast/animation/request-animation-frame-cancel2.html:
* fast/animation/request-animation-frame-display-expected.txt:
* fast/animation/request-animation-frame-display.html:
* fast/animation/request-animation-frame-expected.txt:
* fast/animation/request-animation-frame-within-callback-expected.txt:
* fast/animation/request-animation-frame-within-callback.html:
* fast/animation/request-animation-frame.html:
* fast/animation/script-tests/TEMPLATE.html: Added.
* fast/animation/script-tests/request-animation-frame-cancel.js: Copied from LayoutTests/fast/animation/request-animation-frame-cancel.html.
* fast/animation/script-tests/request-animation-frame-cancel2.js: Copied from LayoutTests/fast/animation/request-animation-frame-cancel2.html.
(secondCallbackId):
* fast/animation/script-tests/request-animation-frame-display.js: Added.
* fast/animation/script-tests/request-animation-frame-within-callback.js: Copied from LayoutTests/fast/animation/request-animation-frame-within-callback.html.
(window):
* fast/animation/script-tests/request-animation-frame.js: Added.
git-svn-id: svn://svn.chromium.org/blink/trunk@76623 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Diffstat (limited to 'third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-within-callback.html')
| -rw-r--r-- | third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-within-callback.html | 39 |
1 files changed, 13 insertions, 26 deletions
diff --git a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-within-callback.html b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-within-callback.html index d5a366f..96fbbf0 100644 --- a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-within-callback.html +++ b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-within-callback.html @@ -1,28 +1,15 @@ <!DOCTYPE html> <html> -<span id="e">FAIL</span> -<script> -if (window.layoutTestController) - layoutTestController.dumpAsText(); - -var e = document.getElementById("e"); -var sameFrame; -window.webkitRequestAnimationFrame(function() { - sameFrame = true; -}, e); -window.webkitRequestAnimationFrame(function() { - window.webkitRequestAnimationFrame(function() { - e.innerHTML = sameFrame ? "FAIL" : "PASS"; - }, e); -}, e); -window.webkitRequestAnimationFrame(function() { - sameFrame = false; -}, e); - -// This should fire the three already registered callbacks, but not the one dynamically registered. -if (window.layoutTestController) - layoutTestController.display(); -// This should fire the dynamically registered callback. -if (window.layoutTestController) - layoutTestController.display(); -</script> +<head> +<link rel="stylesheet" href="../js/resources/js-test-style.css"> +<script src="../js/resources/js-test-pre.js"></script> +</head> +<body> +<p id="description"></p> +<div id="console"></div> +<span id="e"></span> +<span id="f"></span> +<script src="script-tests/request-animation-frame-within-callback.js"></script> +<script src="../js/resources/js-test-post.js"></script> +</body> +</html> |