Title: [184240] branches/safari-600.7-branch/LayoutTests
- Revision
- 184240
- Author
- [email protected]
- Date
- 2015-05-12 20:45:26 -0700 (Tue, 12 May 2015)
Log Message
Added prefixes in the test added in r182985 (merged in r183180) since we don't support unprefixed versions in this branch.
* compositing/animation/animation-backing.html:
* platform/mac-wk2/TestExpectations: Removed merge conflict lines.
Modified Paths
Diff
Modified: branches/safari-600.7-branch/LayoutTests/ChangeLog (184239 => 184240)
--- branches/safari-600.7-branch/LayoutTests/ChangeLog 2015-05-13 03:42:25 UTC (rev 184239)
+++ branches/safari-600.7-branch/LayoutTests/ChangeLog 2015-05-13 03:45:26 UTC (rev 184240)
@@ -1,3 +1,10 @@
+2015-05-12 Ryosuke Niwa <[email protected]>
+
+ Added prefixes in the test added in r182985 (merged in r183180) since we don't support unprefixed versions in this branch.
+
+ * compositing/animation/animation-backing.html:
+ * platform/mac-wk2/TestExpectations: Removed merge conflict lines.
+
2015-05-11 Andreas Kling <[email protected]>
Rebaseline fast/workers/storage/test-authorizer.html for this branch.
Modified: branches/safari-600.7-branch/LayoutTests/compositing/animation/animation-backing.html (184239 => 184240)
--- branches/safari-600.7-branch/LayoutTests/compositing/animation/animation-backing.html 2015-05-13 03:42:25 UTC (rev 184239)
+++ branches/safari-600.7-branch/LayoutTests/compositing/animation/animation-backing.html 2015-05-13 03:45:26 UTC (rev 184240)
@@ -11,12 +11,12 @@
}
.mover.animating {
- animation: move 0.25s forwards linear;
+ -webkit-animation: move 0.25s forwards linear;
}
- @keyframes move {
- from { transform: translateX(1000px); }
- to { transform: translateX(-2000px); }
+ @-webkit-keyframes move {
+ from { -webkit-transform: translateX(1000px); }
+ to { -webkit-transform: translateX(-2000px); }
}
</style>
<script>
@@ -28,12 +28,12 @@
{
window.setTimeout(function() {
var mover = document.getElementById('mover');
- mover.addEventListener('animationstart', function() {
+ document.addEventListener('webkitAnimationStart', function() {
if (window.internals)
internals.startTrackingLayerFlushes();
});
- mover.addEventListener('animationend', function() {
+ mover.addEventListener('webkitAnimationEnd', function() {
if (window.internals) {
var flushCount = internals.layerFlushCount();
document.getElementById('result').textContent = flushCount ? "Saw layer flushes during animation: PASS" : "No layer flushes during animation: FAIL";
Modified: branches/safari-600.7-branch/LayoutTests/platform/mac-wk2/TestExpectations (184239 => 184240)
--- branches/safari-600.7-branch/LayoutTests/platform/mac-wk2/TestExpectations 2015-05-13 03:42:25 UTC (rev 184239)
+++ branches/safari-600.7-branch/LayoutTests/platform/mac-wk2/TestExpectations 2015-05-13 03:45:26 UTC (rev 184240)
@@ -348,11 +348,8 @@
webkit.org/b/131349 http/tests/xmlhttprequest/cross-origin-no-authorization.html [ Failure ]
webkit.org/b/131349 http/tests/xmlhttprequest/cross-origin-no-credential-prompt.html [ Failure ]
-<<<<<<< .working
webkit.org/b/131477 fast/repaint/obscured-background-no-repaint.html [ Pass Failure ]
-=======
->>>>>>> .merge-right.r181864
webkit.org/b/134550 [ Mavericks ] http/tests/cache/iframe-304-crash.html [ Pass Failure ]
# Subpixel wrong cliprect on WK2
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
