Title: [230031] trunk
Revision
230031
Author
grao...@webkit.org
Date
2018-03-28 09:39:57 -0700 (Wed, 28 Mar 2018)

Log Message

[Web Animations] Comparing two matching FramesTimingFunction objects fails
https://bugs.webkit.org/show_bug.cgi?id=184078

Reviewed by Jon Lee.

LayoutTests/imported/w3c:

Mark one progression for the frames() timing function test with the CSS Animations and CSS Transitions as Web Animations flag.

* web-platform-tests/css-timing-1/frames-timing-functions-output-expected.txt:
* web-platform-tests/css-timing-1/frames-timing-functions-output.html:

Source/WebCore:

Fix a stupid mistake in the == operator for FramesTimingFunction. Without a correct check, we would mistakenly interrupt and
restart any transition with a frames() timing function when we check that the Animation objects are similar.

* platform/animation/TimingFunction.h:

Modified Paths

Diff

Modified: trunk/LayoutTests/imported/w3c/ChangeLog (230030 => 230031)


--- trunk/LayoutTests/imported/w3c/ChangeLog	2018-03-28 16:10:04 UTC (rev 230030)
+++ trunk/LayoutTests/imported/w3c/ChangeLog	2018-03-28 16:39:57 UTC (rev 230031)
@@ -1,3 +1,15 @@
+2018-03-28  Antoine Quint  <grao...@apple.com>
+
+        [Web Animations] Comparing two matching FramesTimingFunction objects fails
+        https://bugs.webkit.org/show_bug.cgi?id=184078
+
+        Reviewed by Jon Lee.
+
+        Mark one progression for the frames() timing function test with the CSS Animations and CSS Transitions as Web Animations flag.
+
+        * web-platform-tests/css-timing-1/frames-timing-functions-output-expected.txt:
+        * web-platform-tests/css-timing-1/frames-timing-functions-output.html:
+
 2018-03-23  Youenn Fablet  <you...@apple.com>
 
         Update WPT tools to a1ec330

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css-timing-1/frames-timing-functions-output-expected.txt (230030 => 230031)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/css-timing-1/frames-timing-functions-output-expected.txt	2018-03-28 16:10:04 UTC (rev 230030)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css-timing-1/frames-timing-functions-output-expected.txt	2018-03-28 16:39:57 UTC (rev 230031)
@@ -1,9 +1,9 @@
 
 PASS For an input progress of 0.0, the output of a frames timing function is the first frame 
-FAIL At a frame boundary, the output of a frames timing function is the next frame assert_equals: expected "100px" but got "0px"
-FAIL For an input progress of 1.0, the output of a frames timing function is the final frame assert_equals: expected "100px" but got "0px"
-FAIL The number of frames is correctly reflected in the frames timing function output assert_equals: expected "10px" but got "0px"
-FAIL The number of frames is correctly reflected in the frames timing function output on CSS Transitions assert_equals: expected "10px" but got "0px"
+PASS At a frame boundary, the output of a frames timing function is the next frame 
+PASS For an input progress of 1.0, the output of a frames timing function is the final frame 
+PASS The number of frames is correctly reflected in the frames timing function output 
+PASS The number of frames is correctly reflected in the frames timing function output on CSS Transitions 
 PASS frames easing with input progress greater than 1 
 PASS frames easing with input progress greater than 1.5 
 PASS frames easing with input progress less than 0 

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css-timing-1/frames-timing-functions-output.html (230030 => 230031)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/css-timing-1/frames-timing-functions-output.html	2018-03-28 16:10:04 UTC (rev 230030)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css-timing-1/frames-timing-functions-output.html	2018-03-28 16:39:57 UTC (rev 230031)
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html><!-- webkit-test-runner [ enableCSSAnimationsAndCSSTransitionsBackedByWebAnimations=true ] -->
 <meta charset=utf-8>
 <meta name="assert"
 content="This test checks the output of frame timing functions with different frame numbers" />

Modified: trunk/Source/WebCore/ChangeLog (230030 => 230031)


--- trunk/Source/WebCore/ChangeLog	2018-03-28 16:10:04 UTC (rev 230030)
+++ trunk/Source/WebCore/ChangeLog	2018-03-28 16:39:57 UTC (rev 230031)
@@ -1,3 +1,15 @@
+2018-03-28  Antoine Quint  <grao...@apple.com>
+
+        [Web Animations] Comparing two matching FramesTimingFunction objects fails
+        https://bugs.webkit.org/show_bug.cgi?id=184078
+
+        Reviewed by Jon Lee.
+
+        Fix a stupid mistake in the == operator for FramesTimingFunction. Without a correct check, we would mistakenly interrupt and
+        restart any transition with a frames() timing function when we check that the Animation objects are similar.
+
+        * platform/animation/TimingFunction.h:
+
 2018-03-28  Miguel Gomez  <mago...@igalia.com>
 
         [GTK][WPE] Remove UpdateAtlas

Modified: trunk/Source/WebCore/platform/animation/TimingFunction.h (230030 => 230031)


--- trunk/Source/WebCore/platform/animation/TimingFunction.h	2018-03-28 16:10:04 UTC (rev 230030)
+++ trunk/Source/WebCore/platform/animation/TimingFunction.h	2018-03-28 16:39:57 UTC (rev 230031)
@@ -244,7 +244,7 @@
 
     bool operator==(const TimingFunction& other) const final
     {
-        if (is<FramesTimingFunction>(other))
+        if (!is<FramesTimingFunction>(other))
             return false;
         auto& otherFrames = downcast<FramesTimingFunction>(other);
         return m_frames == otherFrames.m_frames;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to