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

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

Issue 332543002: Rename Repaint to Paint Invalidation Part 4 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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/RenderBlock.cpp ('k') | Source/core/rendering/RenderBlockLineLayout.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderBlockFlow.cpp
diff --git a/Source/core/rendering/RenderBlockFlow.cpp b/Source/core/rendering/RenderBlockFlow.cpp
index 95a9f715380d7ff6a8772e9d70a99a47cfcfbe3b..d3c93c6bfcd68435fe25d78f2cfbd02682307c0e 100644
--- a/Source/core/rendering/RenderBlockFlow.cpp
+++ b/Source/core/rendering/RenderBlockFlow.cpp
@@ -308,7 +308,7 @@ void RenderBlockFlow::layoutBlock(bool relayoutChildren)
// number of columns.
bool done = false;
LayoutUnit pageLogicalHeight = 0;
- LayoutRepainter repainter(*this, checkForRepaintDuringLayout());
+ LayoutRepainter repainter(*this, checkForPaintInvalidationDuringLayout());
while (!done)
done = layoutBlockFlow(relayoutChildren, pageLogicalHeight, layoutScope);
@@ -632,11 +632,11 @@ void RenderBlockFlow::layoutBlockChild(RenderBox* child, MarginInfo& marginInfo,
// repaint ourselves (and the child) anyway.
if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled() && childHadLayout && !selfNeedsLayout())
child->repaintOverhangingFloats(true);
- else if (childHadLayout && !selfNeedsLayout() && child->checkForRepaintDuringLayout())
+ else if (childHadLayout && !selfNeedsLayout() && child->checkForPaintInvalidationDuringLayout())
child->repaintDuringLayoutIfMoved(oldRect);
}
- if (!childHadLayout && child->checkForRepaint()) {
+ if (!childHadLayout && child->checkForPaintInvalidation()) {
if (!RuntimeEnabledFeatures::repaintAfterLayoutEnabled())
child->paintInvalidationForWholeRenderer();
child->repaintOverhangingFloats(true);
@@ -1181,7 +1181,7 @@ LayoutUnit RenderBlockFlow::collapseMargins(RenderBox* child, MarginInfo& margin
// floats in the parent that overhang |child|'s new logical top.
bool logicalTopIntrudesIntoFloat = clearanceForSelfCollapsingBlock > 0 && logicalTop < beforeCollapseLogicalTop;
if (logicalTopIntrudesIntoFloat && containsFloats() && !child->avoidsFloats() && lowestFloatLogicalBottom() > logicalTop)
- child->setNeedsLayoutAndFullRepaint();
+ child->setNeedsLayoutAndFullPaintInvalidation();
}
return logicalTop;
@@ -2389,7 +2389,7 @@ bool RenderBlockFlow::positionNewFloats()
// If the child moved, we have to repaint it.
if (!RuntimeEnabledFeatures::repaintAfterLayoutEnabled()
- && childBox->checkForRepaintDuringLayout())
+ && childBox->checkForPaintInvalidationDuringLayout())
childBox->repaintDuringLayoutIfMoved(oldRect);
}
return true;
« no previous file with comments | « Source/core/rendering/RenderBlock.cpp ('k') | Source/core/rendering/RenderBlockLineLayout.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698