Index: third_party/WebKit/Source/core/layout/ng/ng_constraint_space_test.cc |
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_test.cc b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_test.cc |
index cb9085c6e29134e85402a3ab4defc37aac2c9922..fedd751684e7e43edbce9f787ea5cadaaad55a64 100644 |
--- a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_test.cc |
+++ b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_test.cc |
@@ -73,8 +73,12 @@ TEST(NGConstraintSpaceTest, LayoutOpportunitiesTopRightExclusion) { |
auto* physical_space = new NGPhysicalConstraintSpace(physical_size); |
// Add a 100x100 exclusion in the top right corner. |
- physical_space->AddExclusion(new NGExclusion( |
- LayoutUnit(0), LayoutUnit(600), LayoutUnit(100), LayoutUnit(500))); |
+ physical_space->AddExclusion(NGLogicalRect::Builder() |
+ .SetBlockOffset(LayoutUnit(0)) |
+ .SetInlineOffset(LayoutUnit(500)) |
+ .SetBlockSize(LayoutUnit(100)) |
+ .SetInlineSize(LayoutUnit(100)) |
+ .Build()); |
auto* space = |
new NGConstraintSpace(HorizontalTopBottom, LeftToRight, physical_space); |
@@ -97,8 +101,12 @@ TEST(NGConstraintSpaceTest, LayoutOpportunitiesTopLeftExclusion) { |
auto* physical_space = new NGPhysicalConstraintSpace(physical_size); |
// Add a 100x100 exclusion in the top left corner. |
- physical_space->AddExclusion(new NGExclusion(LayoutUnit(0), LayoutUnit(100), |
- LayoutUnit(100), LayoutUnit(0))); |
+ physical_space->AddExclusion(NGLogicalRect::Builder() |
+ .SetBlockOffset(LayoutUnit(0)) |
+ .SetInlineOffset(LayoutUnit(0)) |
+ .SetBlockSize(LayoutUnit(100)) |
+ .SetInlineSize(LayoutUnit(100)) |
+ .Build()); |
auto* space = |
new NGConstraintSpace(HorizontalTopBottom, LeftToRight, physical_space); |
@@ -144,10 +152,18 @@ TEST(NGConstraintSpaceTest, LayoutOpportunitiesTwoInMiddle) { |
auto* physical_space = new NGPhysicalConstraintSpace(physical_size); |
// Add exclusions |
- physical_space->AddExclusion(new NGExclusion( |
- LayoutUnit(200), LayoutUnit(250), LayoutUnit(300), LayoutUnit(150))); |
- physical_space->AddExclusion(new NGExclusion( |
- LayoutUnit(350), LayoutUnit(550), LayoutUnit(400), LayoutUnit(500))); |
+ physical_space->AddExclusion(NGLogicalRect::Builder() |
+ .SetBlockOffset(LayoutUnit(200)) |
+ .SetInlineOffset(LayoutUnit(150)) |
+ .SetBlockSize(LayoutUnit(100)) |
+ .SetInlineSize(LayoutUnit(100)) |
+ .Build()); |
+ physical_space->AddExclusion(NGLogicalRect::Builder() |
+ .SetBlockOffset(LayoutUnit(350)) |
+ .SetInlineOffset(LayoutUnit(500)) |
+ .SetBlockSize(LayoutUnit(50)) |
+ .SetInlineSize(LayoutUnit(50)) |
+ .Build()); |
auto* space = |
new NGConstraintSpace(HorizontalTopBottom, LeftToRight, physical_space); |
@@ -192,10 +208,18 @@ TEST(NGConstraintSpaceTest, LayoutOpportunitiesTwoInMiddleWithOrigin) { |
auto* physical_space = new NGPhysicalConstraintSpace(physical_size); |
// Add exclusions |
- physical_space->AddExclusion(new NGExclusion( |
- LayoutUnit(200), LayoutUnit(250), LayoutUnit(300), LayoutUnit(150))); |
- physical_space->AddExclusion(new NGExclusion( |
- LayoutUnit(350), LayoutUnit(550), LayoutUnit(400), LayoutUnit(500))); |
+ physical_space->AddExclusion(NGLogicalRect::Builder() |
+ .SetBlockOffset(LayoutUnit(200)) |
+ .SetInlineOffset(LayoutUnit(150)) |
+ .SetBlockSize(LayoutUnit(100)) |
+ .SetInlineSize(LayoutUnit(100)) |
+ .Build()); |
+ physical_space->AddExclusion(NGLogicalRect::Builder() |
+ .SetBlockOffset(LayoutUnit(350)) |
+ .SetInlineOffset(LayoutUnit(500)) |
+ .SetBlockSize(LayoutUnit(50)) |
+ .SetInlineSize(LayoutUnit(50)) |
+ .Build()); |
auto* space = |
new NGConstraintSpace(HorizontalTopBottom, LeftToRight, physical_space); |
@@ -241,8 +265,12 @@ TEST(NGConstraintSpaceTest, LayoutOpportunitiesWithOutOfBoundsExclusions) { |
physical_size.height = LayoutUnit(100); |
auto* physical_space = new NGPhysicalConstraintSpace(physical_size); |
- physical_space->AddExclusion(new NGExclusion(LayoutUnit(150), LayoutUnit(100), |
- LayoutUnit(200), LayoutUnit(0))); |
+ physical_space->AddExclusion(NGLogicalRect::Builder() |
+ .SetBlockOffset(LayoutUnit(150)) |
+ .SetInlineOffset(LayoutUnit(0)) |
+ .SetBlockSize(LayoutUnit(100)) |
+ .SetInlineSize(LayoutUnit(100)) |
+ .Build()); |
auto* space = |
new NGConstraintSpace(HorizontalTopBottom, LeftToRight, physical_space); |