1 files changed, 31 insertions, 38 deletions
diff --git a/chromium/third_party/blink/renderer/core/layout/ng/ng_column_layout_algorithm_test.cc b/chromium/third_party/blink/renderer/core/layout/ng/ng_column_layout_algorithm_test.cc
index f1dea0c48ca..f8f45dee232 100644
--- a/chromium/third_party/blink/renderer/core/layout/ng/ng_column_layout_algorithm_test.cc
+++ b/chromium/third_party/blink/renderer/core/layout/ng/ng_column_layout_algorithm_test.cc
@@ -21,11 +21,6 @@ class NGColumnLayoutAlgorithmTest
   NGColumnLayoutAlgorithmTest()
       : ScopedLayoutNGBlockFragmentationForTest(true) {}
 
-  void SetUp() override {
-    NGBaseLayoutAlgorithmTest::SetUp();
-    style_ = ComputedStyle::Create();
-  }
-
   scoped_refptr<const NGPhysicalBoxFragment> RunBlockLayoutAlgorithm(
       Element* element) {
     NGBlockNode container(element->GetLayoutBox());
@@ -48,8 +43,6 @@ class NGColumnLayoutAlgorithmTest
     auto fragment = RunBlockLayoutAlgorithm(element);
     return DumpFragmentTree(fragment.get());
   }
-
-  scoped_refptr<ComputedStyle> style_;
 };
 
 TEST_F(NGColumnLayoutAlgorithmTest, EmptyMulticol) {
@@ -367,7 +360,7 @@ TEST_F(NGColumnLayoutAlgorithmTest, ZeroHeight) {
   String expectation = R"DUMP(.:: LayoutNG Physical Fragment Tree ::.
   offset:unplaced size:1000x0
     offset:0,0 size:320x0
-      offset:0,0 size:100x1
+      offset:0,0 size:100x0
 )DUMP";
   EXPECT_EQ(expectation, dump);
 }
@@ -394,15 +387,15 @@ TEST_F(NGColumnLayoutAlgorithmTest, ZeroHeightWithContent) {
   String expectation = R"DUMP(.:: LayoutNG Physical Fragment Tree ::.
   offset:unplaced size:1000x0
     offset:0,0 size:320x0
-      offset:0,0 size:100x1
+      offset:0,0 size:100x0
         offset:0,0 size:20x1
-      offset:110,0 size:100x1
+      offset:110,0 size:100x0
         offset:0,0 size:20x1
-      offset:220,0 size:100x1
+      offset:220,0 size:100x0
         offset:0,0 size:20x1
-      offset:330,0 size:100x1
+      offset:330,0 size:100x0
         offset:0,0 size:20x1
-      offset:440,0 size:100x1
+      offset:440,0 size:100x0
         offset:0,0 size:20x1
 )DUMP";
   EXPECT_EQ(expectation, dump);
@@ -3049,7 +3042,7 @@ TEST_F(NGColumnLayoutAlgorithmTest, ColumnBalancingEmpty) {
   String expectation = R"DUMP(.:: LayoutNG Physical Fragment Tree ::.
   offset:unplaced size:1000x0
     offset:0,0 size:320x0
-      offset:0,0 size:100x1
+      offset:0,0 size:100x0
 )DUMP";
   EXPECT_EQ(expectation, dump);
 }
@@ -3074,7 +3067,7 @@ TEST_F(NGColumnLayoutAlgorithmTest, ColumnBalancingEmptyBlock) {
   String expectation = R"DUMP(.:: LayoutNG Physical Fragment Tree ::.
   offset:unplaced size:1000x0
     offset:0,0 size:320x0
-      offset:0,0 size:100x1
+      offset:0,0 size:100x0
         offset:0,0 size:20x0
 )DUMP";
   EXPECT_EQ(expectation, dump);
@@ -3165,7 +3158,7 @@ TEST_F(NGColumnLayoutAlgorithmTest, ColumnBalancingSingleLineInNestedSpanner) {
     offset:0,0 size:320x20
       offset:0,0 size:100x20
         offset:0,0 size:100x20
-          offset:0,0 size:50x1
+          offset:0,0 size:50x0
           offset:0,0 size:100x20
             offset:0,0 size:0x20
 )DUMP";
@@ -4223,7 +4216,7 @@ TEST_F(NGColumnLayoutAlgorithmTest, NestedZeroHeightAtOuterBoundary) {
       offset:0,0 size:100x100
         offset:0,0 size:11x100
         offset:0,100 size:100x0
-          offset:0,0 size:45x1
+          offset:0,0 size:45x0
             offset:0,0 size:22x0
 )DUMP";
   EXPECT_EQ(expectation, dump);
