Deprecate the currently used NGMarginStrut in favor of the new one.

third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm_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_block_layout_algorithm.h"
 
 #include "core/layout/ng/ng_block_node.h"
 #include "core/layout/ng/ng_constraint_space.h"
 #include "core/layout/ng/ng_constraint_space_builder.h"
 #include "core/layout/ng/ng_length_utils.h"
@@ skipping 191 matching lines @@
               NGLogicalSize(LayoutUnit(100), NGSizeIndefinite))
           .SetTextDirection(TextDirection::kLtr)
           .SetIsNewFormattingContext(true)
           .ToConstraintSpace();
   NGPhysicalBoxFragment* frag = RunBlockLayoutAlgorithm(space, div1);
 
   EXPECT_TRUE(frag->MarginStrut().IsEmpty());
   ASSERT_EQ(frag->Children().size(), 1UL);
   const NGPhysicalBoxFragment* div2_fragment =
       static_cast<const NGPhysicalBoxFragment*>(frag->Children()[0].get());
-  EXPECT_EQ(NGMarginStrut({LayoutUnit(kDiv2MarginTop)}),
+  EXPECT_EQ(NGDeprecatedMarginStrut({LayoutUnit(kDiv2MarginTop)}),
             div2_fragment->MarginStrut());
   EXPECT_EQ(kDiv1MarginTop, div2_fragment->TopOffset());
 }
 
 // Verifies the collapsing margins case for the next pair:
 // - bottom margin of box and top margin of its next in-flow following sibling.
 //
 // Test case's HTML representation:
 // <div style="margin-bottom: 20px; height: 50px;">  <!-- DIV1 -->
 //    <div style="margin-bottom: -15px"></div>       <!-- DIV2 -->
@@ skipping 99 matching lines @@
   NGBlockNode* div2 = new NGBlockNode(div2_style.get());
 
   div1->SetFirstChild(div2);
 
   auto* space = ConstructConstraintSpace(
       kHorizontalTopBottom, TextDirection::kLtr,
       NGLogicalSize(LayoutUnit(100), NGSizeIndefinite));
   NGPhysicalBoxFragment* frag = RunBlockLayoutAlgorithm(space, div1);
 
   // Verify that margins are collapsed.
-  EXPECT_EQ(NGMarginStrut({LayoutUnit(0), LayoutUnit(kDiv2MarginBottom)}),
-            frag->MarginStrut());
+  EXPECT_EQ(
+      NGDeprecatedMarginStrut({LayoutUnit(0), LayoutUnit(kDiv2MarginBottom)}),
+      frag->MarginStrut());
 
   // Verify that margins are NOT collapsed.
   div1_style->setHeight(Length(kHeight, Fixed));
   frag = RunBlockLayoutAlgorithm(space, div1);
-  EXPECT_EQ(NGMarginStrut({LayoutUnit(0), LayoutUnit(kDiv1MarginBottom)}),
-            frag->MarginStrut());
+  EXPECT_EQ(
+      NGDeprecatedMarginStrut({LayoutUnit(0), LayoutUnit(kDiv1MarginBottom)}),
+      frag->MarginStrut());
 }
 
 // Verifies that 2 adjoining margins are not collapsed if there is padding or
 // border that separates them.
 //
 // Test case's HTML representation:
 // <div style="margin: 30px 0px; padding: 20px 0px;">    <!-- DIV1 -->
 //   <div style="margin: 200px 0px; height: 50px;"/>     <!-- DIV2 -->
 // </div>
 //
@@ skipping 22 matching lines @@
 
   div1->SetFirstChild(div2);
 
   auto* space = ConstructConstraintSpace(
       kHorizontalTopBottom, TextDirection::kLtr,
       NGLogicalSize(LayoutUnit(100), NGSizeIndefinite));
   NGPhysicalBoxFragment* frag = RunBlockLayoutAlgorithm(space, div1);
 
   // Verify that margins do NOT collapse.
   frag = RunBlockLayoutAlgorithm(space, div1);
-  EXPECT_EQ(NGMarginStrut({LayoutUnit(kDiv1Margin), LayoutUnit(kDiv1Margin)}),
+  EXPECT_EQ(NGDeprecatedMarginStrut(
+                {LayoutUnit(kDiv1Margin), LayoutUnit(kDiv1Margin)}),
             frag->MarginStrut());
   ASSERT_EQ(frag->Children().size(), 1UL);
 
-  EXPECT_EQ(NGMarginStrut({LayoutUnit(kDiv2Margin), LayoutUnit(kDiv2Margin)}),
+  EXPECT_EQ(NGDeprecatedMarginStrut(
+                {LayoutUnit(kDiv2Margin), LayoutUnit(kDiv2Margin)}),
             static_cast<const NGPhysicalBoxFragment*>(frag->Children()[0].get())
                 ->MarginStrut());
 
   // Reset padding and verify that margins DO collapse.
   div1_style->setPaddingTop(Length(0, Fixed));
   div1_style->setPaddingBottom(Length(0, Fixed));
   frag = RunBlockLayoutAlgorithm(space, div1);
-  EXPECT_EQ(NGMarginStrut({LayoutUnit(kDiv2Margin), LayoutUnit(kDiv2Margin)}),
+  EXPECT_EQ(NGDeprecatedMarginStrut(
+                {LayoutUnit(kDiv2Margin), LayoutUnit(kDiv2Margin)}),
             frag->MarginStrut());
 }
 
 // Verifies that margins of 2 adjoining blocks with different writing modes
 // get collapsed.
 //
 // Test case's HTML representation:
 //   <div style="writing-mode: vertical-lr;">
 //     <div style="margin-right: 60px; width: 60px;">vertical</div>
 //     <div style="margin-left: 100px; writing-mode: horizontal-tb;">
@@ skipping 1153 matching lines @@
   EXPECT_EQ(LayoutUnit(194), fragment->LeftOffset());
   EXPECT_EQ(LayoutUnit(), fragment->TopOffset());
   EXPECT_EQ(LayoutUnit(16), fragment->Width());
   EXPECT_EQ(LayoutUnit(50), fragment->Height());
   EXPECT_EQ(0UL, fragment->Children().size());
   EXPECT_FALSE(iterator.NextChild());
 }
 
 }  // namespace
 }  // namespace blink