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

Unified Diff: third_party/WebKit/Source/core/layout/TextAutosizer.cpp

Issue 1934233002: Cleanup partial changes to prevent scheduleRelayout() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | « third_party/WebKit/Source/core/layout/TextAutosizer.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/layout/TextAutosizer.cpp
diff --git a/third_party/WebKit/Source/core/layout/TextAutosizer.cpp b/third_party/WebKit/Source/core/layout/TextAutosizer.cpp
index a1477fcf3495f3c8524730ad2c98e2bb4d15353a..bd8e1ee147a2bd9a11d6b1d022f9c2f0bd27949e 100644
--- a/third_party/WebKit/Source/core/layout/TextAutosizer.cpp
+++ b/third_party/WebKit/Source/core/layout/TextAutosizer.cpp
@@ -398,8 +398,6 @@ void TextAutosizer::inflateAutoTable(LayoutTable* table)
if (!cell->needsLayout())
continue;
- // TODO(kojii): Callers should pass SubtreeLayoutScope to give
- // to beginLayout/inflate.
beginLayout(cell, nullptr);
inflate(cell, nullptr, DescendToInnerBlocks);
endLayout(cell);
@@ -993,10 +991,8 @@ void TextAutosizer::applyMultiplier(LayoutObject* layoutObject, float multiplier
m_stylesRetainedDuringLayout.append(&currentStyle);
layoutObject->setStyleInternal(style.release());
- // TODO(kojii): layouter should not be nullptr once all callers are
- // fixed to pass SubtreeLayoutScope.
DCHECK(!layouter || layoutObject->isDescendantOf(&layouter->root()));
- layoutObject->setNeedsLayoutAndFullPaintInvalidation(LayoutInvalidationReason::TextAutosizing, MarkContainerChainInLayout, layouter);
+ layoutObject->setNeedsLayoutAndFullPaintInvalidation(LayoutInvalidationReason::TextAutosizing, MarkContainerChain, layouter);
break;
case LayoutNeeded:
« no previous file with comments | « third_party/WebKit/Source/core/layout/TextAutosizer.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698