[FastTextAutosizer] Refactor FTA::inflate() to be internal to FTA

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 65 matching lines @@
 void FastTextAutosizer::beginLayout(RenderBlock* block)
 {
     if (!enabled())
         return;
 
     if (block->isRenderView())
         prepareRenderViewInfo(toRenderView(block));
 
     if (shouldBeClusterRoot(block))
         m_clusterStack.append(getOrCreateCluster(block));
+
+    if (block->childrenInline())

[skobes, 2014/01/15 01:12:20]

Can a block return true for childrenInline() but have RenderBlock objects
beneath it (maybe with display:inline-block or something like that)?

If so we should make sure inflate doesn't descend into RenderBlocks.

[pdr., 2014/01/15 07:08:54]

Excellent catch, I found childrenInline() does not imply that the block has no
block children!

I've filed crbug.com/334549 to fix this.

+        inflate(block);
+}
+
+void FastTextAutosizer::endLayout(RenderBlock* block)
+{
+    if (!enabled())
+        return;
+
+    if (!m_clusterStack.isEmpty() && m_clusterStack.last()->m_root == block)
+        m_clusterStack.removeLast();
 }
 
 void FastTextAutosizer::inflate(RenderBlock* block)
 {
     if (m_clusterStack.isEmpty())
         return;
     Cluster* cluster = m_clusterStack.last();
 
     // localMultiplier is used to prevent inflation of some containers such as a row of links.
     float localMultiplier = TextAutosizer::containerShouldBeAutosized(block) ? cluster->m_multiplier : 1;
 
-    // FIXME: Add an optimization to not do this walk if it's not needed.
     for (InlineWalker walker(block); !walker.atEnd(); walker.advance()) {
         RenderObject* inlineObj = walker.current();
         if (inlineObj->isText()) {
             applyMultiplier(inlineObj, localMultiplier);
             applyMultiplier(inlineObj->parent(), localMultiplier); // Parent handles line spacing.
         }
     }
 }
 
-void FastTextAutosizer::endLayout(RenderBlock* block)
-{
-    if (!enabled())
-        return;
-
-    if (!m_clusterStack.isEmpty() && m_clusterStack.last()->m_root == block)
-        m_clusterStack.removeLast();
-}
-
 bool FastTextAutosizer::enabled()
 {
     return m_document->settings()
         && m_document->settings()->textAutosizingEnabled()
         && !m_document->printing()
         && m_document->page();
 }
 
 void FastTextAutosizer::prepareRenderViewInfo(RenderView* renderView)
 {
@@ skipping 150 matching lines @@
 {
     return m_fingerprints.get(block);
 }
 
 FastTextAutosizer::BlockSet& FastTextAutosizer::FingerprintMapper::getBlocks(AtomicString fingerprint)
 {
     return *m_blocksForFingerprint.get(fingerprint);
 }
 
 } // namespace WebCore