Changeset 40876 in webkit

Timestamp:

Feb 11, 2009 3:18:56 PM (15 years ago)

Author:

Simon Fraser

Message:

2009-02-11 Simon Fraser <Simon Fraser>

Reviewed by Dave Hyatt

​https://bugs.webkit.org/show_bug.cgi?id=23862

Add a bit on RenderStyle that gets set when running accelerated
transitions of transform or opacity. These ensure that styles
compare as different during the transition, so that interruption
can be detected reliably.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/animation/ImplicitAnimation.cpp (modified) (1 diff)
• rendering/style/RenderStyle.h (modified) (2 diffs)
• rendering/style/StyleRareNonInheritedData.cpp (modified) (3 diffs)
• rendering/style/StyleRareNonInheritedData.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-02-11  Simon Fraser  <simon.fraser@apple.com>
+
+        Reviewed by Dave Hyatt
+
+        https://bugs.webkit.org/show_bug.cgi?id=23862
+        
+        Add a bit on RenderStyle that gets set when running accelerated
+        transitions of transform or opacity. These ensure that styles
+        compare as different during the transition, so that interruption
+        can be detected reliably.
+
+        * page/animation/ImplicitAnimation.cpp:
+        (WebCore::ImplicitAnimation::animate):
+        * rendering/style/RenderStyle.h:
+        (WebCore::InheritedFlags::isRunningAcceleratedAnimation):
+        (WebCore::InheritedFlags::setIsRunningAcceleratedAnimation):
+        * rendering/style/StyleRareNonInheritedData.cpp:
+        (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+        (WebCore::StyleRareNonInheritedData::operator==):
+        * rendering/style/StyleRareNonInheritedData.h:
+
 2009-02-11  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/page/animation/ImplicitAnimation.cpp

@@ -80 +80 @@
 
     bool needsAnim = blendProperties(this, m_animatingProperty, animatedStyle.get(), m_fromStyle.get(), m_toStyle.get(), progress(1, 0, 0));
+    // FIXME: we also need to detect cases where we have to software animate for other reasons,
+    // such as a child using inheriting the transform. https://bugs.webkit.org/show_bug.cgi?id=23902
     if (needsAnim)
         setAnimating();
+    else {
+#if USE(ACCELERATED_COMPOSITING)
+        // If we are running an accelerated animation, set a flag in the style which causes the style
+        // to compare as different to any other style. This ensures that changes to the property
+        // that is animating are correctly detected during the animation (e.g. when a transition
+        // gets interrupted).
+        animatedStyle->setIsRunningAcceleratedAnimation();
+#endif
+    }
 
     // Fire the start timeout if needed

trunk/WebCore/rendering/style/RenderStyle.h

@@ -658 +658 @@
     // return the first found Animation (including 'all' transitions)
     const Animation* transitionForProperty(int property) const;
+
+#if USE(ACCELERATED_COMPOSITING)
+    // When set, this ensures that styles compare as different. Used during accelerated animations.
+    bool isRunningAcceleratedAnimation() const { return rareNonInheritedData->m_runningAcceleratedAnimation; }
+#endif
 
     int lineClamp() const { return rareNonInheritedData->lineClamp; }
@@ -953 +958 @@
     void adjustAnimations();
     void adjustTransitions();
+
+#if USE(ACCELERATED_COMPOSITING)
+    void setIsRunningAcceleratedAnimation(bool b = true) { SET_VAR(rareNonInheritedData, m_runningAcceleratedAnimation, b); }
+#endif
 
     void setLineClamp(int c) { SET_VAR(rareNonInheritedData, lineClamp, c); }

trunk/WebCore/rendering/style/StyleRareNonInheritedData.cpp

@@ -43 +43 @@
     , m_appearance(RenderStyle::initialAppearance())
     , m_borderFit(RenderStyle::initialBorderFit())
+#if USE(ACCELERATED_COMPOSITING)
+    , m_runningAcceleratedAnimation(false)
+#endif
     , m_boxShadow(0)
     , m_animations(0)
@@ -70 +73 @@
     , m_appearance(o.m_appearance)
     , m_borderFit(o.m_borderFit)
+#if USE(ACCELERATED_COMPOSITING)
+    , m_runningAcceleratedAnimation(o.m_runningAcceleratedAnimation)
+#endif
     , m_boxShadow(o.m_boxShadow ? new ShadowData(*o.m_boxShadow) : 0)
     , m_boxReflect(o.m_boxReflect)
@@ -118 +124 @@
         && m_appearance == o.m_appearance
         && m_borderFit == o.m_borderFit
+#if USE(ACCELERATED_COMPOSITING)
+        && !m_runningAcceleratedAnimation && !o.m_runningAcceleratedAnimation
+#endif
         && shadowDataEquivalent(o)
         && reflectionDataEquivalent(o)

trunk/WebCore/rendering/style/StyleRareNonInheritedData.h

@@ -98 +98 @@
     unsigned m_appearance : 6; // EAppearance
     unsigned m_borderFit : 1; // EBorderFit
+#if USE(ACCELERATED_COMPOSITING)
+    bool m_runningAcceleratedAnimation : 1;
+#endif    
     OwnPtr<ShadowData> m_boxShadow;  // For box-shadow decorations.