RubyNG: Introduce LayoutNGRubyText

This CL has no behavior changes because changes are behind a
runtime flag.

After this CL, fast/ruby/ tests won't crash with LayoutNGRuby flag.

Bug: 1069817
Change-Id: Ie9c1f3ce05e9e09838f8bf7c7c07e0288bdfa466
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2152132Reviewed-by: Yoshifumi Inoue <yosin@chromium.org>
Reviewed-by: Koji Ishii <kojii@chromium.org>
Commit-Queue: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#759911}

third_party/blink/renderer/core/html/html_rt_element.cc

@@ -6,17 +6,26 @@
 
 #include "third_party/blink/renderer/core/html_names.h"
 #include "third_party/blink/renderer/core/layout/layout_ruby_text.h"
+#include "third_party/blink/renderer/core/layout/ng/layout_ng_ruby_text.h"
 
 namespace blink {
 
 HTMLRTElement::HTMLRTElement(Document& document)
     : HTMLElement(html_names::kRtTag, document) {}
 
+bool HTMLRTElement::TypeShouldForceLegacyLayout() const {
+  return !RuntimeEnabledFeatures::LayoutNGRubyEnabled();
+}
+
 LayoutObject* HTMLRTElement::CreateLayoutObject(const ComputedStyle& style,
                                                 LegacyLayout legacy) {
   if (style.Display() == EDisplay::kBlock) {
-    UseCounter::Count(GetDocument(), WebFeature::kLegacyLayoutByRuby);
-    return new LayoutRubyText(this);
+    if (!RuntimeEnabledFeatures::LayoutNGRubyEnabled() ||
+        legacy == LegacyLayout::kForce) {
+      UseCounter::Count(GetDocument(), WebFeature::kLegacyLayoutByRuby);
+      return new LayoutRubyText(this);
+    }
+    return new LayoutNGRubyText(this);
   }
   return LayoutObject::CreateObject(this, style, legacy);
 }

third_party/blink/renderer/core/html/html_rt_element.h

@@ -17,7 +17,7 @@ class HTMLRTElement final : public HTMLElement {
 
  private:
   LayoutObject* CreateLayoutObject(const ComputedStyle&, LegacyLayout) override;
-  bool TypeShouldForceLegacyLayout() const final { return true; }
+  bool TypeShouldForceLegacyLayout() const final;
 };
 
 }  // namespace blink

third_party/blink/renderer/core/layout/BUILD.gn

