Minor tweaks to m_needsReordering in LayoutSVGText::layout

third_party/WebKit/Source/core/layout/svg/LayoutSVGText.cpp

 /*
  * Copyright (C) 2006 Apple Computer, Inc.
  * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org>
  * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz>
  * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2008 Rob Buis <buis@kde.org>
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) Research In Motion Limited 2010-2012. All rights reserved.
  * Copyright (C) 2012 Google Inc.
  *
@@ skipping 166 matching lines @@
 #if ENABLE(ASSERT)
     Vector<SVGTextLayoutAttributes*> newLayoutAttributes;
     collectLayoutAttributes(text, newLayoutAttributes);
     ASSERT(newLayoutAttributes == expectedLayoutAttributes);
 #endif
 }
 
 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;
     if (m_needsTransformUpdate) {
         m_localTransform = toSVGTextElement(node())->calculateAnimatedLocalTransform();
         m_needsTransformUpdate = false;
         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.
     if (!everHadLayout()) {
         m_needsPositioningValuesUpdate = true;
         m_needsTextMetricsUpdate = true;
     }
 
     // If the root layout size changed (eg. window size changes), or the screen
     // scale factor has changed, then recompute the on-screen font size. Since
@@ skipping 40 matching lines @@
 
     LayoutUnit beforeEdge = borderBefore() + paddingBefore();
     LayoutUnit afterEdge = borderAfter() + paddingAfter() + scrollbarLogicalHeight();
     setLogicalHeight(beforeEdge);
 
     LayoutState state(*this, locationOffset());
     LayoutUnit paintInvalidationLogicalTop;
     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())
         setFrameRect(LayoutRect());
 
     m_overflow.clear();
     addVisualEffectOverflow();
 
     if (!updateParentBoundaries)
         updateParentBoundaries = oldBoundaries != objectBoundingBox();
@@ skipping 144 matching lines @@
         paintInvalidationState.pushDelayedPaintInvalidationTarget(*this);
 
     if (reason == PaintInvalidationSVGResourceChange)
         newPaintInvalidationState.setForceSubtreeInvalidationWithinContainer();
 
     newPaintInvalidationState.updateForChildren();
     invalidatePaintOfSubtreesIfNeeded(newPaintInvalidationState);
 }
 
 } // namespace blink