Rename Repaint to Paint Invalidation Part 4

Source/core/rendering/RenderLayerRepainter.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
  *   Randall Jesup <rjesup@wgate.com>
@@ skipping 55 matching lines @@
     // Until those states are fully fledged, I'll just disable the ASSERTS.
     DisableCompositingQueryAsserts disabler;
     if (m_renderer.layer()->hasVisibleContent()) {
         RenderView* view = m_renderer.view();
         ASSERT(view);
         // FIXME: LayoutState does not work with RenderLayers as there is not a 1-to-1
         // mapping between them and the RenderObjects. It would be neat to enable
         // LayoutState outside the layout() phase and use it here.
         ASSERT(!view->layoutStateEnabled());
 
-        const RenderLayerModelObject* repaintContainer = m_renderer.containerForRepaint();
+        const RenderLayerModelObject* repaintContainer = m_renderer.containerForPaintInvalidation();
         LayoutRect oldRepaintRect = m_repaintRect;
         LayoutPoint oldOffset = m_offset;
         computeRepaintRects();
         shouldCheckForRepaint &= shouldRepaintLayer();
 
         if (shouldCheckForRepaint) {
             if (view && !view->document().printing()) {
                 if (m_repaintStatus & NeedsFullRepaint) {
                     m_renderer.invalidatePaintUsingContainer(repaintContainer, pixelSnappedIntRect(oldRepaintRect), InvalidationLayer);
                     if (m_repaintRect != oldRepaintRect)
@@ skipping 13 matching lines @@
 
 void RenderLayerRepainter::clearRepaintRects()
 {
     ASSERT(!m_renderer.layer()->hasVisibleContent());
 
     m_repaintRect = IntRect();
 }
 
 void RenderLayerRepainter::computeRepaintRects()
 {
-    const RenderLayerModelObject* repaintContainer = m_renderer.containerForRepaint();
-    LayoutRect repaintRect = m_renderer.boundsRectForRepaint(repaintContainer);
+    const RenderLayerModelObject* repaintContainer = m_renderer.containerForPaintInvalidation();
+    LayoutRect repaintRect = m_renderer.boundsRectForPaintInvalidation(repaintContainer);
     if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) {
         // FIXME: We want RenderLayerRepainter to go away when
         // repaint-after-layout is on by default so we need to figure out how to
         // handle this update.
         m_renderer.setPreviousPaintInvalidationRect(repaintRect);
     } else {
         m_repaintRect = repaintRect;
-        m_offset = m_renderer.positionFromRepaintContainer(repaintContainer);
+        m_offset = m_renderer.positionFromPaintInvalidationContainer(repaintContainer);
     }
 }
 
 void RenderLayerRepainter::computeRepaintRectsIncludingNonCompositingDescendants()
 {
     // FIXME: computeRepaintRects() has to walk up the parent chain for every layer to compute the rects.
     // We should make this more efficient.
     // FIXME: it's wrong to call this when layout is not up-to-date, which we do.
     computeRepaintRects();
 
@@ skipping 12 matching lines @@
         return true;
 
     // Composited layers that were moved during a positioned movement only
     // layout, don't need to be repainted. They just need to be recomposited.
     return m_renderer.compositingState() != PaintsIntoOwnBacking;
 }
 
 // Since we're only painting non-composited layers, we know that they all share the same repaintContainer.
 void RenderLayerRepainter::repaintIncludingNonCompositingDescendants()
 {
-    repaintIncludingNonCompositingDescendantsInternal(m_renderer.containerForRepaint());
+    repaintIncludingNonCompositingDescendantsInternal(m_renderer.containerForPaintInvalidation());
 }
 
 void RenderLayerRepainter::repaintIncludingNonCompositingDescendantsInternal(const RenderLayerModelObject* repaintContainer)
 {
-    m_renderer.invalidatePaintUsingContainer(repaintContainer, pixelSnappedIntRect(m_renderer.boundsRectForRepaint(repaintContainer)), InvalidationLayer);
+    m_renderer.invalidatePaintUsingContainer(repaintContainer, pixelSnappedIntRect(m_renderer.boundsRectForPaintInvalidation(repaintContainer)), InvalidationLayer);
 
     // FIXME: Repaints can be issued during style recalc at present, via RenderLayerModelObject::styleWillChange. This happens in scenarios when
     // repaint is needed but not layout.
     DisableCompositingQueryAsserts disabler;
 
     for (RenderLayer* curr = m_renderer.layer()->firstChild(); curr; curr = curr->nextSibling()) {
         if (curr->compositingState() != PaintsIntoOwnBacking && curr->compositingState() != PaintsIntoGroupedBacking)
             curr->repainter().repaintIncludingNonCompositingDescendantsInternal(repaintContainer);
     }
 }
@@ skipping 96 matching lines @@
 RenderLayer* RenderLayerRepainter::enclosingFilterRepaintLayer() const
 {
     for (const RenderLayer* curr = m_renderer.layer(); curr; curr = curr->parent()) {
         if ((curr != m_renderer.layer() && curr->requiresFullLayerImageForFilters()) || curr->compositingState() == PaintsIntoOwnBacking || curr->isRootLayer())
             return const_cast<RenderLayer*>(curr);
     }
     return 0;
 }
 
 } // Namespace WebCore