Diff
Modified: trunk/LayoutTests/ChangeLog (188130 => 188131)
--- trunk/LayoutTests/ChangeLog 2015-08-07 17:06:26 UTC (rev 188130)
+++ trunk/LayoutTests/ChangeLog 2015-08-07 17:30:11 UTC (rev 188131)
@@ -1,3 +1,17 @@
+2015-08-06 Simon Fraser <simon.fra...@apple.com>
+
+ Move two ios-sim-deprecated/animations/ tests into animations.
+
+ * animations/resources/anim.html: Renamed from LayoutTests/platform/ios-sim-deprecated/animations/resources/anim.html.
+ * animations/restart-after-scroll-expected.txt: Copied from LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll-nested-expected.txt.
+ * animations/restart-after-scroll-nested-expected.txt: Renamed from LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll-nested-expected.txt.
+ * animations/restart-after-scroll-nested.html: Renamed from LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll-nested.html.
+ * animations/restart-after-scroll.html: Renamed from LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll.html.
+ * platform/ios-sim-deprecated/animations/restart-after-scroll-expected.txt: Removed.
+ * platform/ios-simulator-wk1/TestExpectations:
+ * platform/ios-simulator-wk2/TestExpectations:
+ * platform/ios-simulator/TestExpectations:
+
2015-08-07 Xabier Rodriguez Calvar <calva...@igalia.com>
[Streams API] Create CountQueuingStrategy object as per spec
Copied: trunk/LayoutTests/animations/resources/anim.html (from rev 188130, trunk/LayoutTests/platform/ios-sim-deprecated/animations/resources/anim.html) (0 => 188131)
--- trunk/LayoutTests/animations/resources/anim.html (rev 0)
+++ trunk/LayoutTests/animations/resources/anim.html 2015-08-07 17:30:11 UTC (rev 188131)
@@ -0,0 +1,34 @@
+<style>
+@-webkit-keyframes bounce {
+ from {
+ -webkit-transform: translate3d(0,0,0);
+ }
+ to {
+ -webkit-transform: translate3d(200px,0,0);
+ }
+}
+
+#animator {
+ position: relative;
+ top: 0px;
+ width: 100px;
+ height: 100px;
+ background-color: blue;
+ -webkit-animation-name: bounce;
+ -webkit-animation-duration: 80ms;
+ -webkit-animation-iteration-count: infinite;
+}
+</style>
+<script>
+function sawIterationInChild() {
+ // Tell our parent that we animated.
+ window.parent.sawIteration();
+}
+
+function startTest() {
+ var animator = document.getElementById("animator");
+ animator.addEventListener("webkitAnimationIteration", sawIterationInChild, false);
+}
+window.addEventListener("load", startTest, false);
+</script>
+<div id="animator"></div>
Copied: trunk/LayoutTests/animations/restart-after-scroll-expected.txt (from rev 188130, trunk/LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll-nested-expected.txt) (0 => 188131)
--- trunk/LayoutTests/animations/restart-after-scroll-expected.txt (rev 0)
+++ trunk/LayoutTests/animations/restart-after-scroll-expected.txt 2015-08-07 17:30:11 UTC (rev 188131)
@@ -0,0 +1 @@
+PASS: Saw iteration after scrolling
Copied: trunk/LayoutTests/animations/restart-after-scroll-nested-expected.txt (from rev 188130, trunk/LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll-nested-expected.txt) (0 => 188131)
--- trunk/LayoutTests/animations/restart-after-scroll-nested-expected.txt (rev 0)
+++ trunk/LayoutTests/animations/restart-after-scroll-nested-expected.txt 2015-08-07 17:30:11 UTC (rev 188131)
@@ -0,0 +1,2 @@
+
+PASS: Saw iteration after scrolling
Copied: trunk/LayoutTests/animations/restart-after-scroll-nested.html (from rev 188130, trunk/LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll-nested.html) (0 => 188131)
--- trunk/LayoutTests/animations/restart-after-scroll-nested.html (rev 0)
+++ trunk/LayoutTests/animations/restart-after-scroll-nested.html 2015-08-07 17:30:11 UTC (rev 188131)
@@ -0,0 +1,40 @@
+<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no">
+<script>
+var hasScrolled = false;
+
+function sawIteration(event) {
+ if (hasScrolled) {
+ document.getElementById("results").innerText = "PASS: Saw iteration after scrolling";
+ testRunner.notifyDone();
+ }
+}
+
+function startScroll() {
+ if (window.eventSender) {
+ eventSender.mouseMoveTo(200, 200);
+ eventSender.mouseDown();
+ eventSender.mouseMoveTo(200, 300);
+ setTimeout(endScroll, 100);
+ }
+}
+
+function endScroll() {
+ eventSender.mouseUp();
+ hasScrolled = true;
+}
+
+function startTest() {
+ var iframe = document.querySelector("iframe");
+ iframe.addEventListener("webkitAnimationIteration", sawIteration, false);
+ setTimeout(startScroll, 100);
+}
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+window.addEventListener("load", startTest, false);
+</script>
+<iframe src=""
+<div id="results"></div>
\ No newline at end of file
Copied: trunk/LayoutTests/animations/restart-after-scroll.html (from rev 188130, trunk/LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll.html) (0 => 188131)
--- trunk/LayoutTests/animations/restart-after-scroll.html (rev 0)
+++ trunk/LayoutTests/animations/restart-after-scroll.html 2015-08-07 17:30:11 UTC (rev 188131)
@@ -0,0 +1,61 @@
+<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no">
+<style>
+@-webkit-keyframes bounce {
+ from {
+ -webkit-transform: translate3d(0,0,0);
+ }
+ to {
+ -webkit-transform: translate3d(200px,0,0);
+ }
+}
+
+#animator {
+ position: relative;
+ top: 0px;
+ width: 100px;
+ height: 100px;
+ background-color: blue;
+ -webkit-animation-name: bounce;
+ -webkit-animation-duration: 100ms;
+ -webkit-animation-iteration-count: infinite;
+}
+</style>
+<script>
+var hasScrolled = false;
+
+function sawIteration(event) {
+ if (hasScrolled) {
+ document.getElementById("results").innerText = "PASS: Saw iteration after scrolling";
+ testRunner.notifyDone();
+ }
+}
+
+function startScroll() {
+ if (window.eventSender) {
+ eventSender.mouseMoveTo(200, 200);
+ eventSender.mouseDown();
+ eventSender.mouseMoveTo(200, 300);
+ setTimeout(endScroll, 100);
+ }
+}
+
+function endScroll() {
+ eventSender.mouseUp();
+ hasScrolled = true;
+}
+
+function startTest() {
+ var animator = document.getElementById("animator");
+ animator.addEventListener("webkitAnimationIteration", sawIteration, false);
+ setTimeout(startScroll, 100);
+}
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+window.addEventListener("load", startTest, false);
+</script>
+<div id="animator"></div>
+<div id="results"></div>
\ No newline at end of file
Deleted: trunk/LayoutTests/platform/ios-sim-deprecated/animations/resources/anim.html (188130 => 188131)
--- trunk/LayoutTests/platform/ios-sim-deprecated/animations/resources/anim.html 2015-08-07 17:06:26 UTC (rev 188130)
+++ trunk/LayoutTests/platform/ios-sim-deprecated/animations/resources/anim.html 2015-08-07 17:30:11 UTC (rev 188131)
@@ -1,35 +0,0 @@
-<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no">
-<style>
-@-webkit-keyframes bounce {
- from {
- -webkit-transform: translate3d(0,0,0);
- }
- to {
- -webkit-transform: translate3d(200px,0,0);
- }
-}
-
-#animator {
- position: relative;
- top: 0px;
- width: 100px;
- height: 100px;
- background-color: blue;
- -webkit-animation-name: bounce;
- -webkit-animation-duration: 80ms;
- -webkit-animation-iteration-count: infinite;
-}
-</style>
-<script>
-function sawIterationInChild() {
- // Tell our parent that we animated.
- window.parent.sawIteration();
-}
-
-function startTest() {
- var animator = document.getElementById("animator");
- animator.addEventListener("webkitAnimationIteration", sawIterationInChild, false);
-}
-window.addEventListener("load", startTest, false);
-</script>
-<div id="animator"></div>
Deleted: trunk/LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll-expected.txt (188130 => 188131)
--- trunk/LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll-expected.txt 2015-08-07 17:06:26 UTC (rev 188130)
+++ trunk/LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll-expected.txt 2015-08-07 17:30:11 UTC (rev 188131)
@@ -1,2 +0,0 @@
-FAIL: Timed out waiting for notifyDone to be called
-
Deleted: trunk/LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll-nested-expected.txt (188130 => 188131)
--- trunk/LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll-nested-expected.txt 2015-08-07 17:06:26 UTC (rev 188130)
+++ trunk/LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll-nested-expected.txt 2015-08-07 17:30:11 UTC (rev 188131)
@@ -1 +0,0 @@
-PASS: Saw iteration after scrolling
Deleted: trunk/LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll-nested.html (188130 => 188131)
--- trunk/LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll-nested.html 2015-08-07 17:06:26 UTC (rev 188130)
+++ trunk/LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll-nested.html 2015-08-07 17:30:11 UTC (rev 188131)
@@ -1,40 +0,0 @@
-<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no">
-<script>
-var hasScrolled = false;
-
-function sawIteration(event) {
- if (hasScrolled) {
- document.getElementById("results").innerText = "PASS: Saw iteration after scrolling";
- testRunner.notifyDone();
- }
-}
-
-function startScroll() {
- if (window.eventSender) {
- eventSender.mouseMoveTo(200, 200);
- eventSender.mouseDown();
- eventSender.mouseMoveTo(200, 300);
- setTimeout(endScroll, 100);
- }
-}
-
-function endScroll() {
- eventSender.mouseUp();
- hasScrolled = true;
-}
-
-function startTest() {
- var iframe = document.querySelector("iframe");
- iframe.addEventListener("webkitAnimationIteration", sawIteration, false);
- setTimeout(startScroll, 100);
-}
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-window.addEventListener("load", startTest, false);
-</script>
-<iframe src=""
-<div id="results"></div>
\ No newline at end of file
Deleted: trunk/LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll.html (188130 => 188131)
--- trunk/LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll.html 2015-08-07 17:06:26 UTC (rev 188130)
+++ trunk/LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll.html 2015-08-07 17:30:11 UTC (rev 188131)
@@ -1,61 +0,0 @@
-<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no">
-<style>
-@-webkit-keyframes bounce {
- from {
- -webkit-transform: translate3d(0,0,0);
- }
- to {
- -webkit-transform: translate3d(200px,0,0);
- }
-}
-
-#animator {
- position: relative;
- top: 0px;
- width: 100px;
- height: 100px;
- background-color: blue;
- -webkit-animation-name: bounce;
- -webkit-animation-duration: 100ms;
- -webkit-animation-iteration-count: infinite;
-}
-</style>
-<script>
-var hasScrolled = false;
-
-function sawIteration(event) {
- if (hasScrolled) {
- document.getElementById("results").innerText = "PASS: Saw iteration after scrolling";
- testRunner.notifyDone();
- }
-}
-
-function startScroll() {
- if (window.eventSender) {
- eventSender.mouseMoveTo(200, 200);
- eventSender.mouseDown();
- eventSender.mouseMoveTo(200, 300);
- setTimeout(endScroll, 100);
- }
-}
-
-function endScroll() {
- eventSender.mouseUp();
- hasScrolled = true;
-}
-
-function startTest() {
- var animator = document.getElementById("animator");
- animator.addEventListener("webkitAnimationIteration", sawIteration, false);
- setTimeout(startScroll, 100);
-}
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-window.addEventListener("load", startTest, false);
-</script>
-<div id="animator"></div>
-<div id="results"></div>
\ No newline at end of file
Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (188130 => 188131)
--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2015-08-07 17:06:26 UTC (rev 188130)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2015-08-07 17:30:11 UTC (rev 188131)
@@ -287,10 +287,10 @@
# Animation tests that fail:
animations/cross-fade-background-image.html [ ImageOnlyFailure ]
animations/cross-fade-webkit-mask-box-image.html [ Failure ]
-animations/play-state-suspend.html [ Failure ]
-animations/suspend-resume-animation.html [ Failure ]
-animations/unprefixed-events-mixed-with-prefixed.html [ Failure ]
-animations/unprefixed-events.html [ Failure ]
+animations/play-state-suspend.html [ Pass Failure ]
+animations/suspend-resume-animation.html [ Pass Failure ]
+animations/unprefixed-events-mixed-with-prefixed.html [ Pass Failure ]
+animations/unprefixed-events.html [ Pass Failure ]
# Animation tests that are flaky:
animations/3d/matrix-transform-type-animation.html [ Skip ] # Pass, Timeout, Missing
Modified: trunk/LayoutTests/platform/ios-simulator-wk1/TestExpectations (188130 => 188131)
--- trunk/LayoutTests/platform/ios-simulator-wk1/TestExpectations 2015-08-07 17:06:26 UTC (rev 188130)
+++ trunk/LayoutTests/platform/ios-simulator-wk1/TestExpectations 2015-08-07 17:30:11 UTC (rev 188131)
@@ -1428,8 +1428,8 @@
security/block-test.html
# Animation tests that fail:
-animations/combo-transform-translate+scale.html [ Failure ]
-animations/suspend-resume-animation-events.html [ Failure ]
+animations/combo-transform-translate+scale.html [ Pass Failure ]
+animations/suspend-resume-animation-events.html [ Pass Failure ]
# IndexedDB is not supported on iOS WK1.
storage/indexeddb
Modified: trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations (188130 => 188131)
--- trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2015-08-07 17:06:26 UTC (rev 188130)
+++ trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2015-08-07 17:30:11 UTC (rev 188131)
@@ -5,8 +5,8 @@
# Animation tests that fail:
webkit.org/b/129562 [ Debug ] animations/animation-direction-reverse-fill-mode.html [ Skip ]
webkit.org/b/129562 [ Debug ] animations/fill-mode-reverse.html [ Skip ]
-animations/additive-transform-animations.html [ Failure ]
-animations/play-state-paused.html [ Failure ]
+animations/additive-transform-animations.html [ Pass Failure ]
+animations/play-state-paused.html [ Pass Failure ]
# Animation tests that time out:
animations/animation-direction-normal.html
