| Index: Source/core/rendering/RenderLayerRepainter.cpp
|
| diff --git a/Source/core/rendering/RenderLayerRepainter.cpp b/Source/core/rendering/RenderLayerRepainter.cpp
|
| index 595431fa03737e99e3ad08967d41ad64011efeba..648371544044bafe036042dbdb64a37b8f278164 100644
|
| --- a/Source/core/rendering/RenderLayerRepainter.cpp
|
| +++ b/Source/core/rendering/RenderLayerRepainter.cpp
|
| @@ -135,7 +135,7 @@ void RenderLayerRepainter::repaintIncludingNonCompositingDescendants(RenderLayer
|
| m_renderer->repaintUsingContainer(repaintContainer, pixelSnappedIntRect(m_renderer->clippedOverflowRectForRepaint(repaintContainer)));
|
|
|
| for (RenderLayer* curr = m_renderer->layer()->firstChild(); curr; curr = curr->nextSibling()) {
|
| - if (!curr->compositedLayerMapping())
|
| + if (curr->compositingState() != PaintsIntoOwnBacking)
|
| curr->repainter().repaintIncludingNonCompositingDescendants(repaintContainer);
|
| }
|
| }
|
| @@ -145,7 +145,7 @@ LayoutRect RenderLayerRepainter::repaintRectIncludingNonCompositingDescendants()
|
| LayoutRect repaintRect = m_repaintRect;
|
| for (RenderLayer* child = m_renderer->layer()->firstChild(); child; child = child->nextSibling()) {
|
| // Don't include repaint rects for composited child layers; they will paint themselves and have a different origin.
|
| - if (child->compositedLayerMapping())
|
| + if (child->compositingState() == PaintsIntoOwnBacking)
|
| continue;
|
|
|
| repaintRect.unite(child->repainter().repaintRectIncludingNonCompositingDescendants());
|
| @@ -164,7 +164,7 @@ void RenderLayerRepainter::setBackingNeedsRepaintInRect(const LayoutRect& r)
|
| // https://bugs.webkit.org/show_bug.cgi?id=61159 describes an unreproducible crash here,
|
| // so assert but check that the layer is composited.
|
| ASSERT(m_renderer->compositedLayerMapping());
|
| - if (!m_renderer->compositedLayerMapping()) {
|
| + if (m_renderer->compositingState() != PaintsIntoOwnBacking) {
|
| // If we're trying to repaint the placeholder document layer, propagate the
|
| // repaint to the native view system.
|
| LayoutRect absRect(r);
|
| @@ -212,7 +212,7 @@ void RenderLayerRepainter::setFilterBackendNeedsRepaintingInRect(const LayoutRec
|
| FloatQuad repaintQuad(rectForRepaint);
|
| LayoutRect parentLayerRect = m_renderer->localToContainerQuad(repaintQuad, parentLayer->renderer()).enclosingBoundingBox();
|
|
|
| - if (parentLayer->compositedLayerMapping()) {
|
| + if (parentLayer->compositingState() == PaintsIntoOwnBacking) {
|
| parentLayer->repainter().setBackingNeedsRepaintInRect(parentLayerRect);
|
| return;
|
| }
|
|
|