Modified: trunk/Source/WebCore/ChangeLog (128224 => 128225)
--- trunk/Source/WebCore/ChangeLog 2012-09-11 21:03:12 UTC (rev 128224)
+++ trunk/Source/WebCore/ChangeLog 2012-09-11 21:10:38 UTC (rev 128225)
@@ -1,3 +1,24 @@
+2012-09-11 Rik Cabanier <caban...@adobe.com>
+
+ Clean up functions in RenderLayerBacking.h/.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=96370
+
+ Reviewed by Simon Fraser.
+
+ Remove 'layer' from function names in RenderLayerBacking
+
+ No new test. No change in functionality.
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::createPrimaryGraphicsLayer):
+ (WebCore::RenderLayerBacking::updateOpacity):
+ (WebCore::RenderLayerBacking::updateTransform):
+ (WebCore::RenderLayerBacking::updateFilters):
+ (WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):
+ (WebCore::RenderLayerBacking::startTransition):
+ * rendering/RenderLayerBacking.h:
+ (RenderLayerBacking):
+
2012-09-11 Stephen White <senorbla...@chromium.org>
[skia] Switch FEComponentTransfer filter to use skia's SkColorFilter
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (128224 => 128225)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2012-09-11 21:03:12 UTC (rev 128224)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2012-09-11 21:10:38 UTC (rev 128225)
@@ -200,10 +200,10 @@
}
#endif
- updateLayerOpacity(renderer()->style());
- updateLayerTransform(renderer()->style());
+ updateOpacity(renderer()->style());
+ updateTransform(renderer()->style());
#if ENABLE(CSS_FILTERS)
- updateLayerFilters(renderer()->style());
+ updateFilters(renderer()->style());
#endif
#if ENABLE(CSS_COMPOSITING)
updateLayerBlendMode(renderer()->style());
@@ -224,12 +224,12 @@
m_scrollingContentsLayer = nullptr;
}
-void RenderLayerBacking::updateLayerOpacity(const RenderStyle* style)
+void RenderLayerBacking::updateOpacity(const RenderStyle* style)
{
m_graphicsLayer->setOpacity(compositingOpacity(style->opacity()));
}
-void RenderLayerBacking::updateLayerTransform(const RenderStyle* style)
+void RenderLayerBacking::updateTransform(const RenderStyle* style)
{
// FIXME: This could use m_owningLayer->transform(), but that currently has transform-origin
// baked into it, and we don't want that.
@@ -243,7 +243,7 @@
}
#if ENABLE(CSS_FILTERS)
-void RenderLayerBacking::updateLayerFilters(const RenderStyle* style)
+void RenderLayerBacking::updateFilters(const RenderStyle* style)
{
m_canCompositeFilters = m_graphicsLayer->setFilters(style->filter());
}
@@ -465,14 +465,14 @@
// Set transform property, if it is not animating. We have to do this here because the transform
// is affected by the layer dimensions.
if (!renderer()->animation()->isRunningAcceleratedAnimationOnRenderer(renderer(), CSSPropertyWebkitTransform))
- updateLayerTransform(renderer()->style());
+ updateTransform(renderer()->style());
// Set opacity, if it is not animating.
if (!renderer()->animation()->isRunningAcceleratedAnimationOnRenderer(renderer(), CSSPropertyOpacity))
- updateLayerOpacity(renderer()->style());
+ updateOpacity(renderer()->style());
#if ENABLE(CSS_FILTERS)
- updateLayerFilters(renderer()->style());
+ updateFilters(renderer()->style());
#endif
#if ENABLE(CSS_COMPOSITING)
@@ -1610,7 +1610,7 @@
// The boxSize param is only used for transform animations (which can only run on RenderBoxes), so we pass an empty size here.
if (m_graphicsLayer->addAnimation(opacityVector, IntSize(), opacityAnim, GraphicsLayer::animationNameForTransition(AnimatedPropertyOpacity), timeOffset)) {
// To ensure that the correct opacity is visible when the animation ends, also set the final opacity.
- updateLayerOpacity(toStyle);
+ updateOpacity(toStyle);
didAnimateOpacity = true;
}
}
@@ -1624,7 +1624,7 @@
transformVector.insert(new TransformAnimationValue(1, &toStyle->transform()));
if (m_graphicsLayer->addAnimation(transformVector, toRenderBox(renderer())->pixelSnappedBorderBoxRect().size(), transformAnim, GraphicsLayer::animationNameForTransition(AnimatedPropertyWebkitTransform), timeOffset)) {
// To ensure that the correct transform is visible when the animation ends, also set the final transform.
- updateLayerTransform(toStyle);
+ updateTransform(toStyle);
didAnimateTransform = true;
}
}
@@ -1639,7 +1639,7 @@
filterVector.insert(new FilterAnimationValue(1, &toStyle->filter()));
if (m_graphicsLayer->addAnimation(filterVector, IntSize(), filterAnim, GraphicsLayer::animationNameForTransition(AnimatedPropertyWebkitFilter), timeOffset)) {
// To ensure that the correct filter is visible when the animation ends, also set the final filter.
- updateLayerFilters(toStyle);
+ updateFilters(toStyle);
didAnimateFilter = true;
}
}
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.h (128224 => 128225)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.h 2012-09-11 21:03:12 UTC (rev 128224)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.h 2012-09-11 21:10:38 UTC (rev 128225)
@@ -201,10 +201,10 @@
// Result is perspective origin in pixels.
FloatPoint computePerspectiveOrigin(const IntRect& borderBox) const;
- void updateLayerOpacity(const RenderStyle*);
- void updateLayerTransform(const RenderStyle*);
+ void updateOpacity(const RenderStyle*);
+ void updateTransform(const RenderStyle*);
#if ENABLE(CSS_FILTERS)
- void updateLayerFilters(const RenderStyle*);
+ void updateFilters(const RenderStyle*);
#endif
#if ENABLE(CSS_COMPOSITING)
void updateLayerBlendMode(const RenderStyle*);
