| Index: third_party/WebKit/Source/core/layout/ng/ng_inline_node_test.cc
|
| diff --git a/third_party/WebKit/Source/core/layout/ng/ng_inline_node_test.cc b/third_party/WebKit/Source/core/layout/ng/ng_inline_node_test.cc
|
| index 031605191cb1e817ebb66c6e576b8f3b5890cdeb..455fac856a47367ad03332a72e167de300dbfce9 100644
|
| --- a/third_party/WebKit/Source/core/layout/ng/ng_inline_node_test.cc
|
| +++ b/third_party/WebKit/Source/core/layout/ng/ng_inline_node_test.cc
|
| @@ -216,25 +216,25 @@ TEST_F(NGInlineNodeTest, CreateLineBidiIsolate) {
|
| TEST_TEXT_FRAGMENT(fragments[4], node, 8u, 22u, 28u, TextDirection::kLtr);
|
| }
|
|
|
| -TEST_F(NGInlineNodeTest, MinAndMaxContentSizes) {
|
| +TEST_F(NGInlineNodeTest, MinMaxContentSize) {
|
| setAhemToStyle();
|
| NGInlineNodeForTest* node = new NGInlineNodeForTest(style_.get());
|
| node->Append("AB CDE", style_.get());
|
| node->ShapeText();
|
| - MinAndMaxContentSizes sizes = node->ComputeMinAndMaxContentSizes();
|
| + MinMaxContentSize sizes = node->ComputeMinMaxContentSize();
|
| // TODO(kojii): min_content should be 20, but is 30 until NGLineBuilder
|
| // implements trailing spaces correctly.
|
| EXPECT_EQ(30, sizes.min_content);
|
| EXPECT_EQ(60, sizes.max_content);
|
| }
|
|
|
| -TEST_F(NGInlineNodeTest, MinAndMaxContentSizesElementBoundary) {
|
| +TEST_F(NGInlineNodeTest, MinMaxContentSizeElementBoundary) {
|
| setAhemToStyle();
|
| NGInlineNodeForTest* node = new NGInlineNodeForTest(style_.get());
|
| node->Append("A B", style_.get());
|
| node->Append("C D", style_.get());
|
| node->ShapeText();
|
| - MinAndMaxContentSizes sizes = node->ComputeMinAndMaxContentSizes();
|
| + MinMaxContentSize sizes = node->ComputeMinMaxContentSize();
|
| // |min_content| should be the width of "BC" because there is an element
|
| // boundary between "B" and "C" but no break opportunities.
|
| // TODO(kojii): min_content should be 20, but is 30 until NGLineBuilder
|
|
|