Modified: trunk/Source/WebCore/ChangeLog (115991 => 115992)
--- trunk/Source/WebCore/ChangeLog 2012-05-03 18:08:08 UTC (rev 115991)
+++ trunk/Source/WebCore/ChangeLog 2012-05-03 18:15:41 UTC (rev 115992)
@@ -1,3 +1,21 @@
+2012-05-03 Simon Fraser <simon.fra...@apple.com>
+
+ Remove RenderLayerCompositor::didStartAcceleratedAnimation()
+ https://bugs.webkit.org/show_bug.cgi?id=85514
+
+ Reviewed by Antti Koivisto.
+
+ Remove RenderLayerCompositor::didStartAcceleratedAnimation(), which is no longer
+ needed.
+
+ Code removal, no new tests.
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::startAnimation):
+ (WebCore::RenderLayerBacking::startTransition):
+ * rendering/RenderLayerCompositor.cpp:
+ * rendering/RenderLayerCompositor.h:
+
2012-05-03 Andreas Kling <kl...@webkit.org>
REGRESSION(r111387): CSSOM representation of 'background-image' values should be CSSPrimitiveValue.
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (115991 => 115992)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2012-05-03 18:08:08 UTC (rev 115991)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2012-05-03 18:15:41 UTC (rev 115992)
@@ -1303,21 +1303,15 @@
bool didAnimateFilter = false;
#endif
- if (hasTransform && m_graphicsLayer->addAnimation(transformVector, toRenderBox(renderer())->pixelSnappedBorderBoxRect().size(), anim, keyframes.animationName(), timeOffset)) {
+ if (hasTransform && m_graphicsLayer->addAnimation(transformVector, toRenderBox(renderer())->pixelSnappedBorderBoxRect().size(), anim, keyframes.animationName(), timeOffset))
didAnimateTransform = true;
- compositor()->didStartAcceleratedAnimation(CSSPropertyWebkitTransform);
- }
- if (hasOpacity && m_graphicsLayer->addAnimation(opacityVector, IntSize(), anim, keyframes.animationName(), timeOffset)) {
+ if (hasOpacity && m_graphicsLayer->addAnimation(opacityVector, IntSize(), anim, keyframes.animationName(), timeOffset))
didAnimateOpacity = true;
- compositor()->didStartAcceleratedAnimation(CSSPropertyOpacity);
- }
#if ENABLE(CSS_FILTERS)
- if (hasFilter && m_graphicsLayer->addAnimation(filterVector, IntSize(), anim, keyframes.animationName(), timeOffset)) {
+ if (hasFilter && m_graphicsLayer->addAnimation(filterVector, IntSize(), anim, keyframes.animationName(), timeOffset))
didAnimateFilter = true;
- compositor()->didStartAcceleratedAnimation(CSSPropertyWebkitFilter);
- }
#endif
#if ENABLE(CSS_FILTERS)
@@ -1392,18 +1386,7 @@
}
#endif
- if (didAnimateOpacity)
- compositor()->didStartAcceleratedAnimation(CSSPropertyOpacity);
-
- if (didAnimateTransform)
- compositor()->didStartAcceleratedAnimation(CSSPropertyWebkitTransform);
-
#if ENABLE(CSS_FILTERS)
- if (didAnimateFilter)
- compositor()->didStartAcceleratedAnimation(CSSPropertyWebkitFilter);
-#endif
-
-#if ENABLE(CSS_FILTERS)
return didAnimateOpacity || didAnimateTransform || didAnimateFilter;
#else
return didAnimateOpacity || didAnimateTransform;
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (115991 => 115992)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2012-05-03 18:08:08 UTC (rev 115991)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2012-05-03 18:15:41 UTC (rev 115992)
@@ -1329,11 +1329,6 @@
#endif
}
-void RenderLayerCompositor::didStartAcceleratedAnimation(CSSPropertyID)
-{
- // FIXME: remove this method.
-}
-
bool RenderLayerCompositor::has3DContent() const
{
return layerHas3DContent(rootRenderLayer());
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (115991 => 115992)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2012-05-03 18:08:08 UTC (rev 115991)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2012-05-03 18:15:41 UTC (rev 115992)
@@ -164,8 +164,6 @@
--m_compositedLayerCount;
}
- void didStartAcceleratedAnimation(CSSPropertyID);
-
#if ENABLE(VIDEO)
// Use by RenderVideo to ask if it should try to use accelerated compositing.
bool canAccelerateVideoRendering(RenderVideo*) const;
