Changeset 128225 in webkit


Ignore:
Timestamp:
Sep 11, 2012 2:10:38 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Clean up functions in RenderLayerBacking.h/.cpp
https://bugs.webkit.org/show_bug.cgi?id=96370

Patch by Rik Cabanier <cabanier@adobe.com> on 2012-09-11
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):

Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r128223 r128225  
     12012-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
    1222012-09-11  Stephen White  <senorblanco@chromium.org>
    223
  • trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

    r127943 r128225  
    201201#endif   
    202202   
    203     updateLayerOpacity(renderer()->style());
    204     updateLayerTransform(renderer()->style());
     203    updateOpacity(renderer()->style());
     204    updateTransform(renderer()->style());
    205205#if ENABLE(CSS_FILTERS)
    206     updateLayerFilters(renderer()->style());
     206    updateFilters(renderer()->style());
    207207#endif
    208208#if ENABLE(CSS_COMPOSITING)
     
    225225}
    226226
    227 void RenderLayerBacking::updateLayerOpacity(const RenderStyle* style)
     227void RenderLayerBacking::updateOpacity(const RenderStyle* style)
    228228{
    229229    m_graphicsLayer->setOpacity(compositingOpacity(style->opacity()));
    230230}
    231231
    232 void RenderLayerBacking::updateLayerTransform(const RenderStyle* style)
     232void RenderLayerBacking::updateTransform(const RenderStyle* style)
    233233{
    234234    // FIXME: This could use m_owningLayer->transform(), but that currently has transform-origin
     
    244244
    245245#if ENABLE(CSS_FILTERS)
    246 void RenderLayerBacking::updateLayerFilters(const RenderStyle* style)
     246void RenderLayerBacking::updateFilters(const RenderStyle* style)
    247247{
    248248    m_canCompositeFilters = m_graphicsLayer->setFilters(style->filter());
     
    466466    // is affected by the layer dimensions.
    467467    if (!renderer()->animation()->isRunningAcceleratedAnimationOnRenderer(renderer(), CSSPropertyWebkitTransform))
    468         updateLayerTransform(renderer()->style());
     468        updateTransform(renderer()->style());
    469469
    470470    // Set opacity, if it is not animating.
    471471    if (!renderer()->animation()->isRunningAcceleratedAnimationOnRenderer(renderer(), CSSPropertyOpacity))
    472         updateLayerOpacity(renderer()->style());
     472        updateOpacity(renderer()->style());
    473473       
    474474#if ENABLE(CSS_FILTERS)
    475     updateLayerFilters(renderer()->style());
     475    updateFilters(renderer()->style());
    476476#endif
    477477
     
    16111611            if (m_graphicsLayer->addAnimation(opacityVector, IntSize(), opacityAnim, GraphicsLayer::animationNameForTransition(AnimatedPropertyOpacity), timeOffset)) {
    16121612                // To ensure that the correct opacity is visible when the animation ends, also set the final opacity.
    1613                 updateLayerOpacity(toStyle);
     1613                updateOpacity(toStyle);
    16141614                didAnimateOpacity = true;
    16151615            }
     
    16251625            if (m_graphicsLayer->addAnimation(transformVector, toRenderBox(renderer())->pixelSnappedBorderBoxRect().size(), transformAnim, GraphicsLayer::animationNameForTransition(AnimatedPropertyWebkitTransform), timeOffset)) {
    16261626                // To ensure that the correct transform is visible when the animation ends, also set the final transform.
    1627                 updateLayerTransform(toStyle);
     1627                updateTransform(toStyle);
    16281628                didAnimateTransform = true;
    16291629            }
     
    16401640            if (m_graphicsLayer->addAnimation(filterVector, IntSize(), filterAnim, GraphicsLayer::animationNameForTransition(AnimatedPropertyWebkitFilter), timeOffset)) {
    16411641                // To ensure that the correct filter is visible when the animation ends, also set the final filter.
    1642                 updateLayerFilters(toStyle);
     1642                updateFilters(toStyle);
    16431643                didAnimateFilter = true;
    16441644            }
  • trunk/Source/WebCore/rendering/RenderLayerBacking.h

    r127943 r128225  
    202202    FloatPoint computePerspectiveOrigin(const IntRect& borderBox) const;
    203203
    204     void updateLayerOpacity(const RenderStyle*);
    205     void updateLayerTransform(const RenderStyle*);
     204    void updateOpacity(const RenderStyle*);
     205    void updateTransform(const RenderStyle*);
    206206#if ENABLE(CSS_FILTERS)
    207     void updateLayerFilters(const RenderStyle*);
     207    void updateFilters(const RenderStyle*);
    208208#endif
    209209#if ENABLE(CSS_COMPOSITING)
Note: See TracChangeset for help on using the changeset viewer.