| Index: third_party/WebKit/Source/core/layout/ng/ng_length_utils_test.cc
|
| diff --git a/third_party/WebKit/Source/core/layout/ng/ng_length_utils_test.cc b/third_party/WebKit/Source/core/layout/ng/ng_length_utils_test.cc
|
| index 703d45f4c642b2985aa832d436c9a11dedb9f27a..4cef04e6ac9306693805d63c28d23c67f0c2cbf0 100644
|
| --- a/third_party/WebKit/Source/core/layout/ng/ng_length_utils_test.cc
|
| +++ b/third_party/WebKit/Source/core/layout/ng/ng_length_utils_test.cc
|
| @@ -400,12 +400,12 @@ TEST_F(NGLengthUtilsTest, testAutoMargins) {
|
| style_->SetMarginRight(Length(kAuto));
|
| style_->SetMarginLeft(Length(kAuto));
|
|
|
| - LayoutUnit k_inline_size = LayoutUnit(150);
|
| + LayoutUnit kInlineSize = LayoutUnit(150);
|
| RefPtr<NGConstraintSpace> constraint_space(
|
| ConstructConstraintSpace(200, 300));
|
|
|
| NGBoxStrut margins;
|
| - ApplyAutoMargins(*constraint_space, *style_, k_inline_size, &margins);
|
| + ApplyAutoMargins(*constraint_space, *style_, kInlineSize, &margins);
|
|
|
| EXPECT_EQ(LayoutUnit(), margins.block_start);
|
| EXPECT_EQ(LayoutUnit(), margins.block_end);
|
| @@ -414,14 +414,14 @@ TEST_F(NGLengthUtilsTest, testAutoMargins) {
|
|
|
| style_->SetMarginLeft(Length(0, kFixed));
|
| margins = NGBoxStrut();
|
| - ApplyAutoMargins(*constraint_space, *style_, k_inline_size, &margins);
|
| + ApplyAutoMargins(*constraint_space, *style_, kInlineSize, &margins);
|
| EXPECT_EQ(LayoutUnit(0), margins.inline_start);
|
| EXPECT_EQ(LayoutUnit(50), margins.inline_end);
|
|
|
| style_->SetMarginLeft(Length(kAuto));
|
| style_->SetMarginRight(Length(0, kFixed));
|
| margins = NGBoxStrut();
|
| - ApplyAutoMargins(*constraint_space, *style_, k_inline_size, &margins);
|
| + ApplyAutoMargins(*constraint_space, *style_, kInlineSize, &margins);
|
| EXPECT_EQ(LayoutUnit(50), margins.inline_start);
|
| EXPECT_EQ(LayoutUnit(0), margins.inline_end);
|
|
|
| @@ -431,7 +431,7 @@ TEST_F(NGLengthUtilsTest, testAutoMargins) {
|
| style_->SetMarginRight(Length(5000, kFixed));
|
| margins = NGBoxStrut();
|
| margins.inline_end = LayoutUnit(5000);
|
| - ApplyAutoMargins(*constraint_space, *style_, k_inline_size, &margins);
|
| + ApplyAutoMargins(*constraint_space, *style_, kInlineSize, &margins);
|
| EXPECT_EQ(LayoutUnit(0), margins.inline_start);
|
| EXPECT_EQ(LayoutUnit(5000), margins.inline_end);
|
| }
|
|
|