(CANCELED) Fix TextAutosizer not to scheduleRelayout()

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 220 matching lines @@
         ASSERT(!m_needsPositioningValuesUpdate);
         m_needsTextMetricsUpdate = false;
         updateCachedBoundariesInParents = true;
     }
 
     checkLayoutAttributesConsistency(this, m_layoutAttributes);
 
     // Reduced version of LayoutBlock::layoutBlock(), which only takes care of SVG text.
     // All if branches that could cause early exit in LayoutBlocks layoutBlock() method are turned into assertions.
     ASSERT(!isInline());
-    ASSERT(!simplifiedLayout());
+    ASSERT(!simplifiedLayout(nullptr));

[cbiesinger, 2016/04/15 17:08:08]

I don't really know much about SVG but this seems weird?

[kojii, 2016/04/15 17:58:44]

By "weird" do you mean the original code is weird or the change is weird?

I don't know much either, but LayoutSVGText does its layout by its own, using
platform/fonts and shaper directly, without using most of functions in
LayoutText, LineBreaker, etc.

As far as I debugged a few cases, all following 4 bits are false, so
simplifiedLayout() returns false immediately.
normalChildNeedsLayout()
posChildNeedsLayout()
needsSimplifiedNormalFlowLayout()
needsPositionedMovementLayout()

So if it's asserting that, use null SubtreeLayoutScope looks fine to me.

Can you elaborate a bit more?

     ASSERT(!scrollsOverflow());
     ASSERT(!hasControlClip());
     ASSERT(!positionedObjects());
     ASSERT(!isAnonymousBlock());
 
     if (!firstChild())
         setChildrenInline(true);
 
     // FIXME: We need to find a way to only layout the child boxes, if needed.
     FloatRect oldBoundaries = objectBoundingBox();
@@ skipping 165 matching lines @@
         paintInvalidationState.pushDelayedPaintInvalidationTarget(*this);
 
     if (reason == PaintInvalidationSVGResourceChange)
         newPaintInvalidationState.setForceSubtreeInvalidationWithinContainer();
 
     newPaintInvalidationState.updateForChildren();
     invalidatePaintOfSubtreesIfNeeded(newPaintInvalidationState);
 }
 
 } // namespace blink