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

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

Issue 478733002: Rename repaint to paintInvalidation for remaining methods. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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
« no previous file with comments | « Source/core/rendering/RenderLayerRepainter.h ('k') | Source/core/rendering/RenderLayerScrollableArea.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderLayerRepainter.cpp
diff --git a/Source/core/rendering/RenderLayerRepainter.cpp b/Source/core/rendering/RenderLayerRepainter.cpp
index abe3095297b245031d9ba64d08b9412d1917afa1..d885c7b38f59a36b863bfebedf941558db8fe969 100644
--- a/Source/core/rendering/RenderLayerRepainter.cpp
+++ b/Source/core/rendering/RenderLayerRepainter.cpp
@@ -72,47 +72,47 @@ void RenderLayerRepainter::computePaintInvalidationRectsIncludingNonCompositingD
}
}
-// Since we're only painting non-composited layers, we know that they all share the same repaintContainer.
+// Since we're only painting non-composited layers, we know that they all share the same paintInvalidationContainer.
void RenderLayerRepainter::paintInvalidationIncludingNonCompositingDescendants()
{
- repaintIncludingNonCompositingDescendantsInternal(m_renderer.containerForPaintInvalidation());
+ paintInvalidationIncludingNonCompositingDescendantsInternal(m_renderer.containerForPaintInvalidation());
}
-void RenderLayerRepainter::repaintIncludingNonCompositingDescendantsInternal(const RenderLayerModelObject* repaintContainer)
+void RenderLayerRepainter::paintInvalidationIncludingNonCompositingDescendantsInternal(const RenderLayerModelObject* paintInvalidationContainer)
{
- m_renderer.invalidatePaintUsingContainer(repaintContainer, m_renderer.previousPaintInvalidationRect(), InvalidationLayer);
+ m_renderer.invalidatePaintUsingContainer(paintInvalidationContainer, m_renderer.previousPaintInvalidationRect(), InvalidationLayer);
// Disable for reading compositingState() below.
DisableCompositingQueryAsserts disabler;
for (RenderLayer* curr = m_renderer.layer()->firstChild(); curr; curr = curr->nextSibling()) {
if (curr->compositingState() != PaintsIntoOwnBacking && curr->compositingState() != PaintsIntoGroupedBacking)
- curr->paintInvalidator().repaintIncludingNonCompositingDescendantsInternal(repaintContainer);
+ curr->paintInvalidator().paintInvalidationIncludingNonCompositingDescendantsInternal(paintInvalidationContainer);
}
}
-LayoutRect RenderLayerRepainter::repaintRectIncludingNonCompositingDescendants() const
+LayoutRect RenderLayerRepainter::paintInvalidationRectIncludingNonCompositingDescendants() const
{
- LayoutRect repaintRect = m_renderer.previousPaintInvalidationRect();
+ LayoutRect paintInvalidationRect = m_renderer.previousPaintInvalidationRect();
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.
+ // Don't include paint invalidation rects for composited child layers; they will paint themselves and have a different origin.
if (child->compositingState() == PaintsIntoOwnBacking || child->compositingState() == PaintsIntoGroupedBacking)
continue;
- repaintRect.unite(child->paintInvalidator().repaintRectIncludingNonCompositingDescendants());
+ paintInvalidationRect.unite(child->paintInvalidator().paintInvalidationRectIncludingNonCompositingDescendants());
}
- return repaintRect;
+ return paintInvalidationRect;
}
-void RenderLayerRepainter::setBackingNeedsRepaintInRect(const LayoutRect& r)
+void RenderLayerRepainter::setBackingNeedsPaintInvalidationInRect(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.compositingState() != NotComposited);
if (m_renderer.compositingState() == NotComposited) {
- // If we're trying to repaint the placeholder document layer, propagate the
- // repaint to the native view system.
+ // If we're trying to issue paint invalidations of the placeholder document layer, propagate the
+ // paint invalidation to the native view system.
LayoutRect absRect(r);
LayoutPoint delta;
m_renderer.layer()->convertToLayerCoords(m_renderer.layer()->root(), delta);
@@ -128,39 +128,39 @@ void RenderLayerRepainter::setBackingNeedsRepaintInRect(const LayoutRect& r)
}
// FIXME: generalize accessors to backing GraphicsLayers so that this code is squasphing-agnostic.
if (m_renderer.layer()->groupedMapping()) {
- LayoutRect repaintRect = r;
- repaintRect.move(m_renderer.layer()->subpixelAccumulation());
+ LayoutRect paintInvalidationRect = r;
+ paintInvalidationRect.move(m_renderer.layer()->subpixelAccumulation());
if (GraphicsLayer* squashingLayer = m_renderer.layer()->groupedMapping()->squashingLayer())
- squashingLayer->setNeedsDisplayInRect(pixelSnappedIntRect(repaintRect));
+ squashingLayer->setNeedsDisplayInRect(pixelSnappedIntRect(paintInvalidationRect));
} else {
m_renderer.layer()->compositedLayerMapping()->setContentsNeedDisplayInRect(r);
}
}
-void RenderLayerRepainter::setFilterBackendNeedsRepaintingInRect(const LayoutRect& rect)
+void RenderLayerRepainter::setFilterBackendNeedsPaintInvalidationInRect(const LayoutRect& rect)
{
if (rect.isEmpty())
return;
- LayoutRect rectForRepaint = rect;
- m_renderer.style()->filterOutsets().expandRect(rectForRepaint);
+ LayoutRect rectForPaintInvalidation = rect;
+ m_renderer.style()->filterOutsets().expandRect(rectForPaintInvalidation);
ASSERT(m_renderer.layer()->filterInfo());
- RenderLayer* parentLayer = enclosingFilterRepaintLayer();
+ RenderLayer* parentLayer = enclosingFilterPaintInvalidationLayer();
ASSERT(parentLayer);
- FloatQuad repaintQuad(rectForRepaint);
- LayoutRect parentLayerRect = m_renderer.localToContainerQuad(repaintQuad, parentLayer->renderer()).enclosingBoundingBox();
+ FloatQuad paintInvalidationQuad(rectForPaintInvalidation);
+ LayoutRect parentLayerRect = m_renderer.localToContainerQuad(paintInvalidationQuad, parentLayer->renderer()).enclosingBoundingBox();
if (parentLayerRect.isEmpty())
return;
if (parentLayer->hasCompositedLayerMapping()) {
- parentLayer->paintInvalidator().setBackingNeedsRepaintInRect(parentLayerRect);
+ parentLayer->paintInvalidator().setBackingNeedsPaintInvalidationInRect(parentLayerRect);
return;
}
if (parentLayer->paintsWithFilters()) {
- parentLayer->paintInvalidator().setFilterBackendNeedsRepaintingInRect(parentLayerRect);
+ parentLayer->paintInvalidator().setFilterBackendNeedsPaintInvalidationInRect(parentLayerRect);
return;
}
@@ -173,7 +173,7 @@ void RenderLayerRepainter::setFilterBackendNeedsRepaintingInRect(const LayoutRec
ASSERT_NOT_REACHED();
}
-RenderLayer* RenderLayerRepainter::enclosingFilterRepaintLayer() const
+RenderLayer* RenderLayerRepainter::enclosingFilterPaintInvalidationLayer() const
{
for (const RenderLayer* curr = m_renderer.layer(); curr; curr = curr->parent()) {
if ((curr != m_renderer.layer() && curr->requiresFullLayerImageForFilters()) || curr->compositingState() == PaintsIntoOwnBacking || curr->isRootLayer())
« no previous file with comments | « Source/core/rendering/RenderLayerRepainter.h ('k') | Source/core/rendering/RenderLayerScrollableArea.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698