Reland of Use NGLogicalRect instead of NGExclusion for exclusions.

third_party/WebKit/Source/core/layout/ng/ng_constraint_space_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_constraint_space.h"
 
 #include "core/layout/ng/ng_constraint_space.h"
 #include "core/layout/ng/ng_layout_opportunity_iterator.h"
 #include "core/layout/ng/ng_physical_constraint_space.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 67 matching lines @@
 }
 
 TEST(NGConstraintSpaceTest, LayoutOpportunitiesTopRightExclusion) {
   NGPhysicalSize physical_size;
   physical_size.width = LayoutUnit(600);
   physical_size.height = LayoutUnit(400);
 
   // Create a space with a 100x100 exclusion in the top right corner.
   auto* space =
       ConstructConstraintSpace(HorizontalTopBottom, LeftToRight, physical_size);
-  space->AddExclusion(new NGExclusion(LayoutUnit(0), LayoutUnit(600),
-                                      LayoutUnit(100), LayoutUnit(500)));
+  NGLogicalRect exclusion;
+  exclusion.size = {/* inline_size */ LayoutUnit(100),
+                    /* block_size */ LayoutUnit(100)};
+  exclusion.offset = {/* inline_offset */ LayoutUnit(500),
+                      /* block_offset */ LayoutUnit(0)};
+  space->AddExclusion(exclusion);
 
   auto* iterator = space->LayoutOpportunities();
 
   // First opportunity should be to the left of the exclusion.
   EXPECT_EQ("0,0 500x400", OpportunityToString(iterator->Next()));
 
   // Second opportunity should be below the exclusion.
   EXPECT_EQ("0,100 600x300", OpportunityToString(iterator->Next()));
 
   // There should be no third opportunity.
   EXPECT_EQ("(empty)", OpportunityToString(iterator->Next()));
 }
 
 TEST(NGConstraintSpaceTest, LayoutOpportunitiesTopLeftExclusion) {
   NGPhysicalSize physical_size;
   physical_size.width = LayoutUnit(600);
   physical_size.height = LayoutUnit(400);
 
   // Create a space with a 100x100 exclusion in the top left corner.
   auto* space =
       ConstructConstraintSpace(HorizontalTopBottom, LeftToRight, physical_size);
-  space->AddExclusion(new NGExclusion(LayoutUnit(0), LayoutUnit(100),
-                                      LayoutUnit(100), LayoutUnit(0)));
+  NGLogicalRect exclusion;
+  exclusion.size = {/* inline_size */ LayoutUnit(100),
+                    /* block_size */ LayoutUnit(100)};
+  exclusion.offset = {/* inline_offset */ LayoutUnit(0),
+                      /* block_offset */ LayoutUnit(0)};
+  space->AddExclusion(exclusion);
 
   auto* iterator = space->LayoutOpportunities();
 
   // First opportunity should be to the right of the exclusion.
   EXPECT_EQ("100,0 500x400", OpportunityToString(iterator->Next()));
 
   // Second opportunity should be below the exclusion.
   EXPECT_EQ("0,100 600x300", OpportunityToString(iterator->Next()));
 
   // There should be no third opportunity.
@@ skipping 23 matching lines @@
 //   - 2nd Start Point: 250,0 350x350; 250,0 250x400
 //   - 3rd Start Point: 550,0 50x400
 //   - 4th Start Point: 0,300 600x50; 0,300 500x100
 TEST(NGConstraintSpaceTest, LayoutOpportunitiesTwoInMiddle) {
   NGPhysicalSize physical_size;
   physical_size.width = LayoutUnit(600);
   physical_size.height = LayoutUnit(400);
 
   auto* space =
       ConstructConstraintSpace(HorizontalTopBottom, LeftToRight, physical_size);
-
   // Add exclusions
-  space->AddExclusion(new NGExclusion(LayoutUnit(200), LayoutUnit(250),
-                                      LayoutUnit(300), LayoutUnit(150)));
-  space->AddExclusion(new NGExclusion(LayoutUnit(350), LayoutUnit(550),
-                                      LayoutUnit(400), LayoutUnit(500)));
+  NGLogicalRect exclusion1;
+  exclusion1.size = {/* inline_size */ LayoutUnit(100),
+                     /* block_size */ LayoutUnit(100)};
+  exclusion1.offset = {/* inline_offset */ LayoutUnit(150),
+                       /* block_offset */ LayoutUnit(200)};
+  space->AddExclusion(exclusion1);
+  NGLogicalRect exclusion2;
+  exclusion2.size = {/* inline_size */ LayoutUnit(50),
+                     /* block_size */ LayoutUnit(50)};
+  exclusion2.offset = {/* inline_offset */ LayoutUnit(500),
+                       /* block_offset */ LayoutUnit(350)};
+  space->AddExclusion(exclusion2);
 
   auto* iterator = space->LayoutOpportunities();
 
   // 1st Start point
   EXPECT_EQ("0,0 600x200", OpportunityToString(iterator->Next()));
   EXPECT_EQ("0,0 150x400", OpportunityToString(iterator->Next()));
 
   // 2nd Start point
   EXPECT_EQ("250,0 350x350", OpportunityToString(iterator->Next()));
   EXPECT_EQ("250,0 250x400", OpportunityToString(iterator->Next()));
@@ skipping 22 matching lines @@
 //   - 4th Start Point (0, 300): 600x50, 500x100
 //   All other opportunities that are located before the origin point should be
 //   filtered out.
 TEST(NGConstraintSpaceTest, LayoutOpportunitiesTwoInMiddleWithOrigin) {
   NGPhysicalSize physical_size;
   physical_size.width = LayoutUnit(600);
   physical_size.height = LayoutUnit(400);
 
   auto* space =
       ConstructConstraintSpace(HorizontalTopBottom, LeftToRight, physical_size);
-
   // Add exclusions
-  space->AddExclusion(new NGExclusion(LayoutUnit(200), LayoutUnit(250),
-                                      LayoutUnit(300), LayoutUnit(150)));
-  space->AddExclusion(new NGExclusion(LayoutUnit(350), LayoutUnit(550),
-                                      LayoutUnit(400), LayoutUnit(500)));
+  NGLogicalRect exclusion1;
+  exclusion1.size = {/* inline_size */ LayoutUnit(100),
+                     /* block_size */ LayoutUnit(100)};
+  exclusion1.offset = {/* inline_offset */ LayoutUnit(150),
+                       /* block_offset */ LayoutUnit(200)};
+  space->AddExclusion(exclusion1);
+  NGLogicalRect exclusion2;
+  exclusion2.size = {/* inline_size */ LayoutUnit(50),
+                     /* block_size */ LayoutUnit(50)};
+  exclusion2.offset = {/* inline_offset */ LayoutUnit(500),
+                       /* block_offset */ LayoutUnit(350)};
+  space->AddExclusion(exclusion2);
 
   const NGLogicalOffset origin_point = {LayoutUnit(0), LayoutUnit(200)};
   auto* iterator = new NGLayoutOpportunityIterator(space, origin_point);
 
   // 1st Start Point
   EXPECT_EQ("0,200 150x200", OpportunityToString(iterator->Next()));
 
   // 2nd Start Point
   EXPECT_EQ("250,200 350x150", OpportunityToString(iterator->Next()));
   EXPECT_EQ("250,200 250x200", OpportunityToString(iterator->Next()));
@@ skipping 24 matching lines @@
 // Expected:
 //   Layout opportunity iterator generates only one opportunity that equals to
 //   available constraint space, i.e. 0,0 600x200
 TEST(NGConstraintSpaceTest, LayoutOpportunitiesWithOutOfBoundsExclusions) {
   NGPhysicalSize physical_size;
   physical_size.width = LayoutUnit(600);
   physical_size.height = LayoutUnit(100);
 
   auto* space =
       ConstructConstraintSpace(HorizontalTopBottom, LeftToRight, physical_size);
-  space->AddExclusion(new NGExclusion(LayoutUnit(150), LayoutUnit(100),
-                                      LayoutUnit(200), LayoutUnit(0)));
+  NGLogicalRect exclusion;
+  exclusion.size = {/* inline_size */ LayoutUnit(100),
+                    /* block_size */ LayoutUnit(100)};
+  exclusion.offset = {/* inline_offset */ LayoutUnit(0),
+                      /* block_offset */ LayoutUnit(150)};
+  space->AddExclusion(exclusion);
 
   auto* iterator = space->LayoutOpportunities();
 
   EXPECT_EQ("0,0 600x100", OpportunityToString(iterator->Next()));
   EXPECT_EQ("(empty)", OpportunityToString(iterator->Next()));
 }
 
 }  // namespace
 }  // namespace blink