Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(565)

Unified Diff: third_party/WebKit/Source/core/layout/ng/ng_constraint_space_test.cc

Issue 2466913002: Reland of [LayoutNG] Remove simple constructors from NGPhysicalConstraintSpace. (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..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
@@ -12,6 +12,18 @@
namespace blink {
namespace {
+
+NGConstraintSpace* ConstructConstraintSpace(NGWritingMode writing_mode,
+ NGDirection direction,
+ NGPhysicalSize size) {
+ return new NGConstraintSpace(
+ writing_mode, direction,
+ new NGPhysicalConstraintSpace(
+ size, /* fixed_width */ true, /* fixed_height */ false,
+ /* width_direction_triggers_scrollbar */ true,
+ /* height_direction_triggers_scrollbar */ false, FragmentNone,
+ FragmentColumn, /* is_new_fc */ false));
+}
TEST(NGConstraintSpaceTest, WritingMode) {
NGPhysicalConstraintSpace* phy_space = new NGPhysicalConstraintSpace(
@@ -56,10 +68,9 @@
NGPhysicalSize physical_size;
physical_size.width = LayoutUnit(600);
physical_size.height = LayoutUnit(400);
- auto* physical_space = new NGPhysicalConstraintSpace(physical_size);
- auto* space =
- new NGConstraintSpace(HorizontalTopBottom, LeftToRight, physical_space);
-
+
+ auto* space =
+ ConstructConstraintSpace(HorizontalTopBottom, LeftToRight, physical_size);
auto* iterator = space->LayoutOpportunities();
EXPECT_EQ("0,0 600x400", OpportunityToString(iterator->Next()));
@@ -70,14 +81,13 @@
NGPhysicalSize physical_size;
physical_size.width = LayoutUnit(600);
physical_size.height = LayoutUnit(400);
- 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)));
-
- auto* space =
- new NGConstraintSpace(HorizontalTopBottom, LeftToRight, physical_space);
+
+ // 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)));
+
auto* iterator = space->LayoutOpportunities();
// First opportunity should be to the left of the exclusion.
@@ -94,14 +104,13 @@
NGPhysicalSize physical_size;
physical_size.width = LayoutUnit(600);
physical_size.height = LayoutUnit(400);
- 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)));
-
- auto* space =
- new NGConstraintSpace(HorizontalTopBottom, LeftToRight, physical_space);
+
+ // 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)));
+
auto* iterator = space->LayoutOpportunities();
// First opportunity should be to the right of the exclusion.
@@ -141,16 +150,16 @@
NGPhysicalSize physical_size;
physical_size.width = LayoutUnit(600);
physical_size.height = LayoutUnit(400);
- auto* physical_space = new NGPhysicalConstraintSpace(physical_size);
+
+ auto* space =
+ ConstructConstraintSpace(HorizontalTopBottom, LeftToRight, 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)));
-
- auto* space =
- new NGConstraintSpace(HorizontalTopBottom, LeftToRight, physical_space);
+ 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();
// 1st Start point
@@ -189,16 +198,16 @@
NGPhysicalSize physical_size;
physical_size.width = LayoutUnit(600);
physical_size.height = LayoutUnit(400);
- auto* physical_space = new NGPhysicalConstraintSpace(physical_size);
+
+ auto* space =
+ ConstructConstraintSpace(HorizontalTopBottom, LeftToRight, 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)));
-
- auto* space =
- new NGConstraintSpace(HorizontalTopBottom, LeftToRight, physical_space);
+ 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);
@@ -240,11 +249,10 @@
physical_size.width = LayoutUnit(600);
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)));
- auto* space =
- new NGConstraintSpace(HorizontalTopBottom, LeftToRight, physical_space);
+ auto* space =
+ ConstructConstraintSpace(HorizontalTopBottom, LeftToRight, physical_size);
+ space->AddExclusion(new NGExclusion(LayoutUnit(150), LayoutUnit(100),
+ LayoutUnit(200), LayoutUnit(0)));
auto* iterator = space->LayoutOpportunities();

Powered by Google App Engine
This is Rietveld 408576698