| 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 6ede938ace0283329e6282f20e186ca7b8049be7..9edbb0edb2b4ff9a0e94125478a76e0c3ebb49d5 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
|
| @@ -16,7 +16,6 @@
|
| #include "core/layout/ng/ng_length_utils.h"
|
| #include "core/layout/ng/ng_physical_box_fragment.h"
|
| #include "core/layout/ng/ng_physical_fragment.h"
|
| -#include "core/layout/ng/ng_units.h"
|
| #include "core/style/ComputedStyle.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| @@ -95,7 +94,7 @@ class NGBlockLayoutAlgorithmTest
|
| toNGPhysicalBoxFragment(result->PhysicalFragment().get()), space);
|
| }
|
|
|
| - MinAndMaxContentSizes RunComputeMinAndMax(NGBlockNode* first_child) {
|
| + MinMaxContentSize RunComputeMinAndMax(NGBlockNode* first_child) {
|
| // The constraint space is not used for min/max computation, but we need
|
| // it to create the algorithm.
|
| NGConstraintSpace* space =
|
| @@ -105,8 +104,8 @@ class NGBlockLayoutAlgorithmTest
|
| node->SetFirstChild(first_child);
|
|
|
| NGBlockLayoutAlgorithm algorithm(node, space);
|
| - EXPECT_TRUE(algorithm.ComputeMinAndMaxContentSizes().has_value());
|
| - return *algorithm.ComputeMinAndMaxContentSizes();
|
| + EXPECT_TRUE(algorithm.ComputeMinMaxContentSize().has_value());
|
| + return *algorithm.ComputeMinMaxContentSize();
|
| }
|
|
|
| RefPtr<ComputedStyle> style_;
|
| @@ -1301,7 +1300,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, ComputeMinMaxContent) {
|
|
|
| first_child->SetNextSibling(second_child);
|
|
|
| - MinAndMaxContentSizes sizes = RunComputeMinAndMax(first_child);
|
| + MinMaxContentSize sizes = RunComputeMinAndMax(first_child);
|
| EXPECT_EQ(kWidthChild2, sizes.min_content);
|
| EXPECT_EQ(kWidthChild2, sizes.max_content);
|
| }
|
|
|