Descend into inner blocks for inflateAutoTable.

Source/core/rendering/FastTextAutosizer.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 397 matching lines @@
     // for column sizing.
     for (RenderObject* section = table->firstChild(); section; section = section->nextSibling()) {
         if (!section->isTableSection())
             continue;
         for (RenderTableRow* row = toRenderTableSection(section)->firstRow(); row; row = row->nextRow()) {
             for (RenderTableCell* cell = row->firstCell(); cell; cell = cell->nextCell()) {
                 if (!cell->needsLayout())
                     continue;
 
                 beginLayout(cell);
-                inflate(cell);
+                inflate(cell, DescendToInnerBlocks);
                 endLayout(cell);
             }
         }
     }
 }
 
 void FastTextAutosizer::endLayout(RenderBlock* block)
 {
     ASSERT(shouldHandleLayout());
 
     if (block == m_firstBlockToBeginLayout) {
         m_firstBlockToBeginLayout = 0;
         m_clusterStack.clear();
         m_superclusters.clear();
         m_stylesRetainedDuringLayout.clear();
 #ifndef NDEBUG
         m_blocksThatHaveBegunLayout.clear();
 #endif
     // Tables can create two layout scopes for the same block so the isEmpty
     // check below is needed to guard against endLayout being called twice.
     } else if (!m_clusterStack.isEmpty() && currentCluster()->m_root == block) {
         m_clusterStack.removeLast();
     }
 }
 
-float FastTextAutosizer::inflate(RenderObject* parent, float multiplier)
+float FastTextAutosizer::inflate(RenderObject* parent, InflateBehavior behavior, float multiplier)
 {
     Cluster* cluster = currentCluster();
     bool hasTextChild = false;
 
     RenderObject* child = 0;
-    if (parent->isRenderBlock() && parent->childrenInline())
+    if (parent->isRenderBlock() && (parent->childrenInline() || behavior == DescendToInnerBlocks))
         child = toRenderBlock(parent)->firstChild();
     else if (parent->isRenderInline())
         child = toRenderInline(parent)->firstChild();
 
     while (child) {
         if (child->isText()) {
             hasTextChild = true;
             // We only calculate this multiplier on-demand to ensure the parent block of this text
             // has entered layout.
             if (!multiplier)
                 multiplier = cluster->m_flags & SUPPRESSING ? 1.0f : clusterMultiplier(cluster);
             applyMultiplier(child, multiplier);
             // FIXME: Investigate why MarkOnlyThis is sufficient.
             if (parent->isRenderInline())
                 child->setPreferredLogicalWidthsDirty(MarkOnlyThis);
         } else if (child->isRenderInline()) {
-            multiplier = inflate(child, multiplier);
+            multiplier = inflate(child, behavior, multiplier);
+        } else if (child->isRenderBlock() && behavior == DescendToInnerBlocks
+            && !classifyBlock(child, INDEPENDENT | EXPLICIT_WIDTH | SUPPRESSING)) {
+            multiplier = inflate(child, behavior, multiplier);

[pdr., 2014/06/10 03:42:10]

This can lead to an assert or incorrect values in multiplierFromBlock. When we
start inflating the multiplier will be 0 since it hasn't been calculated yet. If
we encounter a block with text, computing the multiplier can lead to an assert
because the block hasn't entered layout yet.

[skobes, 2014/06/10 17:22:51]

There is special logic in widthFromBlock to handle tables that haven't entered
layout yet.

         }
         child = child->nextSibling();
     }
 
     if (hasTextChild) {
         applyMultiplier(parent, multiplier); // Parent handles line spacing.
     } else if (!parent->isListItem()) {
         // For consistency, a block with no immediate text child should always have a
         // multiplier of 1 (except for list items which are handled in inflateListItem).
         applyMultiplier(parent, 1);
@@ skipping 644 matching lines @@
 FastTextAutosizer::DeferUpdatePageInfo::~DeferUpdatePageInfo()
 {
     if (FastTextAutosizer* textAutosizer = m_mainFrame->document()->fastTextAutosizer()) {
         ASSERT(textAutosizer->m_updatePageInfoDeferred);
         textAutosizer->m_updatePageInfoDeferred = false;
         textAutosizer->updatePageInfoInAllFrames();
     }
 }
 
 } // namespace WebCore