@@ -4317,7 +4310,7 @@ TEST_F(NGColumnLayoutAlgorithmTest, NestedWithTallSpanner) {
     offset:0,0 size:320x100
       offset:0,0 size:100x100
         offset:0,0 size:100x100
-          offset:0,0 size:45x1
+          offset:0,0 size:45x0
           offset:0,0 size:22x100
       offset:110,0 size:100x100
         offset:0,0 size:100x35
@@ -4605,7 +4598,7 @@ TEST_F(NGColumnLayoutAlgorithmTest, SpannerAtStart) {
   String expectation = R"DUMP(.:: LayoutNG Physical Fragment Tree ::.
   offset:unplaced size:1000x86
     offset:0,0 size:322x86
-      offset:1,1 size:100x1
+      offset:1,1 size:100x0
       offset:1,1 size:320x44
       offset:1,45 size:100x40
         offset:0,0 size:100x20
@@ -4680,7 +4673,7 @@ TEST_F(NGColumnLayoutAlgorithmTest, SpannerAlone) {
   String expectation = R"DUMP(.:: LayoutNG Physical Fragment Tree ::.
   offset:unplaced size:1000x46
     offset:0,0 size:322x46
-      offset:1,1 size:100x1
+      offset:1,1 size:100x0
       offset:1,1 size:320x44
 )DUMP";
   EXPECT_EQ(expectation, dump);
@@ -4712,10 +4705,10 @@ TEST_F(NGColumnLayoutAlgorithmTest, SpannerInBlock) {
   String expectation = R"DUMP(.:: LayoutNG Physical Fragment Tree ::.
   offset:unplaced size:1000x46
     offset:0,0 size:322x46
-      offset:1,1 size:100x1
+      offset:1,1 size:100x0
         offset:0,0 size:11x0
       offset:1,1 size:320x44
-      offset:1,45 size:100x1
+      offset:1,45 size:100x0
         offset:0,0 size:11x0
 )DUMP";
   EXPECT_EQ(expectation, dump);
@@ -4749,7 +4742,7 @@ TEST_F(NGColumnLayoutAlgorithmTest, SpannerWithSiblingsInBlock) {
   String expectation = R"DUMP(.:: LayoutNG Physical Fragment Tree ::.
   offset:unplaced size:1000x86
     offset:0,0 size:322x86
-      offset:1,1 size:100x1
+      offset:1,1 size:100x0
         offset:0,0 size:11x0
       offset:1,1 size:320x44
       offset:1,45 size:100x40
@@ -4792,7 +4785,7 @@ TEST_F(NGColumnLayoutAlgorithmTest, SpannerInBlockWithSiblings) {
   String expectation = R"DUMP(.:: LayoutNG Physical Fragment Tree ::.
   offset:unplaced size:1000x86
     offset:0,0 size:322x86
-      offset:1,1 size:100x1
+      offset:1,1 size:100x0
         offset:0,0 size:11x0
       offset:1,1 size:320x44
       offset:1,45 size:100x40
@@ -4831,7 +4824,7 @@ TEST_F(NGColumnLayoutAlgorithmTest, SpannerMargins) {
   String expectation = R"DUMP(.:: LayoutNG Physical Fragment Tree ::.
   offset:unplaced size:1000x130
     offset:0,0 size:320x130
-      offset:0,0 size:100x1
+      offset:0,0 size:100x0
       offset:10,10 size:33x10
       offset:0,30 size:100x20
         offset:0,0 size:100x20
@@ -4868,7 +4861,7 @@ TEST_F(NGColumnLayoutAlgorithmTest, SpannerMarginsRtl) {
   String expectation = R"DUMP(.:: LayoutNG Physical Fragment Tree ::.
   offset:unplaced size:1000x130
     offset:0,0 size:320x130
-      offset:220,0 size:100x1
+      offset:220,0 size:100x0
       offset:277,10 size:33x10
       offset:220,30 size:100x20
         offset:0,0 size:100x20
@@ -4987,7 +4980,7 @@ TEST_F(NGColumnLayoutAlgorithmTest, BreakInsideSpannerWithMargins) {
     offset:0,0 size:320x100
       offset:0,0 size:100x100
         offset:0,0 size:100x100
-          offset:0,0 size:50x1
+          offset:0,0 size:50x0
           offset:0,10 size:33x90
       offset:110,0 size:100x100
         offset:0,0 size:100x40
@@ -5213,7 +5206,7 @@ TEST_F(NGColumnLayoutAlgorithmTest, ForcedBreakBetweenSpanners) {
     offset:0,0 size:320x100
       offset:0,0 size:100x100
         offset:0,0 size:100x100
-          offset:0,0 size:50x1
+          offset:0,0 size:50x0
           offset:0,0 size:55x40
       offset:110,0 size:100x100
         offset:0,0 size:100x40
@@ -5246,7 +5239,7 @@ TEST_F(NGColumnLayoutAlgorithmTest, ForcedBreakBetweenSpanners2) {
     offset:0,0 size:320x100
       offset:0,0 size:100x100
         offset:0,0 size:100x100
-          offset:0,0 size:50x1
+          offset:0,0 size:50x0
           offset:0,0 size:55x40
       offset:110,0 size:100x100
         offset:0,0 size:100x40
@@ -5283,7 +5276,7 @@ TEST_F(NGColumnLayoutAlgorithmTest, ForcedBreakBetweenSpanners3) {
     offset:0,0 size:320x100
       offset:0,0 size:100x100
         offset:0,0 size:100x100
-          offset:0,0 size:50x1
+          offset:0,0 size:50x0
           offset:0,0 size:55x40
             offset:0,0 size:33x10
             offset:0,10 size:44x10
@@ -5322,7 +5315,7 @@ TEST_F(NGColumnLayoutAlgorithmTest, ForcedBreakBetweenSpanners4) {
     offset:0,0 size:320x100
       offset:0,0 size:100x100
         offset:0,0 size:100x100
-          offset:0,0 size:50x1
+          offset:0,0 size:50x0
           offset:0,0 size:55x40
       offset:110,0 size:100x100
         offset:0,0 size:100x40
@@ -5358,7 +5351,7 @@ TEST_F(NGColumnLayoutAlgorithmTest, ForcedBreakBetweenSpanners5) {
     offset:0,0 size:320x100
       offset:0,0 size:100x100
         offset:0,0 size:100x100
-          offset:0,0 size:50x1
+          offset:0,0 size:50x0
           offset:0,0 size:55x40
       offset:110,0 size:100x100
         offset:0,0 size:100x50
@@ -5392,7 +5385,7 @@ TEST_F(NGColumnLayoutAlgorithmTest, SoftBreakBetweenSpanners) {
     offset:0,0 size:320x100
       offset:0,0 size:100x100
         offset:0,0 size:100x100
-          offset:0,0 size:50x1
+          offset:0,0 size:50x0
           offset:0,0 size:55x60
       offset:110,0 size:100x100
         offset:0,0 size:100x60
@@ -5427,7 +5420,7 @@ TEST_F(NGColumnLayoutAlgorithmTest, SoftBreakBetweenSpanners2) {
     offset:0,0 size:320x100
       offset:0,0 size:100x100
         offset:0,0 size:100x100
-          offset:0,0 size:50x1
+          offset:0,0 size:50x0
           offset:0,0 size:55x60
       offset:110,0 size:100x100
         offset:0,0 size:100x60
@@ -5463,7 +5456,7 @@ TEST_F(NGColumnLayoutAlgorithmTest, AvoidSoftBreakBetweenSpanners) {
     offset:0,0 size:320x100
       offset:0,0 size:100x100
         offset:0,0 size:100x100
-          offset:0,0 size:50x1
+          offset:0,0 size:50x0
           offset:0,0 size:55x40
       offset:110,0 size:100x100
         offset:0,0 size:100x100
@@ -5504,7 +5497,7 @@ TEST_F(NGColumnLayoutAlgorithmTest, AvoidSoftBreakBetweenSpanners2) {
     offset:0,0 size:320x100
       offset:0,0 size:100x100
         offset:0,0 size:100x100
-          offset:0,0 size:50x1
+          offset:0,0 size:50x0
           offset:0,0 size:11x100
             offset:0,0 size:22x20
             offset:0,20 size:33x20
@@ -5554,7 +5547,7 @@ TEST_F(NGColumnLayoutAlgorithmTest, AvoidSoftBreakBetweenSpanners3) {
     offset:0,0 size:320x100
       offset:0,0 size:100x100
         offset:0,0 size:100x100
-          offset:0,0 size:50x1
+          offset:0,0 size:50x0
           offset:0,0 size:11x100
             offset:0,0 size:0x20
             offset:0,20 size:0x20
@@ -5645,7 +5638,7 @@ TEST_F(NGColumnLayoutAlgorithmTest, SpannerAsMulticol) {
     offset:0,0 size:320x50
       offset:0,0 size:100x50
         offset:0,0 size:100x50
-          offset:0,0 size:45x1
+          offset:0,0 size:45x0
           offset:0,0 size:100x50
             offset:0,0 size:45x50
               offset:0,0 size:131x20