Changeset 276140 in webkit

Timestamp:

Apr 16, 2021, 9:50:28 AM (5 years ago)

Author:

Russell Epstein

Message:

Apply patch. rdar://problem/76375504

Location:

branches/safari-611-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• style/StyleTreeResolver.cpp (modified) (7 diffs)
• style/StyleTreeResolver.h (modified) (1 diff)

branches/safari-611-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-16  Russell Epstein  <repstein@apple.com>
+
+        Apply patch. rdar://problem/76375504
+
+    2021-04-16  Antti Koivisto  <antti@apple.com>
+
+            Animated pseudo element style resolved against wrong parent style
+            https://bugs.webkit.org/show_bug.cgi?id=223990
+            rdar://74997361
+
+            In createAnimatedElementUpdate we get the parent and parent box styles from the parent stack.
+            This is wrong for pseudo elements. Their parent style should the host style which is not pushed to the stack.
+
+            This matters in style adjuster which may apply wrong adjustments as a result.
+
+            Test: fast/animation/pseudo-element-style-adjuster.html
+
+            * style/StyleTreeResolver.cpp:
+            (WebCore::Style::TreeResolver::resolveElement):
+            (WebCore::Style::TreeResolver::resolvePseudoStyle):
+            (WebCore::Style::TreeResolver::createAnimatedElementUpdate):
+
+            Make static and provide the parent and parent box styles as parameters.
+
+            * style/StyleTreeResolver.h:
+
 2021-04-15  Russell Epstein  <repstein@apple.com>
 

branches/safari-611-branch/Source/WebCore/style/StyleTreeResolver.cpp

@@ -222 +222 @@
     }
 
-    auto update = createAnimatedElementUpdate(WTFMove(newStyle), styleable, parent().change);
+    auto update = createAnimatedElementUpdate(WTFMove(newStyle), styleable, parent().change, parent().style, parentBoxStyle());
     auto descendantsToResolve = computeDescendantsToResolve(update.change, element.styleValidity(), parent().descendantsToResolve);
 
@@ -278 +278 @@
     if (!elementUpdate.style->hasPseudoStyle(pseudoId))
         return { };
-
-    auto pseudoStyle = scope().resolver.pseudoStyleForElement(element, { pseudoId }, *elementUpdate.style, parentBoxStyleForPseudo(elementUpdate), &scope().selectorFilter);
+    
+    auto& parentStyle = *elementUpdate.style;
+    auto* parentBoxStyle = parentBoxStyleForPseudo(elementUpdate);
+    
+    auto pseudoStyle = scope().resolver.pseudoStyleForElement(element, { pseudoId }, parentStyle, parentBoxStyle, &scope().selectorFilter);
     if (!pseudoStyle)
         return { };
@@ -287 +290 @@
         return { };
 
-    return createAnimatedElementUpdate(WTFMove(pseudoStyle), { element, pseudoId }, elementUpdate.change);
+    return createAnimatedElementUpdate(WTFMove(pseudoStyle), { element, pseudoId }, elementUpdate.change, parentStyle, parentBoxStyle);
 }
 
@@ -316 +319 @@
 }
 
-ElementUpdate TreeResolver::createAnimatedElementUpdate(std::unique_ptr<RenderStyle> newStyle, const Styleable& styleable, Change parentChange)
+ElementUpdate TreeResolver::createAnimatedElementUpdate(std::unique_ptr<RenderStyle> newStyle, const Styleable& styleable, Change parentChange, const RenderStyle& parentStyle, const RenderStyle* parentBoxStyle)
 {
     auto& element = styleable.element;
+    auto& document = element.document();
     auto* oldStyle = element.renderOrDisplayContentsStyle(styleable.pseudoId);
 
@@ -326 +330 @@
     // on the document timeline. Note that we get timeline() on the Document here because we need a timeline created
     // in case no Web Animations have been created through the JS API.
-    if (element.document().backForwardCacheState() == Document::NotInBackForwardCache && !element.document().renderView()->printing()) {
+    if (document.backForwardCacheState() == Document::NotInBackForwardCache && !document.renderView()->printing()) {
         if (oldStyle && (oldStyle->hasTransitions() || newStyle->hasTransitions()))
-            m_document.timeline().updateCSSTransitionsForStyleable(styleable, *oldStyle, *newStyle);
+            document.timeline().updateCSSTransitionsForStyleable(styleable, *oldStyle, *newStyle);
 
         // The order in which CSS Transitions and CSS Animations are updated matters since CSS Transitions define the after-change style
@@ -335 +339 @@
         if ((oldStyle && oldStyle->hasAnimations()) || newStyle->hasAnimations()) {
             // FIXME: Remove this hack and pass the parent style via updateCSSAnimationsForStyleable.
-            scope().resolver.setParentElementStyleForKeyframes(&parent().style);
-
-            m_document.timeline().updateCSSAnimationsForStyleable(styleable, oldStyle, *newStyle);
+            scope().resolver.setParentElementStyleForKeyframes(&parentStyle);
+
+            document.timeline().updateCSSAnimationsForStyleable(styleable, oldStyle, *newStyle);
 
             scope().resolver.setParentElementStyleForKeyframes(nullptr);
@@ -354 +358 @@
         newStyle = WTFMove(animatedStyle);
 
-        Adjuster adjuster(m_document, parent().style, parentBoxStyle(), styleable.pseudoId == PseudoId::None ? &element : nullptr);
+        Adjuster adjuster(document, parentStyle, parentBoxStyle, styleable.pseudoId == PseudoId::None ? &element : nullptr);
         adjuster.adjustAnimatedStyle(*newStyle, animationImpact);
     } else

branches/safari-611-branch/Source/WebCore/style/StyleTreeResolver.h

@@ -62 +62 @@
     ElementUpdates resolveElement(Element&);
 
-    ElementUpdate createAnimatedElementUpdate(std::unique_ptr<RenderStyle>, const Styleable&, Change);
+    ElementUpdate createAnimatedElementUpdate(std::unique_ptr<RenderStyle>, const Styleable&, Change, const RenderStyle& parentStyle, const RenderStyle* parentBoxStyle);
     Optional<ElementUpdate> resolvePseudoStyle(Element&, const ElementUpdate&, PseudoId);