Title: [273173] branches/safari-611-branch
Revision
273173
Author
alanc...@apple.com
Date
2021-02-19 15:37:49 -0800 (Fri, 19 Feb 2021)

Log Message

Cherry-pick r272927. rdar://problem/74500651

    REGRESSION(r271515): ::marker fired at wrong time
    https://bugs.webkit.org/show_bug.cgi?id=221961
    <rdar://problem/74397846>

    Reviewed by Dean Jackson.

    Source/WebCore:

    Restore the order in which we generate CSS Animations for pseudo-elements as it was prior to r271515.

    * style/StyleTreeResolver.cpp:
    (WebCore::Style::TreeResolver::resolveElement):

    LayoutTests:

    Remove flakiness for this test since it didn't allow us to spot the regression introduced by r271515.

    * TestExpectations:

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@272927 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-611-branch/LayoutTests/ChangeLog (273172 => 273173)


--- branches/safari-611-branch/LayoutTests/ChangeLog	2021-02-19 23:37:46 UTC (rev 273172)
+++ branches/safari-611-branch/LayoutTests/ChangeLog	2021-02-19 23:37:49 UTC (rev 273173)
@@ -1,5 +1,43 @@
 2021-02-19  Alan Coon  <alanc...@apple.com>
 
+        Cherry-pick r272927. rdar://problem/74500651
+
+    REGRESSION(r271515): ::marker fired at wrong time
+    https://bugs.webkit.org/show_bug.cgi?id=221961
+    <rdar://problem/74397846>
+    
+    Reviewed by Dean Jackson.
+    
+    Source/WebCore:
+    
+    Restore the order in which we generate CSS Animations for pseudo-elements as it was prior to r271515.
+    
+    * style/StyleTreeResolver.cpp:
+    (WebCore::Style::TreeResolver::resolveElement):
+    
+    LayoutTests:
+    
+    Remove flakiness for this test since it didn't allow us to spot the regression introduced by r271515.
+    
+    * TestExpectations:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@272927 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-02-16  Antoine Quint  <grao...@webkit.org>
+
+            REGRESSION(r271515): ::marker fired at wrong time
+            https://bugs.webkit.org/show_bug.cgi?id=221961
+            <rdar://problem/74397846>
+
+            Reviewed by Dean Jackson.
+
+            Remove flakiness for this test since it didn't allow us to spot the regression introduced by r271515.
+
+            * TestExpectations:
+
+2021-02-19  Alan Coon  <alanc...@apple.com>
+
         Cherry-pick r272379. rdar://problem/74500599
 
     Supplementary code points (U+10000 - U+10FFFF) are not shaped correctly in the fast text codepath

Modified: branches/safari-611-branch/LayoutTests/TestExpectations (273172 => 273173)


--- branches/safari-611-branch/LayoutTests/TestExpectations	2021-02-19 23:37:46 UTC (rev 273172)
+++ branches/safari-611-branch/LayoutTests/TestExpectations	2021-02-19 23:37:49 UTC (rev 273173)
@@ -3202,7 +3202,6 @@
 
 # wpt css-transitions and css-animations failures and flakiness
 webkit.org/b/203296 imported/w3c/web-platform-tests/css/css-animations/keyframes-remove-documentElement-crash.html [ Skip ]
-webkit.org/b/203480 imported/w3c/web-platform-tests/css/css-animations/event-order.tentative.html [ Pass Failure ]
 webkit.org/b/203305 imported/w3c/web-platform-tests/css/css-transitions/properties-value-001.html [ Pass Failure ]
 webkit.org/b/203305 imported/w3c/web-platform-tests/css/css-transitions/properties-value-inherit-001.html [ Pass Failure ]
 webkit.org/b/203305 imported/w3c/web-platform-tests/css/css-transitions/properties-value-inherit-002.html [ Pass Failure ]

Modified: branches/safari-611-branch/Source/WebCore/ChangeLog (273172 => 273173)


--- branches/safari-611-branch/Source/WebCore/ChangeLog	2021-02-19 23:37:46 UTC (rev 273172)
+++ branches/safari-611-branch/Source/WebCore/ChangeLog	2021-02-19 23:37:49 UTC (rev 273173)
@@ -1,5 +1,44 @@
 2021-02-19  Alan Coon  <alanc...@apple.com>
 
+        Cherry-pick r272927. rdar://problem/74500651
+
+    REGRESSION(r271515): ::marker fired at wrong time
+    https://bugs.webkit.org/show_bug.cgi?id=221961
+    <rdar://problem/74397846>
+    
+    Reviewed by Dean Jackson.
+    
+    Source/WebCore:
+    
+    Restore the order in which we generate CSS Animations for pseudo-elements as it was prior to r271515.
+    
+    * style/StyleTreeResolver.cpp:
+    (WebCore::Style::TreeResolver::resolveElement):
+    
+    LayoutTests:
+    
+    Remove flakiness for this test since it didn't allow us to spot the regression introduced by r271515.
+    
+    * TestExpectations:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@272927 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-02-16  Antoine Quint  <grao...@webkit.org>
+
+            REGRESSION(r271515): ::marker fired at wrong time
+            https://bugs.webkit.org/show_bug.cgi?id=221961
+            <rdar://problem/74397846>
+
+            Reviewed by Dean Jackson.
+
+            Restore the order in which we generate CSS Animations for pseudo-elements as it was prior to r271515.
+
+            * style/StyleTreeResolver.cpp:
+            (WebCore::Style::TreeResolver::resolveElement):
+
+2021-02-19  Alan Coon  <alanc...@apple.com>
+
         Cherry-pick r272913. rdar://problem/74500965
 
     AVAudioSessionCaptureDeviceManager should disable its audio session in a background thread

Modified: branches/safari-611-branch/Source/WebCore/style/StyleTreeResolver.cpp (273172 => 273173)


--- branches/safari-611-branch/Source/WebCore/style/StyleTreeResolver.cpp	2021-02-19 23:37:46 UTC (rev 273172)
+++ branches/safari-611-branch/Source/WebCore/style/StyleTreeResolver.cpp	2021-02-19 23:37:49 UTC (rev 273173)
@@ -249,12 +249,12 @@
     }
 
     PseudoIdToElementUpdateMap pseudoUpdates;
+    if (auto markerElementUpdate = resolvePseudoStyle(element, update, PseudoId::Marker))
+        pseudoUpdates.set(PseudoId::Marker, WTFMove(*markerElementUpdate));
     if (auto beforeElementUpdate = resolvePseudoStyle(element, update, PseudoId::Before))
         pseudoUpdates.set(PseudoId::Before, WTFMove(*beforeElementUpdate));
     if (auto afterElementUpdate = resolvePseudoStyle(element, update, PseudoId::After))
         pseudoUpdates.set(PseudoId::After, WTFMove(*afterElementUpdate));
-    if (auto markerElementUpdate = resolvePseudoStyle(element, update, PseudoId::Marker))
-        pseudoUpdates.set(PseudoId::Marker, WTFMove(*markerElementUpdate));
 
 #if ENABLE(TOUCH_ACTION_REGIONS)
     // FIXME: Track this exactly.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to