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

Unified Diff: sky/engine/core/rendering/RenderParagraph.cpp

Issue 791023006: Delete invalidateTreeIfNeeded. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Remove unneeded call Created 5 years, 11 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 | « sky/engine/core/rendering/RenderObject.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderParagraph.cpp
diff --git a/sky/engine/core/rendering/RenderParagraph.cpp b/sky/engine/core/rendering/RenderParagraph.cpp
index 72eb951d72d5654b5491a445ef40d453bbf77e36..83de4275bd708c8e7241ccffb8b8eb4d8194a3b8 100644
--- a/sky/engine/core/rendering/RenderParagraph.cpp
+++ b/sky/engine/core/rendering/RenderParagraph.cpp
@@ -1250,12 +1250,8 @@ void RenderParagraph::layoutChildren(bool relayoutChildren, SubtreeLayoutScope&
bool isFullLayout = !firstLineBox() || selfNeedsLayout() || relayoutChildren;
LineLayoutState layoutState(isFullLayout, paintInvalidationLogicalTop, paintInvalidationLogicalBottom);
- if (isFullLayout) {
- // Ensure the old line boxes will be erased.
- if (firstLineBox())
- setShouldDoFullPaintInvalidation(true);
+ if (isFullLayout)
lineBoxes()->deleteLineBoxes();
- }
// Text truncation kicks in in two cases:
// 1) If your overflow isn't visible and your text-overflow-mode isn't clip.
@@ -1330,10 +1326,6 @@ void RenderParagraph::layoutChildren(bool relayoutChildren, SubtreeLayoutScope&
// truncate text.
if (hasTextOverflow)
checkLinesForTextOverflow();
-
- // Ensure the new line boxes will be painted.
- if (isFullLayout && firstLineBox())
- setShouldDoFullPaintInvalidation(true);
}
void RenderParagraph::checkFloatsInCleanLine(RootInlineBox* line, Vector<FloatWithRect>& floats, size_t& floatIndex, bool& encounteredNewFloat, bool& dirtiedByFloat)
@@ -1393,7 +1385,6 @@ RootInlineBox* RenderParagraph::determineStartPosition(LineLayoutState& layoutSt
// If we encountered a new float and have inline children, mark ourself to force us to issue paint invalidations.
if (layoutState.hasInlineChild() && !selfNeedsLayout()) {
setNeedsLayoutAndFullPaintInvalidation(MarkOnlyThis);
- setShouldDoFullPaintInvalidation(true);
}
// FIXME: This should just call deleteLineBoxTree, but that causes
« no previous file with comments | « sky/engine/core/rendering/RenderObject.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698