@@ -408,6 +408,8 @@ blink_core_sources("layout") {
     "ng/layout_ng_ruby_base.h",
     "ng/layout_ng_ruby_run.cc",
     "ng/layout_ng_ruby_run.h",
+    "ng/layout_ng_ruby_text.cc",
+    "ng/layout_ng_ruby_text.h",
     "ng/layout_ng_table_caption.cc",
     "ng/layout_ng_table_caption.h",
     "ng/layout_ng_table_cell.cc",

third_party/blink/renderer/core/layout/layout_ruby_text.h

@@ -35,7 +35,7 @@
 
 namespace blink {
 
-class LayoutRubyText final : public LayoutBlockFlow {
+class LayoutRubyText : public LayoutBlockFlow {
  public:
   LayoutRubyText(Element*);
   ~LayoutRubyText() override;

third_party/blink/renderer/core/layout/ng/layout_ng_block_flow_mixin.cc

@@ -344,6 +344,7 @@ template class CORE_TEMPLATE_EXPORT LayoutNGBlockFlowMixin<LayoutProgress>;
 template class CORE_TEMPLATE_EXPORT LayoutNGBlockFlowMixin<LayoutRubyAsBlock>;
 template class CORE_TEMPLATE_EXPORT LayoutNGBlockFlowMixin<LayoutRubyBase>;
 template class CORE_TEMPLATE_EXPORT LayoutNGBlockFlowMixin<LayoutRubyRun>;
+template class CORE_TEMPLATE_EXPORT LayoutNGBlockFlowMixin<LayoutRubyText>;
 template class CORE_TEMPLATE_EXPORT LayoutNGBlockFlowMixin<LayoutTableCaption>;
 template class CORE_TEMPLATE_EXPORT LayoutNGBlockFlowMixin<LayoutTableCell>;
 

third_party/blink/renderer/core/layout/ng/layout_ng_block_flow_mixin.h

@@ -104,6 +104,8 @@ extern template class CORE_EXTERN_TEMPLATE_EXPORT
     LayoutNGBlockFlowMixin<LayoutRubyBase>;
 extern template class CORE_EXTERN_TEMPLATE_EXPORT
     LayoutNGBlockFlowMixin<LayoutRubyRun>;
+extern template class CORE_EXTERN_TEMPLATE_EXPORT
+    LayoutNGBlockFlowMixin<LayoutRubyText>;
 extern template class CORE_EXTERN_TEMPLATE_EXPORT
     LayoutNGBlockFlowMixin<LayoutTableCaption>;
 extern template class CORE_EXTERN_TEMPLATE_EXPORT

third_party/blink/renderer/core/layout/ng/layout_ng_mixin.cc

@@ -281,6 +281,7 @@ template class CORE_TEMPLATE_EXPORT LayoutNGMixin<LayoutProgress>;
 template class CORE_TEMPLATE_EXPORT LayoutNGMixin<LayoutRubyAsBlock>;
 template class CORE_TEMPLATE_EXPORT LayoutNGMixin<LayoutRubyBase>;
 template class CORE_TEMPLATE_EXPORT LayoutNGMixin<LayoutRubyRun>;
+template class CORE_TEMPLATE_EXPORT LayoutNGMixin<LayoutRubyText>;
 template class CORE_TEMPLATE_EXPORT LayoutNGMixin<LayoutTableCaption>;
 template class CORE_TEMPLATE_EXPORT LayoutNGMixin<LayoutTableCell>;
 

third_party/blink/renderer/core/layout/ng/layout_ng_mixin.h

@@ -13,6 +13,7 @@
 #include "third_party/blink/renderer/core/layout/layout_ruby.h"
 #include "third_party/blink/renderer/core/layout/layout_ruby_base.h"
 #include "third_party/blink/renderer/core/layout/layout_ruby_run.h"
+#include "third_party/blink/renderer/core/layout/layout_ruby_text.h"
 #include "third_party/blink/renderer/core/layout/layout_table_caption.h"
 #include "third_party/blink/renderer/core/layout/layout_table_cell.h"
 
@@ -55,6 +56,7 @@ extern template class CORE_EXTERN_TEMPLATE_EXPORT
     LayoutNGMixin<LayoutRubyAsBlock>;
 extern template class CORE_EXTERN_TEMPLATE_EXPORT LayoutNGMixin<LayoutRubyBase>;
 extern template class CORE_EXTERN_TEMPLATE_EXPORT LayoutNGMixin<LayoutRubyRun>;
+extern template class CORE_EXTERN_TEMPLATE_EXPORT LayoutNGMixin<LayoutRubyText>;
 extern template class CORE_EXTERN_TEMPLATE_EXPORT
     LayoutNGMixin<LayoutTableCaption>;
 extern template class CORE_EXTERN_TEMPLATE_EXPORT

third_party/blink/renderer/core/layout/ng/layout_ng_ruby_text.cc

+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "third_party/blink/renderer/core/layout/ng/layout_ng_ruby_text.h"
+
+namespace blink {
+
+LayoutNGRubyText::LayoutNGRubyText(Element* element)
+    : LayoutNGBlockFlowMixin<LayoutRubyText>(element) {}
+
+LayoutNGRubyText::~LayoutNGRubyText() = default;
+
+void LayoutNGRubyText::UpdateBlockLayout(bool relayout_children) {
+  UpdateNGBlockLayout();
+}
+
+}  // namespace blink

third_party/blink/renderer/core/layout/ng/layout_ng_ruby_text.h

+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_LAYOUT_NG_LAYOUT_NG_RUBY_TEXT_H_
+#define THIRD_PARTY_BLINK_RENDERER_CORE_LAYOUT_NG_LAYOUT_NG_RUBY_TEXT_H_
+
+#include "third_party/blink/renderer/core/core_export.h"
+#include "third_party/blink/renderer/core/layout/layout_ruby_text.h"
+#include "third_party/blink/renderer/core/layout/ng/layout_ng_block_flow_mixin.h"
+
+namespace blink {
+
+// A LayoutNG version of LayoutRubyText.
+class CORE_EXPORT LayoutNGRubyText final
+    : public LayoutNGBlockFlowMixin<LayoutRubyText> {
+ public:
+  explicit LayoutNGRubyText(Element* element);
+  ~LayoutNGRubyText() override;
+
+  const char* GetName() const override { return "LayoutNGRubyText"; }
+  void UpdateBlockLayout(bool relayout_children) override;
+};
+
+}  // namespace blink
+
+#endif  // THIRD_PARTY_BLINK_RENDERER_CORE_LAYOUT_NG_LAYOUT_NG_RUBY_TEXT_H_