[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
jamesr at google.com
jamesr at google.com
Sun Feb 20 23:50:27 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 096902d993f9a1c6f0bc4e8adb7fbfe0b9bfc980
Author: jamesr at google.com <jamesr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 25 20:01:12 2011 +0000
2011-01-25 James Robinson <jamesr at 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: http://svn.webkit.org/repository/webkit/trunk@76623 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 59651f6..91fd550 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,31 @@
+2011-01-25 James Robinson <jamesr at 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.
+
2011-01-20 Jer Noble <jer.noble at apple.com>
Reviewed by Eric Carlson.
diff --git a/LayoutTests/fast/animation/request-animation-frame-cancel-expected.txt b/LayoutTests/fast/animation/request-animation-frame-cancel-expected.txt
index 7ef22e9..8e972f1 100644
--- a/LayoutTests/fast/animation/request-animation-frame-cancel-expected.txt
+++ b/LayoutTests/fast/animation/request-animation-frame-cancel-expected.txt
@@ -1 +1,9 @@
-PASS
+This tests cancelling a webkitRequestAnimationFrame callback
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/fast/animation/request-animation-frame-cancel.html b/LayoutTests/fast/animation/request-animation-frame-cancel.html
index 4210f7b..36c85bc 100644
--- a/LayoutTests/fast/animation/request-animation-frame-cancel.html
+++ b/LayoutTests/fast/animation/request-animation-frame-cancel.html
@@ -1,17 +1,15 @@
<!DOCTYPE html>
<html>
-<span id="e">PASS</span>
-<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
-
-var e = document.getElementById("e");
-var id = window.webkitRequestAnimationFrame(function() {
- e.innerHTML = "FAIL";
-}, e);
-
-window.webkitCancelRequestAnimationFrame(id);
-
-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-cancel.js"></script>
+<script src="../js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/LayoutTests/fast/animation/request-animation-frame-cancel2-expected.txt b/LayoutTests/fast/animation/request-animation-frame-cancel2-expected.txt
index 7ef22e9..361cf6f 100644
--- a/LayoutTests/fast/animation/request-animation-frame-cancel2-expected.txt
+++ b/LayoutTests/fast/animation/request-animation-frame-cancel2-expected.txt
@@ -1 +1,9 @@
-PASS
+Tests one requestAnimationFrame callback cancelling a second
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/fast/animation/request-animation-frame-cancel2.html b/LayoutTests/fast/animation/request-animation-frame-cancel2.html
index 4ac2e93..1dc77a8 100644
--- a/LayoutTests/fast/animation/request-animation-frame-cancel2.html
+++ b/LayoutTests/fast/animation/request-animation-frame-cancel2.html
@@ -1,21 +1,15 @@
<!DOCTYPE html>
<html>
-<span id="e">PASS</span>
-<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
-
-var e = document.getElementById("e");
-var secondCallbackId;
-
-window.webkitRequestAnimationFrame(function() {
- window.webkitCancelRequestAnimationFrame(secondCallbackId);
-}, e);
-
-secondCallbackId = window.webkitRequestAnimationFrame(function() {
- e.innerHTML = "FAIL";
-}, e);
-
-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-cancel2.js"></script>
+<script src="../js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/LayoutTests/fast/animation/request-animation-frame-display-expected.txt b/LayoutTests/fast/animation/request-animation-frame-display-expected.txt
index 7ef22e9..e982638 100644
--- a/LayoutTests/fast/animation/request-animation-frame-display-expected.txt
+++ b/LayoutTests/fast/animation/request-animation-frame-display-expected.txt
@@ -1 +1,10 @@
-PASS
+Tests requestAnimationFrame callback handling of display: property changed within another callback
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS callbackInvokedOnA is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/fast/animation/request-animation-frame-display.html b/LayoutTests/fast/animation/request-animation-frame-display.html
index b822577..f9495ab 100644
--- a/LayoutTests/fast/animation/request-animation-frame-display.html
+++ b/LayoutTests/fast/animation/request-animation-frame-display.html
@@ -1,22 +1,15 @@
<!DOCTYPE html>
<html>
-<span id="a" style="display:none"></span>
-<span id="b">FAIL</span>
-<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
-
-var a = document.getElementById("a");
-window.webkitRequestAnimationFrame(function() {
- b.innerHTML="PASS";
-}, a);
-
-var b = document.getElementById("b");
-window.webkitRequestAnimationFrame(function() {
- a.style.display="";
-}, b);
-
-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-display.js"></script>
+<script src="../js/resources/js-test-post.js"></script>
+</body>
</html>
diff --git a/LayoutTests/fast/animation/request-animation-frame-expected.txt b/LayoutTests/fast/animation/request-animation-frame-expected.txt
index 7ef22e9..25fd89d 100644
--- a/LayoutTests/fast/animation/request-animation-frame-expected.txt
+++ b/LayoutTests/fast/animation/request-animation-frame-expected.txt
@@ -1 +1,10 @@
-PASS
+Tests basic use of requestAnimationFrame
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS callbackInvoked is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/fast/animation/request-animation-frame-within-callback-expected.txt b/LayoutTests/fast/animation/request-animation-frame-within-callback-expected.txt
index 7ef22e9..873bf1f 100644
--- a/LayoutTests/fast/animation/request-animation-frame-within-callback-expected.txt
+++ b/LayoutTests/fast/animation/request-animation-frame-within-callback-expected.txt
@@ -1 +1,10 @@
-PASS
+Tests adding one callback within another
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS sameFrame is false
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/fast/animation/request-animation-frame-within-callback.html b/LayoutTests/fast/animation/request-animation-frame-within-callback.html
index d5a366f..96fbbf0 100644
--- a/LayoutTests/fast/animation/request-animation-frame-within-callback.html
+++ b/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>
diff --git a/LayoutTests/fast/animation/request-animation-frame.html b/LayoutTests/fast/animation/request-animation-frame.html
index 7d67a97..fb80417 100644
--- a/LayoutTests/fast/animation/request-animation-frame.html
+++ b/LayoutTests/fast/animation/request-animation-frame.html
@@ -1,14 +1,15 @@
<!DOCTYPE html>
<html>
-<span id="e">FAIL</span>
-<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
-
-var e = document.getElementById("e");
-window.webkitRequestAnimationFrame(function() {
- e.innerHTML="PASS";
-}, e);
-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.js"></script>
+<script src="../js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/LayoutTests/fast/animation/script-tests/TEMPLATE.html b/LayoutTests/fast/animation/script-tests/TEMPLATE.html
new file mode 100644
index 0000000..dbbd9d9
--- /dev/null
+++ b/LayoutTests/fast/animation/script-tests/TEMPLATE.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<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="YOUR_JS_FILE_HERE"></script>
+<script src="../js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/LayoutTests/fast/animation/script-tests/request-animation-frame-cancel.js b/LayoutTests/fast/animation/script-tests/request-animation-frame-cancel.js
new file mode 100644
index 0000000..d67afbe
--- /dev/null
+++ b/LayoutTests/fast/animation/script-tests/request-animation-frame-cancel.js
@@ -0,0 +1,13 @@
+description("This tests cancelling a webkitRequestAnimationFrame callback");
+
+var e = document.getElementById("e");
+var id = window.webkitRequestAnimationFrame(function() {
+ testFailed("callback invoked after cancelled");
+}, e);
+
+window.webkitCancelRequestAnimationFrame(id);
+
+if (window.layoutTestController)
+ layoutTestController.display();
+
+var successfullyParsed = true;
diff --git a/LayoutTests/fast/animation/script-tests/request-animation-frame-cancel2.js b/LayoutTests/fast/animation/script-tests/request-animation-frame-cancel2.js
new file mode 100644
index 0000000..7af694f
--- /dev/null
+++ b/LayoutTests/fast/animation/script-tests/request-animation-frame-cancel2.js
@@ -0,0 +1,17 @@
+description("Tests one requestAnimationFrame callback cancelling a second");
+
+var e = document.getElementById("e");
+var secondCallbackId;
+
+window.webkitRequestAnimationFrame(function() {
+ window.webkitCancelRequestAnimationFrame(secondCallbackId);
+}, e);
+
+secondCallbackId = window.webkitRequestAnimationFrame(function() {
+ testFailed("callback invoked after cancel");
+}, e);
+
+if (window.layoutTestController)
+ layoutTestController.display();
+
+var successfullyParsed = true;
diff --git a/LayoutTests/fast/animation/script-tests/request-animation-frame-display.js b/LayoutTests/fast/animation/script-tests/request-animation-frame-display.js
new file mode 100644
index 0000000..8429242
--- /dev/null
+++ b/LayoutTests/fast/animation/script-tests/request-animation-frame-display.js
@@ -0,0 +1,20 @@
+description("Tests requestAnimationFrame callback handling of display: property changed within another callback");
+
+var e = document.getElementById("e");
+e.style.display="none";
+var callbackInvokedOnA=false;
+window.webkitRequestAnimationFrame(function() {
+ callbackInvokedOnA=true;
+}, e);
+
+var f = document.getElementById("f");
+window.webkitRequestAnimationFrame(function() {
+ e.style.display="";
+}, f);
+
+if (window.layoutTestController)
+ layoutTestController.display();
+
+shouldBeTrue("callbackInvokedOnA");
+
+var successfullyParsed = true;
diff --git a/LayoutTests/fast/animation/script-tests/request-animation-frame-within-callback.js b/LayoutTests/fast/animation/script-tests/request-animation-frame-within-callback.js
new file mode 100644
index 0000000..dc9c4cc
--- /dev/null
+++ b/LayoutTests/fast/animation/script-tests/request-animation-frame-within-callback.js
@@ -0,0 +1,24 @@
+description("Tests adding one callback within another");
+
+var e = document.getElementById("e");
+var sameFrame;
+window.webkitRequestAnimationFrame(function() {
+ sameFrame = true;
+}, e);
+window.webkitRequestAnimationFrame(function() {
+ window.webkitRequestAnimationFrame(function() {
+ shouldBeFalse("sameFrame");
+ }, 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();
+
+var successfullyParsed = true;
diff --git a/LayoutTests/fast/animation/script-tests/request-animation-frame.js b/LayoutTests/fast/animation/script-tests/request-animation-frame.js
new file mode 100644
index 0000000..e6ced5b
--- /dev/null
+++ b/LayoutTests/fast/animation/script-tests/request-animation-frame.js
@@ -0,0 +1,14 @@
+description("Tests basic use of requestAnimationFrame");
+
+var e = document.getElementById("e");
+var callbackInvoked = false;
+window.webkitRequestAnimationFrame(function() {
+ callbackInvoked = true;
+}, e);
+
+if (window.layoutTestController)
+ layoutTestController.display();
+
+shouldBeTrue("callbackInvoked");
+var successfullyParsed = true;
+
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list