(CANCELED) Fix TextAutosizer not to scheduleRelayout()

third_party/WebKit/Source/core/layout/LayoutTable.cpp

 /*
  * Copyright (C) 1997 Martin Jones (mjones@kde.org)
  *           (C) 1997 Torben Weis (weis@kde.org)
  *           (C) 1998 Waldo Bastian (bastian@kde.org)
  *           (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 400 matching lines @@
         section->computeOverflowFromCells();
         section->updateLayerTransformAfterLayout();
         section->addVisualEffectOverflow();
     }
 }
 
 void LayoutTable::layout()
 {
     ASSERT(needsLayout());
     LayoutAnalyzer::Scope analyzer(*this);
+    SubtreeLayoutScope layouter(*this);
 
-    if (simplifiedLayout())
+    if (simplifiedLayout(&layouter))
         return;
 
     // Note: LayoutTable is handled differently than other LayoutBlocks and the LayoutScope
     //       must be created before the table begins laying out.
-    TextAutosizer::LayoutScope textAutosizerLayoutScope(this);
+    TextAutosizer::LayoutScope textAutosizerLayoutScope(this, &layouter);
 
     recalcSectionsIfNeeded();
     // FIXME: We should do this recalc lazily in borderStart/borderEnd so that we don't have to make sure
     // to call this before we call borderStart/borderEnd to avoid getting a stale value.
     recalcBordersInRowDirection();
 
-    SubtreeLayoutScope layouter(*this);
-
     // If any table section moved vertically, we will just issue paint invalidations for everything from that
     // section down (it is quite unlikely that any of the following sections
     // did not shift).
     bool sectionMoved = false;
     {
         LayoutState state(*this, locationOffset());
         LayoutUnit oldLogicalWidth = logicalWidth();
         LayoutUnit oldLogicalHeight = logicalHeight();
 
         setLogicalHeight(LayoutUnit());
@@ skipping 1015 matching lines @@
 
 LayoutUnit LayoutTable::paddingRight() const
 {
     if (collapseBorders())
         return LayoutUnit();
 
     return LayoutBlock::paddingRight();
 }
 
 } // namespace blink