Title: [230685] tags/Safari-606.1.13.1

Diff

Modified: tags/Safari-606.1.13.1/LayoutTests/imported/w3c/ChangeLog (230684 => 230685)


--- tags/Safari-606.1.13.1/LayoutTests/imported/w3c/ChangeLog	2018-04-16 22:29:55 UTC (rev 230684)
+++ tags/Safari-606.1.13.1/LayoutTests/imported/w3c/ChangeLog	2018-04-16 22:29:59 UTC (rev 230685)
@@ -1,5 +1,9 @@
 2018-04-16  Kocsen Chung  <kocsen_ch...@apple.com>
 
+        Revert r230683. rdar://problem/39397649
+
+2018-04-16  Kocsen Chung  <kocsen_ch...@apple.com>
+
         Cherry-pick r230665. rdar://problem/39397649
 
     [Web Animations] Animations do not naturally get a finish event

Modified: tags/Safari-606.1.13.1/LayoutTests/imported/w3c/web-platform-tests/web-animations/timing-model/animations/updating-the-finished-state-expected.txt (230684 => 230685)


--- tags/Safari-606.1.13.1/LayoutTests/imported/w3c/web-platform-tests/web-animations/timing-model/animations/updating-the-finished-state-expected.txt	2018-04-16 22:29:55 UTC (rev 230684)
+++ tags/Safari-606.1.13.1/LayoutTests/imported/w3c/web-platform-tests/web-animations/timing-model/animations/updating-the-finished-state-expected.txt	2018-04-16 22:29:59 UTC (rev 230685)
@@ -1,8 +1,8 @@
 
-PASS Updating the finished state when playing past end 
+FAIL Updating the finished state when playing past end assert_equals: Hold time is set to target end clamping current time expected 100000 but got 100029
 PASS Updating the finished state when seeking past end 
 PASS Updating the finished state when seeking exactly to end 
-PASS Updating the finished state when playing in reverse past zero 
+FAIL Updating the finished state when playing in reverse past zero assert_equals: Hold time is set to zero clamping current time expected 0 but got -15
 PASS Updating the finished state when seeking a reversed animation past zero 
 FAIL Updating the finished state when seeking a reversed animation exactly to zero assert_equals: Hold time is set so current time should NOT change expected 0 but got -0
 PASS Updating the finished state when playing before end 

Modified: tags/Safari-606.1.13.1/Source/WebCore/ChangeLog (230684 => 230685)


--- tags/Safari-606.1.13.1/Source/WebCore/ChangeLog	2018-04-16 22:29:55 UTC (rev 230684)
+++ tags/Safari-606.1.13.1/Source/WebCore/ChangeLog	2018-04-16 22:29:59 UTC (rev 230685)
@@ -1,5 +1,9 @@
 2018-04-16  Kocsen Chung  <kocsen_ch...@apple.com>
 
+        Revert r230683. rdar://problem/39397649
+
+2018-04-16  Kocsen Chung  <kocsen_ch...@apple.com>
+
         Revert r230682. rdar://problem/39344671
 
 2018-04-16  Kocsen Chung  <kocsen_ch...@apple.com>

Modified: tags/Safari-606.1.13.1/Source/WebCore/animation/WebAnimation.cpp (230684 => 230685)


--- tags/Safari-606.1.13.1/Source/WebCore/animation/WebAnimation.cpp	2018-04-16 22:29:55 UTC (rev 230684)
+++ tags/Safari-606.1.13.1/Source/WebCore/animation/WebAnimation.cpp	2018-04-16 22:29:59 UTC (rev 230685)
@@ -992,6 +992,11 @@
     if (localTime < 0_s)
         return -localTime;
 
+    // If our current time is just at the acthive duration threshold we want to invalidate as
+    // soon as possible to restore a non-animated value.
+    if (std::abs(localTime.microseconds() - m_effect->timing()->activeDuration().microseconds()) < timeEpsilon.microseconds())
+        return 0_s;
+
     // In any other case, we're idle or already outside our active duration and have no need
     // to schedule an invalidation.
     return Seconds::infinity();
@@ -1001,8 +1006,6 @@
 {
     if (m_effect)
         m_effect->apply(targetStyle);
-
-    updateFinishedState(DidSeek::No, SynchronouslyNotify::Yes);
 }
 
 void WebAnimation::acceleratedRunningStateDidChange()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to