Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(998)

Unified Diff: Source/core/rendering/RenderLayerRepainter.cpp

Issue 24921002: Make compositingState explicit (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: addressed first round of reviewer comments Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/RenderLayerRepainter.cpp
diff --git a/Source/core/rendering/RenderLayerRepainter.cpp b/Source/core/rendering/RenderLayerRepainter.cpp
index 1ba235b6b718d08c0016d9e8a45599a167b7d7de..4335a90f658ee01c4ea38f2eab2507a0a0679292 100644
--- a/Source/core/rendering/RenderLayerRepainter.cpp
+++ b/Source/core/rendering/RenderLayerRepainter.cpp
@@ -125,7 +125,7 @@ inline bool RenderLayerRepainter::shouldRepaintAfterLayout() const
// Composited layers that were moved during a positioned movement only
// layout, don't need to be repainted. They just need to be recomposited.
ASSERT(m_repaintStatus == NeedsFullRepaintForPositionedMovementLayout);
- return !m_renderer->isComposited() || (m_renderer->isComposited() && m_renderer->layer()->backing()->paintsIntoCompositedAncestor());
+ return m_renderer->compositingState() != PaintsIntoOwnBacking;
}
// Since we're only painting non-composited layers, we know that they all share the same repaintContainer.
@@ -134,7 +134,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->isComposited())
+ if (!curr->backing())
curr->repainter().repaintIncludingNonCompositingDescendants(repaintContainer);
}
}
@@ -144,7 +144,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->isComposited())
+ if (child->backing())
continue;
repaintRect.unite(child->repainter().repaintRectIncludingNonCompositingDescendants());

Powered by Google App Engine
This is Rietveld 408576698