Changeset 128225 in webkit
- Timestamp:
- Sep 11, 2012 2:10:38 PM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r128223 r128225 1 2012-09-11 Rik Cabanier <cabanier@adobe.com> 2 3 Clean up functions in RenderLayerBacking.h/.cpp 4 https://bugs.webkit.org/show_bug.cgi?id=96370 5 6 Reviewed by Simon Fraser. 7 8 Remove 'layer' from function names in RenderLayerBacking 9 10 No new test. No change in functionality. 11 12 * rendering/RenderLayerBacking.cpp: 13 (WebCore::RenderLayerBacking::createPrimaryGraphicsLayer): 14 (WebCore::RenderLayerBacking::updateOpacity): 15 (WebCore::RenderLayerBacking::updateTransform): 16 (WebCore::RenderLayerBacking::updateFilters): 17 (WebCore::RenderLayerBacking::updateGraphicsLayerGeometry): 18 (WebCore::RenderLayerBacking::startTransition): 19 * rendering/RenderLayerBacking.h: 20 (RenderLayerBacking): 21 1 22 2012-09-11 Stephen White <senorblanco@chromium.org> 2 23 -
trunk/Source/WebCore/rendering/RenderLayerBacking.cpp
r127943 r128225 201 201 #endif 202 202 203 update LayerOpacity(renderer()->style());204 update LayerTransform(renderer()->style());203 updateOpacity(renderer()->style()); 204 updateTransform(renderer()->style()); 205 205 #if ENABLE(CSS_FILTERS) 206 update LayerFilters(renderer()->style());206 updateFilters(renderer()->style()); 207 207 #endif 208 208 #if ENABLE(CSS_COMPOSITING) … … 225 225 } 226 226 227 void RenderLayerBacking::update LayerOpacity(const RenderStyle* style)227 void RenderLayerBacking::updateOpacity(const RenderStyle* style) 228 228 { 229 229 m_graphicsLayer->setOpacity(compositingOpacity(style->opacity())); 230 230 } 231 231 232 void RenderLayerBacking::update LayerTransform(const RenderStyle* style)232 void RenderLayerBacking::updateTransform(const RenderStyle* style) 233 233 { 234 234 // FIXME: This could use m_owningLayer->transform(), but that currently has transform-origin … … 244 244 245 245 #if ENABLE(CSS_FILTERS) 246 void RenderLayerBacking::update LayerFilters(const RenderStyle* style)246 void RenderLayerBacking::updateFilters(const RenderStyle* style) 247 247 { 248 248 m_canCompositeFilters = m_graphicsLayer->setFilters(style->filter()); … … 466 466 // is affected by the layer dimensions. 467 467 if (!renderer()->animation()->isRunningAcceleratedAnimationOnRenderer(renderer(), CSSPropertyWebkitTransform)) 468 update LayerTransform(renderer()->style());468 updateTransform(renderer()->style()); 469 469 470 470 // Set opacity, if it is not animating. 471 471 if (!renderer()->animation()->isRunningAcceleratedAnimationOnRenderer(renderer(), CSSPropertyOpacity)) 472 update LayerOpacity(renderer()->style());472 updateOpacity(renderer()->style()); 473 473 474 474 #if ENABLE(CSS_FILTERS) 475 update LayerFilters(renderer()->style());475 updateFilters(renderer()->style()); 476 476 #endif 477 477 … … 1611 1611 if (m_graphicsLayer->addAnimation(opacityVector, IntSize(), opacityAnim, GraphicsLayer::animationNameForTransition(AnimatedPropertyOpacity), timeOffset)) { 1612 1612 // To ensure that the correct opacity is visible when the animation ends, also set the final opacity. 1613 update LayerOpacity(toStyle);1613 updateOpacity(toStyle); 1614 1614 didAnimateOpacity = true; 1615 1615 } … … 1625 1625 if (m_graphicsLayer->addAnimation(transformVector, toRenderBox(renderer())->pixelSnappedBorderBoxRect().size(), transformAnim, GraphicsLayer::animationNameForTransition(AnimatedPropertyWebkitTransform), timeOffset)) { 1626 1626 // To ensure that the correct transform is visible when the animation ends, also set the final transform. 1627 update LayerTransform(toStyle);1627 updateTransform(toStyle); 1628 1628 didAnimateTransform = true; 1629 1629 } … … 1640 1640 if (m_graphicsLayer->addAnimation(filterVector, IntSize(), filterAnim, GraphicsLayer::animationNameForTransition(AnimatedPropertyWebkitFilter), timeOffset)) { 1641 1641 // To ensure that the correct filter is visible when the animation ends, also set the final filter. 1642 update LayerFilters(toStyle);1642 updateFilters(toStyle); 1643 1643 didAnimateFilter = true; 1644 1644 } -
trunk/Source/WebCore/rendering/RenderLayerBacking.h
r127943 r128225 202 202 FloatPoint computePerspectiveOrigin(const IntRect& borderBox) const; 203 203 204 void update LayerOpacity(const RenderStyle*);205 void update LayerTransform(const RenderStyle*);204 void updateOpacity(const RenderStyle*); 205 void updateTransform(const RenderStyle*); 206 206 #if ENABLE(CSS_FILTERS) 207 void update LayerFilters(const RenderStyle*);207 void updateFilters(const RenderStyle*); 208 208 #endif 209 209 #if ENABLE(CSS_COMPOSITING)
Note: See TracChangeset
for help on using the changeset viewer.