| Index: Source/core/rendering/compositing/GraphicsLayerUpdater.cpp
|
| diff --git a/Source/core/rendering/compositing/GraphicsLayerUpdater.cpp b/Source/core/rendering/compositing/GraphicsLayerUpdater.cpp
|
| index 709fe4a72261e44aa66b59ea12edc75fbffd9cd6..a089e1f0fd095e4bc11676ece65c699a33f02294 100644
|
| --- a/Source/core/rendering/compositing/GraphicsLayerUpdater.cpp
|
| +++ b/Source/core/rendering/compositing/GraphicsLayerUpdater.cpp
|
| @@ -90,23 +90,21 @@ void GraphicsLayerUpdater::update(RenderLayer& layer, Vector<RenderLayer*>& laye
|
|
|
| void GraphicsLayerUpdater::updateRecursive(RenderLayer& layer, UpdateType updateType, const UpdateContext& context, Vector<RenderLayer*>& layersNeedingPaintInvalidation)
|
| {
|
| - if (layer.hasCompositedLayerMapping()) {
|
| - CompositedLayerMapping* mapping = layer.compositedLayerMapping();
|
| -
|
| - if (updateType == ForceUpdate || mapping->needsGraphicsLayerUpdate()) {
|
| + if (CompositedLayerMapping* compositedLayerMapping = layer.compositedLayerMapping()) {
|
| + if (updateType == ForceUpdate || compositedLayerMapping->needsGraphicsLayerUpdate()) {
|
| const RenderLayer* compositingContainer = context.compositingContainer(layer);
|
| ASSERT(compositingContainer == layer.enclosingLayerWithCompositedLayerMapping(ExcludeSelf));
|
|
|
| - if (mapping->updateGraphicsLayerConfiguration())
|
| + if (compositedLayerMapping->updateGraphicsLayerConfiguration())
|
| m_needsRebuildTree = true;
|
|
|
| - mapping->updateGraphicsLayerGeometry(compositingContainer, context.compositingStackingContext(), layersNeedingPaintInvalidation);
|
| + compositedLayerMapping->updateGraphicsLayerGeometry(compositingContainer, context.compositingStackingContext(), layersNeedingPaintInvalidation);
|
|
|
| - if (mapping->hasUnpositionedOverflowControlsLayers())
|
| + if (compositedLayerMapping->hasUnpositionedOverflowControlsLayers())
|
| layer.scrollableArea()->positionOverflowControls(IntSize());
|
|
|
| - updateType = mapping->updateTypeForChildren(updateType);
|
| - mapping->clearNeedsGraphicsLayerUpdate();
|
| + updateType = compositedLayerMapping->updateTypeForChildren(updateType);
|
| + compositedLayerMapping->clearNeedsGraphicsLayerUpdate();
|
| }
|
| }
|
|
|
| @@ -119,8 +117,8 @@ void GraphicsLayerUpdater::updateRecursive(RenderLayer& layer, UpdateType update
|
|
|
| void GraphicsLayerUpdater::assertNeedsToUpdateGraphicsLayerBitsCleared(RenderLayer& layer)
|
| {
|
| - if (layer.hasCompositedLayerMapping())
|
| - layer.compositedLayerMapping()->assertNeedsToUpdateGraphicsLayerBitsCleared();
|
| + if (CompositedLayerMapping* compositedLayerMapping = layer.compositedLayerMapping())
|
| + compositedLayerMapping->assertNeedsToUpdateGraphicsLayerBitsCleared();
|
|
|
| for (RenderLayer* child = layer.firstChild(); child; child = child->nextSibling())
|
| assertNeedsToUpdateGraphicsLayerBitsCleared(*child);
|
|
|