[LayoutNG] Fix whitespace collapsing when a node is a newline

third_party/WebKit/Source/core/layout/ng/ng_layout_inline_items_builder_test.cc

 // Copyright 2016 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 "core/layout/ng/ng_layout_inline_items_builder.h"
 
 #include "core/layout/LayoutInline.h"
 #include "core/layout/ng/ng_inline_node.h"
 #include "core/style/ComputedStyle.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 79 matching lines @@
   String collapsed("text text text text");
   TestWhitespaceValue(collapsed, input, EWhiteSpace::kNormal);
   TestWhitespaceValue(collapsed, input, EWhiteSpace::kNowrap);
   TestWhitespaceValue(collapsed, input, EWhiteSpace::kWebkitNowrap);
   TestWhitespaceValue(collapsed, input, EWhiteSpace::kPreLine);
   TestWhitespaceValue(input, input, EWhiteSpace::kPre);
   TestWhitespaceValue(input, input, EWhiteSpace::kPreWrap);
 }
 
 TEST_F(NGLayoutInlineItemsBuilderTest, CollapseNewLines) {
-  String input("text\ntext \n text");
-  String collapsed("text text text");
+  String input("text\ntext \n text\n\ntext");
+  String collapsed("text text text text");
   TestWhitespaceValue(collapsed, input, EWhiteSpace::kNormal);
   TestWhitespaceValue(collapsed, input, EWhiteSpace::kNowrap);
-  TestWhitespaceValue("text\ntext\ntext", input, EWhiteSpace::kPreLine);
+  TestWhitespaceValue("text\ntext\ntext\n\ntext", input, EWhiteSpace::kPreLine);
   TestWhitespaceValue(input, input, EWhiteSpace::kPre);
   TestWhitespaceValue(input, input, EWhiteSpace::kPreWrap);
 }
 
+TEST_F(NGLayoutInlineItemsBuilderTest, CollapseNewlinesAsSpaces) {
+  EXPECT_EQ("text text", TestAppend("text\ntext"));
+  EXPECT_EQ("text text", TestAppend("text\n\ntext"));
+  EXPECT_EQ("text text", TestAppend("text \n\n text"));
+  EXPECT_EQ("text text", TestAppend("text \n \n text"));
+}
+
 TEST_F(NGLayoutInlineItemsBuilderTest, CollapseAcrossElements) {
   EXPECT_EQ("text text", TestAppend("text ", " text"))
       << "Spaces are collapsed even when across elements.";
 }
 
 TEST_F(NGLayoutInlineItemsBuilderTest, CollapseLeadingSpaces) {
   EXPECT_EQ("text", TestAppend("  text"));
   EXPECT_EQ("text", TestAppend(" ", "text"));
   EXPECT_EQ("text", TestAppend(" ", " text"));
 }
@@ skipping 49 matching lines @@
   NGLayoutInlineItemsBuilder builder(&items_);
   RefPtr<ComputedStyle> pre_wrap(CreateWhitespaceStyle(EWhiteSpace::kPreWrap));
   builder.Append("text ", pre_wrap.get());
   builder.Append(" text", style_.get());
   EXPECT_EQ("text  text", builder.ToString())
       << "The whitespace in constructions like '<span style=\"white-space: "
          "pre-wrap\">text <span><span> text</span>' does not collapse.";
 }
 
 TEST_F(NGLayoutInlineItemsBuilderTest, CollapseZeroWidthSpaces) {
-  EXPECT_EQ("text text", TestAppend("text\ntext"))
-      << "Newline is converted to a space.";
-
   EXPECT_EQ(String(u"text\u200Btext"), TestAppend(u"text\u200B\ntext"))
       << "Newline is removed if the character before is ZWS.";
   EXPECT_EQ(String(u"text\u200Btext"), TestAppend(u"text\n\u200Btext"))
       << "Newline is removed if the character after is ZWS.";
   EXPECT_EQ(String(u"text\u200B\u200Btext"),
             TestAppend(u"text\u200B\n\u200Btext"))
       << "Newline is removed if the character before/after is ZWS.";
 
   EXPECT_EQ(String(u"text\u200Btext"), TestAppend(u"text\n", u"\u200Btext"))
       << "Newline is removed if the character after across elements is ZWS.";
@@ skipping 26 matching lines @@
 }
 
 TEST_F(NGLayoutInlineItemsBuilderTest, CollapseAroundReplacedElement) {
   NGLayoutInlineItemsBuilder builder(&items_);
   builder.Append("Hello ", style_.get());
   builder.Append(objectReplacementCharacter);
   builder.Append(" World", style_.get());
   EXPECT_EQ(String(u"Hello \uFFFC World"), builder.ToString());
 }
 
-TEST_F(NGLayoutInlineItemsBuilderTest, AppendAsOpaqueToSpaceCollapsing) {
+TEST_F(NGLayoutInlineItemsBuilderTest, CollapseNewlineAfterObject) {
   NGLayoutInlineItemsBuilder builder(&items_);
-  builder.Append("Hello ", style_.get());
-  builder.AppendAsOpaqueToSpaceCollapsing(firstStrongIsolateCharacter);
-  builder.Append(" World", style_.get());
-  EXPECT_EQ(String(u"Hello \u2068World"), builder.ToString());
+  builder.Append(objectReplacementCharacter);
+  builder.Append("\n", style_.get());
+  builder.Append(objectReplacementCharacter);
+  EXPECT_EQ(String(u"\uFFFC \uFFFC"), builder.ToString());
+  EXPECT_EQ(3u, items_.size());
+  EXPECT_EQ(nullptr, items_[0].Style());
+  EXPECT_EQ(style_.get(), items_[1].Style());
+  EXPECT_EQ(nullptr, items_[2].Style());
 }
 
 TEST_F(NGLayoutInlineItemsBuilderTest, AppendEmptyString) {
   EXPECT_EQ("", TestAppend(""));
   EXPECT_EQ(0u, items_.size());
 }
 
 TEST_F(NGLayoutInlineItemsBuilderTest, Empty) {
   Vector<NGLayoutInlineItem> items;
   NGLayoutInlineItemsBuilder builder(&items);
@@ skipping 75 matching lines @@
                    u"\u2068\u202E"
                    u"\u05E2\u05D1\u05E8\u05D9\u05EA"
                    u"\u202C\u2069"
                    u" World"),
             builder.ToString());
 }
 
 }  // namespace
 
 }  // namespace blink