| 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..bce4885e18ec432782be7de61d6a40efaf764d6e 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)));
|
| + NGLogicalRect exclusion;
|
| + exclusion.size = {/* inline_size */ LayoutUnit(100),
|
| + /* block_size */ LayoutUnit(100)};
|
| + exclusion.offset = {/* inline_offset */ LayoutUnit(500),
|
| + /* block_offset */ LayoutUnit(0)};
|
| + physical_space->AddExclusion(exclusion);
|
|
|
| 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)));
|
| + NGLogicalRect exclusion;
|
| + exclusion.size = {/* inline_size */ LayoutUnit(100),
|
| + /* block_size */ LayoutUnit(100)};
|
| + exclusion.offset = {/* inline_offset */ LayoutUnit(0),
|
| + /* block_offset */ LayoutUnit(0)};
|
| + physical_space->AddExclusion(exclusion);
|
|
|
| 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)));
|
| + NGLogicalRect exclusion1;
|
| + exclusion1.size = {/* inline_size */ LayoutUnit(100),
|
| + /* block_size */ LayoutUnit(100)};
|
| + exclusion1.offset = {/* inline_offset */ LayoutUnit(150),
|
| + /* block_offset */ LayoutUnit(200)};
|
| + physical_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)};
|
| + physical_space->AddExclusion(exclusion2);
|
|
|
| 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)));
|
| + NGLogicalRect exclusion1;
|
| + exclusion1.size = {/* inline_size */ LayoutUnit(100),
|
| + /* block_size */ LayoutUnit(100)};
|
| + exclusion1.offset = {/* inline_offset */ LayoutUnit(150),
|
| + /* block_offset */ LayoutUnit(200)};
|
| + physical_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)};
|
| + physical_space->AddExclusion(exclusion2);
|
|
|
| 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)));
|
| + NGLogicalRect exclusion;
|
| + exclusion.size = {/* inline_size */ LayoutUnit(100),
|
| + /* block_size */ LayoutUnit(100)};
|
| + exclusion.offset = {/* inline_offset */ LayoutUnit(0),
|
| + /* block_offset */ LayoutUnit(150)};
|
| + physical_space->AddExclusion(exclusion);
|
| auto* space =
|
| new NGConstraintSpace(HorizontalTopBottom, LeftToRight, physical_space);
|
|
|
|
|