| Index: Source/core/rendering/RenderLayer.cpp
|
| diff --git a/Source/core/rendering/RenderLayer.cpp b/Source/core/rendering/RenderLayer.cpp
|
| index 0f135d3588e9d45dae43856a9782ce5ec12f7086..742315d352c078e820319c62443f2baea85e5b16 100644
|
| --- a/Source/core/rendering/RenderLayer.cpp
|
| +++ b/Source/core/rendering/RenderLayer.cpp
|
| @@ -202,8 +202,8 @@ void RenderLayer::contentChanged(ContentChangeType changeType)
|
| // GraphicsLayer::setContentsToPlatformLayer with the new platform
|
| // layer for this canvas.
|
| // See http://crbug.com/349195
|
| - if (hasCompositedLayerMapping())
|
| - compositedLayerMapping()->setNeedsGraphicsLayerUpdate(GraphicsLayerUpdateSubtree);
|
| + if (m_compositedLayerMapping)
|
| + m_compositedLayerMapping->setNeedsGraphicsLayerUpdate(GraphicsLayerUpdateSubtree);
|
| }
|
|
|
| if (m_compositedLayerMapping)
|
| @@ -1049,8 +1049,8 @@ void RenderLayer::setHasCompositingDescendant(bool hasCompositingDescendant)
|
|
|
| m_hasCompositingDescendant = hasCompositingDescendant;
|
|
|
| - if (hasCompositedLayerMapping())
|
| - compositedLayerMapping()->setNeedsGraphicsLayerUpdate(GraphicsLayerUpdateLocal);
|
| + if (m_compositedLayerMapping)
|
| + m_compositedLayerMapping->setNeedsGraphicsLayerUpdate(GraphicsLayerUpdateLocal);
|
| }
|
|
|
| void RenderLayer::setShouldIsolateCompositedDescendants(bool shouldIsolateCompositedDescendants)
|
| @@ -1060,8 +1060,8 @@ void RenderLayer::setShouldIsolateCompositedDescendants(bool shouldIsolateCompos
|
|
|
| m_shouldIsolateCompositedDescendants = shouldIsolateCompositedDescendants;
|
|
|
| - if (hasCompositedLayerMapping())
|
| - compositedLayerMapping()->setNeedsGraphicsLayerUpdate(GraphicsLayerUpdateLocal);
|
| + if (m_compositedLayerMapping)
|
| + m_compositedLayerMapping->setNeedsGraphicsLayerUpdate(GraphicsLayerUpdateLocal);
|
| }
|
|
|
| bool RenderLayer::hasAncestorWithFilterOutsets() const
|
| @@ -2274,7 +2274,7 @@ LayoutRect RenderLayer::boundingBoxForCompositingOverlapTest() const
|
|
|
| static void expandRectForReflectionAndStackingChildren(const RenderLayer* ancestorLayer, RenderLayer::CalculateBoundsOptions options, LayoutRect& result)
|
| {
|
| - if (ancestorLayer->reflectionInfo() && !ancestorLayer->reflectionInfo()->reflectionLayer()->hasCompositedLayerMapping())
|
| + if (ancestorLayer->reflectionInfo() && !ancestorLayer->reflectionInfo()->reflectionLayer()->compositedLayerMapping())
|
| result.unite(ancestorLayer->reflectionInfo()->reflectionLayer()->boundingBoxForCompositing(ancestorLayer));
|
|
|
| ASSERT(ancestorLayer->stackingNode()->isStackingContext() || !ancestorLayer->stackingNode()->hasPositiveZOrderList());
|
| @@ -2343,7 +2343,7 @@ LayoutRect RenderLayer::boundingBoxForCompositing(const RenderLayer* ancestorLay
|
| // a recursive computation of stacking children yields no results. This breaks cases when there are stacking
|
| // children of the parent, that need to be included in reflected composited bounds.
|
| // Fix this by including composited bounds of stacking children of the reflected RenderLayer.
|
| - if (hasCompositedLayerMapping() && parent() && parent()->reflectionInfo() && parent()->reflectionInfo()->reflectionLayer() == this)
|
| + if (compositedLayerMapping() && parent() && parent()->reflectionInfo() && parent()->reflectionInfo()->reflectionLayer() == this)
|
| expandRectForReflectionAndStackingChildren(parent(), options, result);
|
| else
|
| expandRectForReflectionAndStackingChildren(this, options, result);
|
|
|