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

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

Issue 647903002: Remove RenderObject::checkForPaintInvalidation() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: For landing Created 6 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
« no previous file with comments | « no previous file | 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 8c56676eb5ba7ec48967ff4bf4362056a0a999ce..42032f1a23e62d55abc93c84857bd7297b0aace4 100644
--- a/Source/core/rendering/RenderBlockFlow.cpp
+++ b/Source/core/rendering/RenderBlockFlow.cpp
@@ -595,7 +595,6 @@ void RenderBlockFlow::layoutBlockChild(RenderBox* child, MarginInfo& marginInfo,
if (!child->needsLayout())
child->markForPaginationRelayoutIfNeeded(layoutScope);
- bool childHadLayout = child->everHadLayout();
bool childNeededLayout = child->needsLayout();
if (childNeededLayout)
child->layout();
@@ -670,13 +669,10 @@ void RenderBlockFlow::layoutBlockChild(RenderBox* child, MarginInfo& marginInfo,
if (childRenderBlockFlow)
addOverhangingFloats(childRenderBlockFlow, !childNeededLayout);
- // If the child moved, we have to invalidate it's paint as well as any floating/positioned
+ // If the child moved, we have to invalidate its paint as well as any floating/positioned
// descendants. An exception is if we need a layout. In this case, we know we're going to
// invalidate our paint (and the child) anyway.
- bool didNotDoFullLayoutAndMoved = childHadLayout && !selfNeedsLayout() && (childOffset.width() || childOffset.height());
- bool didNotLayoutAndNeedsPaintInvalidation = !childHadLayout && child->checkForPaintInvalidation();
-
- if (didNotDoFullLayoutAndMoved || didNotLayoutAndNeedsPaintInvalidation)
+ if (!selfNeedsLayout() && (childOffset.width() || childOffset.height()))
child->invalidatePaintForOverhangingFloats(true);
if (paginated) {
« no previous file with comments | « no previous file | Source/core/rendering/RenderBlockLineLayout.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698