Fix not autosizing ruby elements issue.

third_party/WebKit/Source/core/layout/TextAutosizer.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 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/layout/TextAutosizer.h"
 
+#include <memory>

[mstensho (USE GERRIT), 2017/02/07 10:32:36]

Shouldn't have to move this up here.

[pdr., 2017/02/08 04:45:33]

I think it's okay, it seems to be the new clang formatter behavior:
https://groups.google.com/a/chromium.org/d/msg/chromium-dev/E_zrZQQCU3E/s2oAV...

[cathiechentx, 2017/02/08 07:07:41]

yes, "git cl format" did this:)

 #include "core/dom/Document.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/frame/VisualViewport.h"
 #include "core/html/HTMLTextAreaElement.h"
 #include "core/layout/LayoutBlock.h"
 #include "core/layout/LayoutInline.h"
 #include "core/layout/LayoutListItem.h"
 #include "core/layout/LayoutListMarker.h"
+#include "core/layout/LayoutRubyRun.h"
 #include "core/layout/LayoutTable.h"
 #include "core/layout/LayoutTableCell.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/api/LayoutAPIShim.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/page/Page.h"
 #include "wtf/PtrUtil.h"
-#include <memory>
 
 #ifdef AUTOSIZING_DOM_DEBUG_INFO
 #include "core/dom/ExecutionContextTask.h"
 #endif
 
 namespace blink {
 
 #ifdef AUTOSIZING_DOM_DEBUG_INFO
 class WriteDebugInfoTask : public ExecutionContextTask {
  public:
@@ skipping 331 matching lines @@
   }
 }
 
 void TextAutosizer::beginLayout(LayoutBlock* block,
                                 SubtreeLayoutScope* layouter) {
   ASSERT(shouldHandleLayout());
 
   if (prepareForLayout(block) == StopLayout)
     return;
 
+  // Skip ruby's inner blocks, cause these blocks already be inflated.

[mstensho (USE GERRIT), 2017/02/07 10:32:36]

"because these blocks are already inflated"?

[cathiechentx, 2017/02/08 07:07:41]

Done.

+  if (block->isRubyRun() || block->isRubyBase() || block->isRubyText())
+    return;
+
   ASSERT(!m_clusterStack.isEmpty() || block->isLayoutView());
 
   if (Cluster* cluster = maybeCreateCluster(block))
     m_clusterStack.push_back(WTF::wrapUnique(cluster));
 
   ASSERT(!m_clusterStack.isEmpty());
 
   // Cells in auto-layout tables are handled separately by inflateAutoTable.
   bool isAutoTableCell =
       block->isTableCell() &&
@@ skipping 50 matching lines @@
 }
 
 float TextAutosizer::inflate(LayoutObject* parent,
                              SubtreeLayoutScope* layouter,
                              InflateBehavior behavior,
                              float multiplier) {
   Cluster* cluster = currentCluster();
   bool hasTextChild = false;
 
   LayoutObject* child = nullptr;
-  if (parent->isLayoutBlock() &&
-      (parent->childrenInline() || behavior == DescendToInnerBlocks))
+  if (parent->isRuby()) {
+    // Skip layoutRubyRun which is inline-block.
+    // Inflate rubyRun's inner blocks.
+    if (parent->slowFirstChild() && parent->slowFirstChild()->isRubyRun()) {

[mstensho (USE GERRIT), 2017/02/07 10:32:36]

Might want to store parent->slowFirstChild() as a variable, instead of calling
it three times.

[cathiechentx, 2017/02/08 07:07:41]

Done.

+      child = toLayoutRubyRun(parent->slowFirstChild())->firstChild();
+      behavior = DescendToInnerBlocks;
+    }
+  } else if (parent->isLayoutBlock() &&
+             (parent->childrenInline() || behavior == DescendToInnerBlocks))

[pdr., 2017/02/08 04:45:33]

style nit: because curly braces were added for the first conditional, please add
curlies to the whole if-elseif-elseif chain:

if (parent->isRuby()) {
  ...
} else if (parent->isLayoutBlock() &&
       (parent->childrenInline() || behavior == DescendToInnerBlocks)) {
  child = toLayoutInline(parent)->firstChild();
} else if (parent->isLayoutInline()) {
  child = toLayoutInline(parent)->firstChild();
}

https://google.github.io/styleguide/cppguide.html#Conditionals

[cathiechentx, 2017/02/08 07:07:41]

Done.

     child = toLayoutBlock(parent)->firstChild();
   else if (parent->isLayoutInline())
     child = toLayoutInline(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)
@@ skipping 946 matching lines @@
     }
   }
   potentiallyInconsistentSuperclusters.clear();
 }
 
 DEFINE_TRACE(TextAutosizer) {
   visitor->trace(m_document);
 }
 
 }  // namespace blink