[LayoutNG] Refactor NGInlineItemsBuilder

Refactor the NGInlineItemsBuilder class to make it easier to understand,
maintain, and use. Removes the is_svg_text_ field which changes behavior
of the append method and wasn't tested. Instead that logic is now in the
append method itself. Also renames methods for consistency. No CamelCase
for whitespace and newline to match other uses and the style enum value.

Bug: 636993
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_layout_tests_layout_ng
Change-Id: I40ca62c7b726720dda01bf61cc4191fba4c552a0
Reviewed-on: https://chromium-review.googlesource.com/972589
Commit-Queue: Koji Ishii <kojii@chromium.org>
Reviewed-by: Koji Ishii <kojii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#544630}

third_party/WebKit/Source/core/layout/ng/inline/ng_inline_items_builder.cc

@@ -156,23 +156,23 @@ void NGInlineItemsBuilderTemplate<OffsetMappingBuilder>::Append(
   last_auto_wrap_ = auto_wrap_;
   EWhiteSpace whitespace = style->WhiteSpace();
   auto_wrap_ = ComputedStyle::AutoWrap(whitespace);
+  bool is_svg_text = layout_object && layout_object->IsSVGInlineText();
 
   if (!ComputedStyle::CollapseWhiteSpace(whitespace))
-    AppendWithoutWhiteSpaceCollapsing(string, style, layout_object);
-  else if (ComputedStyle::PreserveNewline(whitespace) && !is_svgtext_)
-    AppendWithPreservingNewlines(string, style, layout_object);
+    AppendPreserveWhitespace(string, style, layout_object);
+  else if (ComputedStyle::PreserveNewline(whitespace) && !is_svg_text)
+    AppendPreserveNewline(string, style, layout_object);
   else
-    AppendWithWhiteSpaceCollapsing(string, 0, string.length(), style,
-                                   layout_object);
+    AppendCollapseWhitespace(string, 0, string.length(), style, layout_object);
 }
 
 template <typename OffsetMappingBuilder>
