Index: third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm_test.cc |
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm_test.cc b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm_test.cc |
index 7ba9e05c357b619964ac23c4415092776e0fa0d5..1e38caa473767ebe50a4e4d7d7e13961e0c791a3 100644 |
--- a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm_test.cc |
+++ b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm_test.cc |
@@ -48,7 +48,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, FixedSize) { |
style_->setHeight(Length(40, Fixed)); |
auto* space = ConstructConstraintSpace( |
- kHorizontalTopBottom, LTR, |
+ kHorizontalTopBottom, TextDirection::Ltr, |
NGLogicalSize(LayoutUnit(100), NGSizeIndefinite)); |
NGPhysicalFragmentBase* frag = RunBlockLayoutAlgorithm(space, nullptr); |
@@ -78,7 +78,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, LayoutBlockChildren) { |
first_child->SetNextSibling(second_child); |
auto* space = ConstructConstraintSpace( |
- kHorizontalTopBottom, LTR, |
+ kHorizontalTopBottom, TextDirection::Ltr, |
NGLogicalSize(LayoutUnit(100), NGSizeIndefinite)); |
NGPhysicalFragment* frag = RunBlockLayoutAlgorithm(space, first_child); |
@@ -124,7 +124,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, LayoutBlockChildrenWithWritingMode) { |
div1->SetFirstChild(div2); |
auto* space = |
- ConstructConstraintSpace(kHorizontalTopBottom, LTR, |
+ ConstructConstraintSpace(kHorizontalTopBottom, TextDirection::Ltr, |
NGLogicalSize(LayoutUnit(500), LayoutUnit(500))); |
NGPhysicalFragment* frag = RunBlockLayoutAlgorithm(space, div1); |
@@ -172,7 +172,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, CollapsingMarginsCase1) { |
.SetAvailableSize(NGLogicalSize(LayoutUnit(100), NGSizeIndefinite)) |
.SetPercentageResolutionSize( |
NGLogicalSize(LayoutUnit(100), NGSizeIndefinite)) |
- .SetTextDirection(LTR) |
+ .SetTextDirection(TextDirection::Ltr) |
.SetIsNewFormattingContext(true) |
.ToConstraintSpace(); |
NGPhysicalFragment* frag = RunBlockLayoutAlgorithm(space, div1); |
@@ -247,7 +247,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, CollapsingMarginsCase2) { |
div6->SetNextSibling(div7); |
auto* space = ConstructConstraintSpace( |
- kHorizontalTopBottom, LTR, |
+ kHorizontalTopBottom, TextDirection::Ltr, |
NGLogicalSize(LayoutUnit(100), NGSizeIndefinite)); |
NGPhysicalFragment* frag = RunBlockLayoutAlgorithm(space, div1); |
@@ -296,7 +296,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, CollapsingMarginsCase3) { |
div1->SetFirstChild(div2); |
auto* space = ConstructConstraintSpace( |
- kHorizontalTopBottom, LTR, |
+ kHorizontalTopBottom, TextDirection::Ltr, |
NGLogicalSize(LayoutUnit(100), NGSizeIndefinite)); |
NGPhysicalFragment* frag = RunBlockLayoutAlgorithm(space, div1); |
@@ -345,7 +345,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, CollapsingMarginsCase4) { |
div1->SetFirstChild(div2); |
auto* space = ConstructConstraintSpace( |
- kHorizontalTopBottom, LTR, |
+ kHorizontalTopBottom, TextDirection::Ltr, |
NGLogicalSize(LayoutUnit(100), NGSizeIndefinite)); |
NGPhysicalFragment* frag = RunBlockLayoutAlgorithm(space, div1); |
@@ -400,8 +400,9 @@ TEST_F(NGBlockLayoutAlgorithmTest, CollapsingMarginsCase5) { |
vertical_div->SetNextSibling(horizontal_div); |
- auto* space = ConstructConstraintSpace( |
- kVerticalLeftRight, LTR, NGLogicalSize(LayoutUnit(500), LayoutUnit(500))); |
+ auto* space = |
+ ConstructConstraintSpace(kVerticalLeftRight, TextDirection::Ltr, |
+ NGLogicalSize(LayoutUnit(500), LayoutUnit(500))); |
NGPhysicalFragment* frag = RunBlockLayoutAlgorithm(space, vertical_div); |
ASSERT_EQ(frag->Children().size(), 2UL); |
@@ -458,7 +459,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, CollapsingMarginsCase6) { |
div1->SetNextSibling(div3); |
auto* space = |
- ConstructConstraintSpace(kHorizontalTopBottom, LTR, |
+ ConstructConstraintSpace(kHorizontalTopBottom, TextDirection::Ltr, |
NGLogicalSize(LayoutUnit(500), LayoutUnit(500))); |
NGPhysicalFragment* frag = RunBlockLayoutAlgorithm(space, div1); |
@@ -521,7 +522,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, BorderAndPadding) { |
div1->SetFirstChild(div2); |
auto* space = ConstructConstraintSpace( |
- kHorizontalTopBottom, LTR, |
+ kHorizontalTopBottom, TextDirection::Ltr, |
NGLogicalSize(LayoutUnit(1000), NGSizeIndefinite)); |
NGPhysicalFragment* frag = RunBlockLayoutAlgorithm(space, div1); |
@@ -555,7 +556,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, PercentageResolutionSize) { |
NGBlockNode* first_child = new NGBlockNode(first_style.get()); |
auto* space = ConstructConstraintSpace( |
- kHorizontalTopBottom, LTR, |
+ kHorizontalTopBottom, TextDirection::Ltr, |
NGLogicalSize(LayoutUnit(100), NGSizeIndefinite)); |
NGPhysicalFragment* frag = RunBlockLayoutAlgorithm(space, first_child); |
@@ -583,7 +584,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, AutoMargin) { |
NGBlockNode* first_child = new NGBlockNode(first_style.get()); |
auto* space = ConstructConstraintSpace( |
- kHorizontalTopBottom, LTR, |
+ kHorizontalTopBottom, TextDirection::Ltr, |
NGLogicalSize(LayoutUnit(100), NGSizeIndefinite)); |
NGPhysicalFragment* frag = RunBlockLayoutAlgorithm(space, first_child); |
@@ -664,7 +665,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, PositionFloatFragments) { |
div3->SetNextSibling(div4); |
auto* space = ConstructConstraintSpace( |
- kHorizontalTopBottom, LTR, |
+ kHorizontalTopBottom, TextDirection::Ltr, |
NGLogicalSize(LayoutUnit(kParentSize), LayoutUnit(kParentSize))); |
NGPhysicalFragment* frag = RunBlockLayoutAlgorithm(space, div1); |
ASSERT_EQ(frag->Children().size(), 4UL); |
@@ -741,7 +742,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, PositionFragmentsWithClear) { |
// clear: left; |
div3_style->setClear(EClear::ClearLeft); |
auto* space = ConstructConstraintSpace( |
- kHorizontalTopBottom, LTR, |
+ kHorizontalTopBottom, TextDirection::Ltr, |
NGLogicalSize(LayoutUnit(kParentSize), LayoutUnit(kParentSize))); |
NGPhysicalFragment* frag = RunBlockLayoutAlgorithm(space, div1); |
const NGPhysicalFragmentBase* child3 = frag->Children()[2]; |
@@ -750,7 +751,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, PositionFragmentsWithClear) { |
// clear: right; |
div3_style->setClear(EClear::ClearRight); |
space = ConstructConstraintSpace( |
- kHorizontalTopBottom, LTR, |
+ kHorizontalTopBottom, TextDirection::Ltr, |
NGLogicalSize(LayoutUnit(kParentSize), LayoutUnit(kParentSize))); |
frag = RunBlockLayoutAlgorithm(space, div1); |
child3 = frag->Children()[2]; |
@@ -759,11 +760,11 @@ TEST_F(NGBlockLayoutAlgorithmTest, PositionFragmentsWithClear) { |
// clear: both; |
div3_style->setClear(EClear::ClearBoth); |
space = ConstructConstraintSpace( |
- kHorizontalTopBottom, LTR, |
+ kHorizontalTopBottom, TextDirection::Ltr, |
NGLogicalSize(LayoutUnit(kParentSize), LayoutUnit(kParentSize))); |
frag = RunBlockLayoutAlgorithm(space, div1); |
space = ConstructConstraintSpace( |
- kHorizontalTopBottom, LTR, |
+ kHorizontalTopBottom, TextDirection::Ltr, |
NGLogicalSize(LayoutUnit(kParentSize), LayoutUnit(kParentSize))); |
child3 = frag->Children()[2]; |
EXPECT_EQ(kDiv1Size + kDiv2Size, child3->TopOffset()); |