Attachment 342795 Details for Bug 186651 – Patch

[patch] Patch

bug-186651-20180615101243.patch (text/plain), 5.69 KB, created by Antoine Quint on 2018-06-15 01:12:44 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Antoine Quint

Created: 2018-06-15 01:12:44 PDT

Size: 5.69 KB

patch

obsolete

>Subversion Revision: 232699
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index b789dadbb8f59e04b4f642346430e60b422c3b21..9f0c0944a5936f4d0b002616b76a5192821ef9d1 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-06-15  Antoine Quint  <graouts@apple.com>
>+
>+        [Web Animations] CSS Animations should take precedence over CSS Transitions
>+        https://bugs.webkit.org/show_bug.cgi?id=186651
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Ensure CSS Animations override CSS Transitions by modifying the order in which animations are returned by animationsForElement().
>+
>+        * animation/AnimationTimeline.cpp:
>+        (WebCore::AnimationTimeline::animationsForElement const):
>+
> 2018-06-10  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         [GTK][WPE] Add API run run javascript from a WebKitWebView in an isolated world
>diff --git a/Source/WebCore/animation/AnimationTimeline.cpp b/Source/WebCore/animation/AnimationTimeline.cpp
>index f2dc31f1133451d9b0bef24a29cefff2d35b5d23..7ed02ce2b677b0000665a34754f52b09d2ef9ad0 100644
>--- a/Source/WebCore/animation/AnimationTimeline.cpp
>+++ b/Source/WebCore/animation/AnimationTimeline.cpp
>@@ -135,14 +135,14 @@ void AnimationTimeline::animationWasRemovedFromElement(WebAnimation& animation,
> Vector<RefPtr<WebAnimation>> AnimationTimeline::animationsForElement(Element& element) const
> {
>     Vector<RefPtr<WebAnimation>> animations;
>-    if (m_elementToCSSAnimationsMap.contains(&element)) {
>-        const auto& cssAnimations = m_elementToCSSAnimationsMap.get(&element);
>-        animations.appendRange(cssAnimations.begin(), cssAnimations.end());
>-    }
>     if (m_elementToCSSTransitionsMap.contains(&element)) {
>         const auto& cssTransitions = m_elementToCSSTransitionsMap.get(&element);
>         animations.appendRange(cssTransitions.begin(), cssTransitions.end());
>     }
>+    if (m_elementToCSSAnimationsMap.contains(&element)) {
>+        const auto& cssAnimations = m_elementToCSSAnimationsMap.get(&element);
>+        animations.appendRange(cssAnimations.begin(), cssAnimations.end());
>+    }
>     if (m_elementToAnimationsMap.contains(&element)) {
>         const auto& webAnimations = m_elementToAnimationsMap.get(&element);
>         animations.appendRange(webAnimations.begin(), webAnimations.end());
>diff --git a/LayoutTests/imported/mozilla/ChangeLog b/LayoutTests/imported/mozilla/ChangeLog
>index aeb6c5a270409f622c31d57678c8d30570c214e8..58be91da941a67909b0b8568da68ebbd5e1db6f4 100644
>--- a/LayoutTests/imported/mozilla/ChangeLog
>+++ b/LayoutTests/imported/mozilla/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-06-15  Antoine Quint  <graouts@apple.com>
>+
>+        [Web Animations] CSS Animations should take precedence over CSS Transitions
>+        https://bugs.webkit.org/show_bug.cgi?id=186651
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Mark some progressions in the Mozilla CSS Animations and CSS Transitions tests.
>+
>+        * css-animations/test_element-get-animations-expected.txt:
>+        * css-transitions/test_document-get-animations-expected.txt:
>+
> 2018-06-11  Antoine Quint  <graouts@apple.com>
> 
>         [Web Animations] Make imported/mozilla/css-transitions/test_setting-effect.html pass reliably
>diff --git a/LayoutTests/imported/mozilla/css-animations/test_element-get-animations-expected.txt b/LayoutTests/imported/mozilla/css-animations/test_element-get-animations-expected.txt
>index a0f70dba939f233cd27c346cd0d2a888bf481e16..6ab933681be9cbc106ff23281c3dff4a63f2826e 100644
>--- a/LayoutTests/imported/mozilla/css-animations/test_element-get-animations-expected.txt
>+++ b/LayoutTests/imported/mozilla/css-animations/test_element-get-animations-expected.txt
>@@ -3,7 +3,7 @@ PASS getAnimations for non-animated content
> PASS getAnimations for CSS Animations 
> PASS getAnimations returns CSSAnimation objects for CSS Animations 
> PASS getAnimations for multi-property animations 
>-FAIL getAnimations for both CSS Animations and CSS Transitions at once assert_equals: getAnimations returns Animations for both animations and transitions that run simultaneously expected 2 but got 1
>+PASS getAnimations for both CSS Animations and CSS Transitions at once 
> PASS getAnimations for CSS Animations that have finished 
> PASS getAnimations for CSS Animations that have finished but are forwards filling 
> FAIL getAnimations for CSS Animations with animation-name: none assert_equals: getAnimations returns an empty sequence for an element with animation-name: none expected 0 but got 1
>diff --git a/LayoutTests/imported/mozilla/css-transitions/test_document-get-animations-expected.txt b/LayoutTests/imported/mozilla/css-transitions/test_document-get-animations-expected.txt
>index 58dfa93029de9daebffa6b57e9cbe262f7ab5df3..db9f6b853c97908a6be7836e38be200c47a7e6af 100644
>--- a/LayoutTests/imported/mozilla/css-transitions/test_document-get-animations-expected.txt
>+++ b/LayoutTests/imported/mozilla/css-transitions/test_document-get-animations-expected.txt
>@@ -1,6 +1,6 @@
> 
> PASS getAnimations for non-animated content 
>-FAIL getAnimations for CSS Transitions assert_equals: getAnimations returns two running CSS Transitions expected 2 but got 0
>-FAIL CSS Transitions targetting (pseudo-)elements should have correct order after sorting assert_equals: CSS transition on both pseudo-elements and elements are returned expected 4 but got 2
>-FAIL Transitions are not returned after they have finished assert_equals: Got transition expected 1 but got 0
>+PASS getAnimations for CSS Transitions 
>+FAIL CSS Transitions targetting (pseudo-)elements should have correct order after sorting assert_equals: The animation targeting the ::before element comes second expected (string) "::before" but got (undefined) undefined
>+PASS Transitions are not returned after they have finished 
>

Flags:

dino: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 186651: 342795