| Index: Source/core/rendering/compositing/CompositedLayerMapping.cpp
|
| diff --git a/Source/core/rendering/compositing/CompositedLayerMapping.cpp b/Source/core/rendering/compositing/CompositedLayerMapping.cpp
|
| index c775d5b4951800fb70283cf8b6686de8226de197..c53f024c49aae157326c2e342ddaefdbe7dc8aae 100644
|
| --- a/Source/core/rendering/compositing/CompositedLayerMapping.cpp
|
| +++ b/Source/core/rendering/compositing/CompositedLayerMapping.cpp
|
| @@ -377,8 +377,8 @@ bool CompositedLayerMapping::updateGraphicsLayerConfiguration()
|
| updateCompositedBounds();
|
|
|
| if (RenderLayerReflectionInfo* reflection = m_owningLayer.reflectionInfo()) {
|
| - if (reflection->reflectionLayer()->hasCompositedLayerMapping())
|
| - reflection->reflectionLayer()->compositedLayerMapping()->updateCompositedBounds();
|
| + if (CompositedLayerMapping* compositedLayerMapping = reflection->reflectionLayer()->compositedLayerMapping())
|
| + compositedLayerMapping->updateCompositedBounds();
|
| }
|
|
|
| RenderLayerCompositor* compositor = this->compositor();
|
| @@ -478,8 +478,8 @@ bool CompositedLayerMapping::updateGraphicsLayerConfiguration()
|
| }
|
|
|
| if (m_owningLayer.reflectionInfo()) {
|
| - if (m_owningLayer.reflectionInfo()->reflectionLayer()->hasCompositedLayerMapping()) {
|
| - GraphicsLayer* reflectionLayer = m_owningLayer.reflectionInfo()->reflectionLayer()->compositedLayerMapping()->mainGraphicsLayer();
|
| + if (CompositedLayerMapping* compositedLayerMapping = m_owningLayer.reflectionInfo()->reflectionLayer()->compositedLayerMapping()) {
|
| + GraphicsLayer* reflectionLayer = compositedLayerMapping->mainGraphicsLayer();
|
| m_graphicsLayer->setReplicatedByLayer(reflectionLayer);
|
| }
|
| } else {
|
| @@ -654,8 +654,9 @@ void CompositedLayerMapping::updateGraphicsLayerGeometry(const RenderLayer* comp
|
| // We compute everything relative to the enclosing compositing layer.
|
| IntRect ancestorCompositingBounds;
|
| if (compositingContainer) {
|
| - ASSERT(compositingContainer->hasCompositedLayerMapping());
|
| - ancestorCompositingBounds = compositingContainer->compositedLayerMapping()->pixelSnappedCompositedBounds();
|
| + CompositedLayerMapping* compositedLayerMapping = compositingContainer->compositedLayerMapping();
|
| + ASSERT(compositedLayerMapping);
|
| + ancestorCompositingBounds = compositedLayerMapping->pixelSnappedCompositedBounds();
|
| }
|
|
|
| IntRect localCompositingBounds;
|
| @@ -877,10 +878,13 @@ void CompositedLayerMapping::updateTransformGeometry(const IntPoint& snappedOffs
|
|
|
| void CompositedLayerMapping::updateReflectionLayerGeometry(Vector<RenderLayer*>& layersNeedingPaintInvalidation)
|
| {
|
| - if (!m_owningLayer.reflectionInfo() || !m_owningLayer.reflectionInfo()->reflectionLayer()->hasCompositedLayerMapping())
|
| + if (!m_owningLayer.reflectionInfo())
|
| return;
|
|
|
| CompositedLayerMapping* reflectionCompositedLayerMapping = m_owningLayer.reflectionInfo()->reflectionLayer()->compositedLayerMapping();
|
| + if (!reflectionCompositedLayerMapping)
|
| + return;
|
| +
|
| reflectionCompositedLayerMapping->updateGraphicsLayerGeometry(&m_owningLayer, &m_owningLayer, layersNeedingPaintInvalidation);
|
| }
|
|
|
| @@ -1754,7 +1758,7 @@ bool CompositedLayerMapping::hasVisibleNonCompositingDescendant(RenderLayer* par
|
| RenderLayerStackingNodeIterator normalFlowIterator(*parent->stackingNode(), AllChildren);
|
| while (RenderLayerStackingNode* curNode = normalFlowIterator.next()) {
|
| RenderLayer* curLayer = curNode->layer();
|
| - if (curLayer->hasCompositedLayerMapping())
|
| + if (curLayer->compositedLayerMapping())
|
| continue;
|
| if (curLayer->hasVisibleContent() || hasVisibleNonCompositingDescendant(curLayer))
|
| return true;
|
|
|