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

Unified Diff: third_party/WebKit/Source/core/layout/svg/LayoutSVGText.cpp

Issue 1933413002: Minor tweaks to m_needsReordering in LayoutSVGText::layout (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 | « no previous file | 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/svg/LayoutSVGText.cpp
diff --git a/third_party/WebKit/Source/core/layout/svg/LayoutSVGText.cpp b/third_party/WebKit/Source/core/layout/svg/LayoutSVGText.cpp
index 723159ade3e17cac481505a825598b2755bc6ea1..21ba55caf809ef2d45f3d078bed77e16550067e7 100644
--- a/third_party/WebKit/Source/core/layout/svg/LayoutSVGText.cpp
+++ b/third_party/WebKit/Source/core/layout/svg/LayoutSVGText.cpp
@@ -184,6 +184,8 @@ static inline void checkLayoutAttributesConsistency(LayoutSVGText* text, Vector<
void LayoutSVGText::layout()
{
ASSERT(needsLayout());
+ // This flag is set and reset as needed only within this function.
+ ASSERT(!m_needsReordering);
LayoutAnalyzer::Scope analyzer(*this);
bool updateParentBoundaries = false;
@@ -193,9 +195,6 @@ void LayoutSVGText::layout()
updateParentBoundaries = true;
}
- // This flag is set and reset as needed only within this function.
- ASSERT(!m_needsReordering);
-
// When laying out initially, build the character data map and propagate
// resulting layout attributes to all LayoutSVGInlineText children in the
// subtree.
@@ -256,8 +255,7 @@ void LayoutSVGText::layout()
LayoutUnit paintInvalidationLogicalBottom;
layoutInlineChildren(true, paintInvalidationLogicalTop, paintInvalidationLogicalBottom, afterEdge);
- if (m_needsReordering)
- m_needsReordering = false;
+ m_needsReordering = false;
// If we don't have any line boxes, then make sure the frame rect is still cleared.
if (!firstLineBox())
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698