-void NGInlineItemsBuilderTemplate<OffsetMappingBuilder>::
-    AppendWithWhiteSpaceCollapsing(const String& string,
-                                   unsigned start,
-                                   unsigned end,
-                                   const ComputedStyle* style,
-                                   LayoutText* layout_object) {
+void NGInlineItemsBuilderTemplate<
+    OffsetMappingBuilder>::AppendCollapseWhitespace(const String& string,
+                                                    unsigned start,
+                                                    unsigned end,
+                                                    const ComputedStyle* style,
+                                                    LayoutText* layout_object) {
   DCHECK_GT(end, start);
 
   // Collapsed spaces are "zero advance width, invisible, but retains its soft
@@ -193,7 +193,7 @@ void NGInlineItemsBuilderTemplate<OffsetMappingBuilder>::
     if (c == kNewlineCharacter) {
       // LayoutBR does not set preserve_newline, but should be preserved.
       if (!i && end == 1 && layout_object && layout_object->IsBR()) {
-        AppendForcedBreak(style, layout_object);
+        AppendForcedBreakCollapseWhitespace(style, layout_object);
         return;
       }
 
@@ -245,17 +245,17 @@ void NGInlineItemsBuilderTemplate<OffsetMappingBuilder>::
 // Even when without whitespace collapsing, control characters (newlines and
 // tabs) are in their own control items to make the line breaker easier.
 template <typename OffsetMappingBuilder>
-void NGInlineItemsBuilderTemplate<OffsetMappingBuilder>::
-    AppendWithoutWhiteSpaceCollapsing(const String& string,
-                                      const ComputedStyle* style,
-                                      LayoutText* layout_object) {
+void NGInlineItemsBuilderTemplate<
+    OffsetMappingBuilder>::AppendPreserveWhitespace(const String& string,
+                                                    const ComputedStyle* style,
+                                                    LayoutText* layout_object) {
   for (unsigned start = 0; start < string.length();) {
     UChar c = string[start];
     if (IsControlItemCharacter(c)) {
       if (c != kNewlineCharacter)
         Append(NGInlineItem::kControl, c, style, layout_object);
       else
-        AppendForcedBreakWithoutWhiteSpaceCollapsing(style, layout_object);
+        AppendForcedBreak(style, layout_object);
       start++;
       continue;
     }
@@ -277,13 +277,13 @@ void NGInlineItemsBuilderTemplate<OffsetMappingBuilder>::
 }
 
 template <typename OffsetMappingBuilder>
-void NGInlineItemsBuilderTemplate<OffsetMappingBuilder>::
-    AppendWithPreservingNewlines(const String& string,
-                                 const ComputedStyle* style,
-                                 LayoutText* layout_object) {
+void NGInlineItemsBuilderTemplate<OffsetMappingBuilder>::AppendPreserveNewline(
+    const String& string,
+    const ComputedStyle* style,
+    LayoutText* layout_object) {
   for (unsigned start = 0; start < string.length();) {
     if (string[start] == kNewlineCharacter) {
-      AppendForcedBreak(style, layout_object);
+      AppendForcedBreakCollapseWhitespace(style, layout_object);
       start++;
       continue;
     }
@@ -291,15 +291,15 @@ void NGInlineItemsBuilderTemplate<OffsetMappingBuilder>::
     size_t end = string.find(kNewlineCharacter, start + 1);
     if (end == kNotFound)
       end = string.length();
-    AppendWithWhiteSpaceCollapsing(string, start, end, style, layout_object);
+    AppendCollapseWhitespace(string, start, end, style, layout_object);
     start = end;
   }
 }
 
 template <typename OffsetMappingBuilder>
-void NGInlineItemsBuilderTemplate<OffsetMappingBuilder>::
-    AppendForcedBreakWithoutWhiteSpaceCollapsing(const ComputedStyle* style,
-                                                 LayoutObject* layout_object) {
+void NGInlineItemsBuilderTemplate<OffsetMappingBuilder>::AppendForcedBreak(
+    const ComputedStyle* style,
+    LayoutObject* layout_object) {
   // At the forced break, add bidi controls to pop all contexts.
   // https://drafts.csswg.org/css-writing-modes-3/#bidi-embedding-breaks
   if (!bidi_context_.IsEmpty()) {
@@ -321,13 +321,13 @@ void NGInlineItemsBuilderTemplate<OffsetMappingBuilder>::
 }
 
 template <typename OffsetMappingBuilder>
-void NGInlineItemsBuilderTemplate<OffsetMappingBuilder>::AppendForcedBreak(
-    const ComputedStyle* style,
-    LayoutObject* layout_object) {
+void NGInlineItemsBuilderTemplate<OffsetMappingBuilder>::
+    AppendForcedBreakCollapseWhitespace(const ComputedStyle* style,
+                                        LayoutObject* layout_object) {
   // Remove collapsible spaces immediately before a preserved newline.
   RemoveTrailingCollapsibleSpaceIfExists();
 
-  AppendForcedBreakWithoutWhiteSpaceCollapsing(style, layout_object);
+  AppendForcedBreak(style, layout_object);
 
   // Remove collapsible spaces immediately after a preserved newline.
   last_collapsible_space_ = CollapsibleSpace::kSpace;
@@ -432,8 +432,9 @@ void NGInlineItemsBuilderTemplate<
       return;
     }
 
-    // AppendForcedBreak sets CollapsibleSpace::kSpace to ignore leading
-    // spaces. In this case, the trailing collapsible space does not exist.
+    // AppendForcedBreakCollapseWhitespace sets CollapsibleSpace::kSpace to
+    // ignore leading spaces. In this case, the trailing collapsible space does
+    // not exist.
     if (ch == kNewlineCharacter)
       return;
   }

third_party/WebKit/Source/core/layout/ng/inline/ng_inline_items_builder.h

@@ -47,8 +47,6 @@ class CORE_TEMPLATE_CLASS_EXPORT NGInlineItemsBuilderTemplate {
 
   String ToString();
 
-  void SetIsSVGText(bool value) { is_svgtext_ = value; }
-
   // Returns whether the items contain any Bidi controls.
   bool HasBidiControls() const { return has_bidi_controls_; }
 
@@ -125,7 +123,6 @@ class CORE_TEMPLATE_CLASS_EXPORT NGInlineItemsBuilderTemplate {
   CollapsibleSpace last_collapsible_space_ = CollapsibleSpace::kSpace;
   bool auto_wrap_ = true;
   bool last_auto_wrap_ = false;
-  bool is_svgtext_ = false;
   bool has_bidi_controls_ = false;
   bool is_empty_inline_ = true;
 
@@ -140,21 +137,18 @@ class CORE_TEMPLATE_CLASS_EXPORT NGInlineItemsBuilderTemplate {
               const ComputedStyle*,
               LayoutObject*);
 
-  void AppendWithWhiteSpaceCollapsing(const String&,
-                                      unsigned start,
-                                      unsigned end,
-                                      const ComputedStyle*,
-                                      LayoutText*);
-  void AppendWithoutWhiteSpaceCollapsing(const String&,
-                                         const ComputedStyle*,
-                                         LayoutText*);
-  void AppendWithPreservingNewlines(const String&,
-                                    const ComputedStyle*,
-                                    LayoutText*);
-
+  void AppendCollapseWhitespace(const String&,
+                                unsigned start,
+                                unsigned end,
+                                const ComputedStyle*,
+                                LayoutText*);
+  void AppendPreserveWhitespace(const String&,
+                                const ComputedStyle*,
+                                LayoutText*);
+  void AppendPreserveNewline(const String&, const ComputedStyle*, LayoutText*);
+
+  void AppendForcedBreakCollapseWhitespace(const ComputedStyle*, LayoutObject*);
   void AppendForcedBreak(const ComputedStyle*, LayoutObject*);
-  void AppendForcedBreakWithoutWhiteSpaceCollapsing(const ComputedStyle*,
-                                                    LayoutObject*);
 
   void RemoveTrailingCollapsibleSpaceIfExists();
   void RemoveTrailingCollapsibleSpace(unsigned);

third_party/WebKit/Source/core/layout/ng/inline/ng_inline_node.cc

@@ -76,9 +76,7 @@ void CollectInlinesInternal(
       if (UNLIKELY(layout_text->IsWordBreak())) {
         builder->AppendBreakOpportunity(node->Style(), layout_text);
       } else {
-        builder->SetIsSVGText(node->IsSVGInlineText());
-        const String& text = layout_text->GetText();
-        builder->Append(text, node->Style(), layout_text);
+        builder->Append(layout_text->GetText(), node->Style(), layout_text);
       }
       ClearNeedsLayoutIfUpdatingLayout<OffsetMappingBuilder>(layout_text);