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 701baf31ed0c9ee62de0c70380d12ea5951e975c..6095e4f6ef55097641374a65788086f13c1ef3f9 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 |
@@ -85,12 +85,8 @@ |
// Create a space with a 100x100 exclusion in the top right corner. |
auto* space = |
ConstructConstraintSpace(HorizontalTopBottom, LeftToRight, physical_size); |
- 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); |
+ space->AddExclusion(new NGExclusion(LayoutUnit(0), LayoutUnit(600), |
+ LayoutUnit(100), LayoutUnit(500))); |
auto* iterator = space->LayoutOpportunities(); |
@@ -112,12 +108,8 @@ |
// Create a space with a 100x100 exclusion in the top left corner. |
auto* space = |
ConstructConstraintSpace(HorizontalTopBottom, LeftToRight, physical_size); |
- 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); |
+ space->AddExclusion(new NGExclusion(LayoutUnit(0), LayoutUnit(100), |
+ LayoutUnit(100), LayoutUnit(0))); |
auto* iterator = space->LayoutOpportunities(); |
@@ -161,19 +153,12 @@ |
auto* space = |
ConstructConstraintSpace(HorizontalTopBottom, LeftToRight, physical_size); |
+ |
// Add exclusions |
- 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); |
+ space->AddExclusion(new NGExclusion(LayoutUnit(200), LayoutUnit(250), |
+ LayoutUnit(300), LayoutUnit(150))); |
+ space->AddExclusion(new NGExclusion(LayoutUnit(350), LayoutUnit(550), |
+ LayoutUnit(400), LayoutUnit(500))); |
auto* iterator = space->LayoutOpportunities(); |
@@ -216,19 +201,12 @@ |
auto* space = |
ConstructConstraintSpace(HorizontalTopBottom, LeftToRight, physical_size); |
+ |
// Add exclusions |
- 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); |
+ space->AddExclusion(new NGExclusion(LayoutUnit(200), LayoutUnit(250), |
+ LayoutUnit(300), LayoutUnit(150))); |
+ space->AddExclusion(new NGExclusion(LayoutUnit(350), LayoutUnit(550), |
+ LayoutUnit(400), LayoutUnit(500))); |
const NGLogicalOffset origin_point = {LayoutUnit(0), LayoutUnit(200)}; |
auto* iterator = new NGLayoutOpportunityIterator(space, origin_point); |
@@ -273,12 +251,8 @@ |
auto* space = |
ConstructConstraintSpace(HorizontalTopBottom, LeftToRight, physical_size); |
- 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); |
+ space->AddExclusion(new NGExclusion(LayoutUnit(150), LayoutUnit(100), |
+ LayoutUnit(200), LayoutUnit(0))); |
auto* iterator = space->LayoutOpportunities(); |