Title: [155556] trunk/Source/WebCore
- Revision
- 155556
- Author
- par...@webkit.org
- Date
- 2013-09-11 13:18:15 -0700 (Wed, 11 Sep 2013)
Log Message
Fix animations with !USE(ACCELERATED_COMPOSITING) after r147792.
https://bugs.webkit.org/show_bug.cgi?id=121159
Reviewed by Simon Fraser.
CSSPropertyAnimation::blendProperties() is available always
and needs to be called to make the animations work.
* page/animation/ImplicitAnimation.cpp:
(WebCore::ImplicitAnimation::animate):
* page/animation/KeyframeAnimation.cpp:
(WebCore::KeyframeAnimation::animate):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (155555 => 155556)
--- trunk/Source/WebCore/ChangeLog 2013-09-11 19:50:03 UTC (rev 155555)
+++ trunk/Source/WebCore/ChangeLog 2013-09-11 20:18:15 UTC (rev 155556)
@@ -1,3 +1,18 @@
+2013-09-11 Patrick Gansterer <par...@webkit.org>
+
+ Fix animations with !USE(ACCELERATED_COMPOSITING) after r147792.
+ https://bugs.webkit.org/show_bug.cgi?id=121159
+
+ Reviewed by Simon Fraser.
+
+ CSSPropertyAnimation::blendProperties() is available always
+ and needs to be called to make the animations work.
+
+ * page/animation/ImplicitAnimation.cpp:
+ (WebCore::ImplicitAnimation::animate):
+ * page/animation/KeyframeAnimation.cpp:
+ (WebCore::KeyframeAnimation::animate):
+
2013-09-11 David Hyatt <hy...@apple.com>
Move all collapsing margin code out of RenderBlock and into RenderBlockFlow.
Modified: trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp (155555 => 155556)
--- trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp 2013-09-11 19:50:03 UTC (rev 155555)
+++ trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp 2013-09-11 20:18:15 UTC (rev 155556)
@@ -77,10 +77,10 @@
if (!animatedStyle)
animatedStyle = RenderStyle::clone(targetStyle);
-#if USE(ACCELERATED_COMPOSITING)
bool needsAnim = CSSPropertyAnimation::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 USE(ACCELERATED_COMPOSITING)
if (!needsAnim)
// 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
Modified: trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp (155555 => 155556)
--- trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp 2013-09-11 19:50:03 UTC (rev 155555)
+++ trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp 2013-09-11 20:18:15 UTC (rev 155556)
@@ -184,8 +184,9 @@
const RenderStyle* toStyle = 0;
double progress = 0.0;
fetchIntervalEndpointsForProperty(*it, fromStyle, toStyle, progress);
+
+ bool needsAnim = CSSPropertyAnimation::blendProperties(this, *it, animatedStyle.get(), fromStyle, toStyle, progress);
#if USE(ACCELERATED_COMPOSITING)
- bool needsAnim = CSSPropertyAnimation::blendProperties(this, *it, animatedStyle.get(), fromStyle, toStyle, progress);
if (!needsAnim)
// If we are running an accelerated animation, set a flag in the style
// to indicate it. This can be used to make sure we get an updated
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
