Changeset 273003 in webkit

Timestamp:

Feb 17, 2021, 9:27:21 AM (6 years ago)

Author:

Antti Koivisto

Message:

Animated keyframe style needs to go through full style adjuster
​https://bugs.webkit.org/show_bug.cgi?id=222036
rdar://72421747

Reviewed by Zalan Bujtas.

Source/WebCore:

We can create unadjusted styles via keyframe animations and those may cause problems in rendering.

Test: fast/animation/animation-position-crash.html

• style/StyleAdjuster.cpp:

(WebCore::Style::Adjuster::adjustAnimatedStyle):

Make this a member function and invoke Adjuster::adjust.
Simplify the z-index adjustment since it is mostly handled by adjust.

• style/StyleAdjuster.h:
• style/StyleTreeResolver.cpp:

Always use style adjuster for keyframe animation.

(WebCore::Style::TreeResolver::createAnimatedElementUpdate):

LayoutTests:

• fast/animation/animation-position-crash-expected.html: Added.
• fast/animation/animation-position-crash.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/animation/animation-position-crash-expected.html (added)
• LayoutTests/fast/animation/animation-position-crash.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/style/StyleAdjuster.cpp (modified) (2 diffs)
• Source/WebCore/style/StyleAdjuster.h (modified) (1 diff)
• Source/WebCore/style/StyleTreeResolver.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-02-17  Antti Koivisto  <antti@apple.com>
+
+        Animated keyframe style needs to go through full style adjuster
+        https://bugs.webkit.org/show_bug.cgi?id=222036
+        rdar://72421747
+
+        Reviewed by Zalan Bujtas.
+
+        * fast/animation/animation-position-crash-expected.html: Added.
+        * fast/animation/animation-position-crash.html: Added.
+
 2021-02-17  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-02-17  Antti Koivisto  <antti@apple.com>
+
+        Animated keyframe style needs to go through full style adjuster
+        https://bugs.webkit.org/show_bug.cgi?id=222036
+        rdar://72421747
+
+        Reviewed by Zalan Bujtas.
+
+        We can create unadjusted styles via keyframe animations and those may cause problems in rendering.
+
+        Test: fast/animation/animation-position-crash.html
+
+        * style/StyleAdjuster.cpp:
+        (WebCore::Style::Adjuster::adjustAnimatedStyle):
+
+        Make this a member function and invoke Adjuster::adjust.
+        Simplify the z-index adjustment since it is mostly handled by adjust.
+
+        * style/StyleAdjuster.h:
+        * style/StyleTreeResolver.cpp:
+
+        Always use style adjuster for keyframe animation.
+
+        (WebCore::Style::TreeResolver::createAnimatedElementUpdate):
+
 2021-02-17  Antoine Quint  <graouts@webkit.org>
 

trunk/Source/WebCore/style/StyleAdjuster.cpp

@@ -575 +575 @@
 }
 
-void Adjuster::adjustAnimatedStyle(RenderStyle& style, const RenderStyle* parentBoxStyle, OptionSet<AnimationImpact> impact)
-{
+void Adjuster::adjustAnimatedStyle(RenderStyle& style, OptionSet<AnimationImpact> impact) const
+{
+    adjust(style, nullptr);
+
     // Set an explicit used z-index in two cases:
     // 1. When the element respects z-index, and the style has an explicit z-index set (for example, the animation
@@ -583 +585 @@
     // It's important to not clobber an existing used z-index, since an earlier animation may have set it, but we
     // may still need to update the used z-index value from the specified value.
-    bool elementRespectsZIndex = style.position() != PositionType::Static || (parentBoxStyle && parentBoxStyle->isDisplayFlexibleOrGridBox());
-
-    if (elementRespectsZIndex && !style.hasAutoSpecifiedZIndex())
-        style.setUsedZIndex(style.specifiedZIndex());
-    else if (impact.contains(AnimationImpact::ForcesStackingContext))
+    
+    if (style.hasAutoUsedZIndex() && impact.contains(AnimationImpact::ForcesStackingContext))
         style.setUsedZIndex(0);
 }

trunk/Source/WebCore/style/StyleAdjuster.h

@@ -47 +47 @@
 
     void adjust(RenderStyle&, const RenderStyle* userAgentAppearanceStyle) const;
+    void adjustAnimatedStyle(RenderStyle&, OptionSet<AnimationImpact>) const;
 
     static void adjustSVGElementStyle(RenderStyle&, const SVGElement&);
-    static void adjustAnimatedStyle(RenderStyle&, const RenderStyle* parentBoxStyle, OptionSet<AnimationImpact>);
-    
     static void adjustEventListenerRegionTypesForRootStyle(RenderStyle&, const Document&);
 

trunk/Source/WebCore/style/StyleTreeResolver.cpp

@@ -347 +347 @@
         animationImpact = styleable.applyKeyframeEffects(*animatedStyle, *previousLastStyleChangeEventStyle, &parent().style);
         newStyle = WTFMove(animatedStyle);
+
+        Adjuster adjuster(m_document, parent().style, parentBoxStyle(), styleable.pseudoId == PseudoId::None ? &element : nullptr);
+        adjuster.adjustAnimatedStyle(*newStyle, animationImpact);
     } else
         styleable.setLastStyleChangeEventStyle(nullptr);
-
-    if (animationImpact)
-        Adjuster::adjustAnimatedStyle(*newStyle, parentBoxStyle(), animationImpact);
 
     // Deduplication speeds up equality comparisons as the properties inherit to descendants.