summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/core/layout/ng/ng_block_layout_algorithm_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/blink/renderer/core/layout/ng/ng_block_layout_algorithm_test.cc')
-rw-r--r--chromium/third_party/blink/renderer/core/layout/ng/ng_block_layout_algorithm_test.cc133
1 files changed, 16 insertions, 117 deletions
diff --git a/chromium/third_party/blink/renderer/core/layout/ng/ng_block_layout_algorithm_test.cc b/chromium/third_party/blink/renderer/core/layout/ng/ng_block_layout_algorithm_test.cc
index 1cc8a99f1ed..f07b9dcfcf3 100644
--- a/chromium/third_party/blink/renderer/core/layout/ng/ng_block_layout_algorithm_test.cc
+++ b/chromium/third_party/blink/renderer/core/layout/ng/ng_block_layout_algorithm_test.cc
@@ -33,7 +33,7 @@ class NGBlockLayoutAlgorithmTest : public NGBaseLayoutAlgorithmTest {
NGBaseLayoutAlgorithmTest::SetUp();
}
- MinMaxSize RunComputeMinAndMax(NGBlockNode node) {
+ MinMaxSizes RunComputeMinMaxSizes(NGBlockNode node) {
// The constraint space is not used for min/max computation, but we need
// it to create the algorithm.
NGConstraintSpace space = ConstructBlockLayoutTestConstraintSpace(
@@ -43,9 +43,9 @@ class NGBlockLayoutAlgorithmTest : public NGBaseLayoutAlgorithmTest {
CalculateInitialMinMaxFragmentGeometry(space, node);
NGBlockLayoutAlgorithm algorithm({node, fragment_geometry, space});
- MinMaxSizeInput input(
+ MinMaxSizesInput input(
/* percentage_resolution_block_size */ (LayoutUnit()));
- auto min_max = algorithm.ComputeMinMaxSize(input);
+ auto min_max = algorithm.ComputeMinMaxSizes(input);
EXPECT_TRUE(min_max.has_value());
return *min_max;
}
@@ -97,10 +97,11 @@ TEST_F(NGBlockLayoutAlgorithmTest, FixedSize) {
}
TEST_F(NGBlockLayoutAlgorithmTest, Caching) {
- ScopedLayoutNGFragmentCachingForTest layout_ng_fragment_caching(true);
-
+ // The inner element exists so that "simplified" layout logic isn't invoked.
SetBodyInnerHTML(R"HTML(
- <div id="box" style="width:30px; height:40%;"></div>
+ <div id="box" style="width:30px; height:40%;">
+ <div style="height: 100%;"></div>
+ </div>
)HTML");
NGConstraintSpace space = ConstructBlockLayoutTestConstraintSpace(
@@ -132,7 +133,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, Caching) {
EXPECT_NE(result.get(), nullptr);
// Test a different constraint space that will actually result in a different
- // size.
+ // sized fragment.
space = ConstructBlockLayoutTestConstraintSpace(
WritingMode::kHorizontalTb, TextDirection::kLtr,
LogicalSize(LayoutUnit(200), LayoutUnit(200)));
@@ -146,8 +147,6 @@ TEST_F(NGBlockLayoutAlgorithmTest, Caching) {
}
TEST_F(NGBlockLayoutAlgorithmTest, MinInlineSizeCaching) {
- ScopedLayoutNGFragmentCachingForTest layout_ng_fragment_caching(true);
-
SetBodyInnerHTML(R"HTML(
<div id="box" style="min-width:30%; width: 10px; height:40px;"></div>
)HTML");
@@ -190,8 +189,6 @@ TEST_F(NGBlockLayoutAlgorithmTest, MinInlineSizeCaching) {
}
TEST_F(NGBlockLayoutAlgorithmTest, PercentageBlockSizeQuirkDescendantsCaching) {
- ScopedLayoutNGFragmentCachingForTest layout_ng_fragment_caching(true);
-
// Quirks mode triggers the interesting parent-child %-resolution behaviour.
GetDocument().SetCompatibilityMode(Document::kQuirksMode);
@@ -237,10 +234,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, PercentageBlockSizeQuirkDescendantsCaching) {
builder.SetAvailableSize(size);
builder.SetPercentageResolutionSize(size);
builder.SetTextDirection(TextDirection::kLtr);
- builder.AddBaselineRequest({NGBaselineAlgorithmType::kAtomicInline,
- FontBaseline::kAlphabeticBaseline});
- builder.AddBaselineRequest({NGBaselineAlgorithmType::kFirstLine,
- FontBaseline::kAlphabeticBaseline});
+ builder.SetNeedsBaseline(true);
return builder.ToConstraintSpace();
};
@@ -298,99 +292,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, PercentageBlockSizeQuirkDescendantsCaching) {
EXPECT_EQ(run_test("box9"), nullptr);
}
-TEST_F(NGBlockLayoutAlgorithmTest, ShrinkToFitCaching) {
- ScopedLayoutNGFragmentCachingForTest layout_ng_fragment_caching(true);
-
- SetBodyInnerHTML(R"HTML(
- <div id="container" style="display: flow-root; width: 300px; height: 100px;">
- <div id="box1" style="float: left;">
- <div style="display: inline-block; width: 150px;"></div>
- <div style="display: inline-block; width: 50px;"></div>
- </div>
- <div id="box2" style="float: left;">
- <div style="display: inline-block; width: 350px;"></div>
- <div style="display: inline-block; width: 250px;"></div>
- </div>
- <div id="box3" style="float: left; min-width: 80%;">
- <div style="display: inline-block; width: 150px;"></div>
- <div style="display: inline-block; width: 250px;"></div>
- </div>
- <div id="box4" style="float: left; margin-left: 75px;">
- <div style="display: inline-block; width: 150px;"></div>
- <div style="display: inline-block; width: 50px;"></div>
- </div>
- </div>
- )HTML");
-
- NGConstraintSpace space100 = ConstructBlockLayoutTestConstraintSpace(
- WritingMode::kHorizontalTb, TextDirection::kLtr,
- LogicalSize(LayoutUnit(100), LayoutUnit(100)),
- /* shrink_to_fit */ true, /* is_new_formatting_context */ true);
- NGConstraintSpace space200 = ConstructBlockLayoutTestConstraintSpace(
- WritingMode::kHorizontalTb, TextDirection::kLtr,
- LogicalSize(LayoutUnit(200), LayoutUnit(100)),
- /* shrink_to_fit */ true, /* is_new_formatting_context */ true);
- NGConstraintSpace space250 = ConstructBlockLayoutTestConstraintSpace(
- WritingMode::kHorizontalTb, TextDirection::kLtr,
- LogicalSize(LayoutUnit(250), LayoutUnit(100)),
- /* shrink_to_fit */ true, /* is_new_formatting_context */ true);
- NGConstraintSpace space300 = ConstructBlockLayoutTestConstraintSpace(
- WritingMode::kHorizontalTb, TextDirection::kLtr,
- LogicalSize(LayoutUnit(300), LayoutUnit(100)),
- /* shrink_to_fit */ true, /* is_new_formatting_context */ true);
- NGConstraintSpace space400 = ConstructBlockLayoutTestConstraintSpace(
- WritingMode::kHorizontalTb, TextDirection::kLtr,
- LogicalSize(LayoutUnit(400), LayoutUnit(100)),
- /* shrink_to_fit */ true, /* is_new_formatting_context */ true);
- scoped_refptr<const NGLayoutResult> result;
-
- auto* box1 = To<LayoutBlockFlow>(GetLayoutObjectByElementId("box1"));
- auto* box2 = To<LayoutBlockFlow>(GetLayoutObjectByElementId("box2"));
- auto* box3 = To<LayoutBlockFlow>(GetLayoutObjectByElementId("box3"));
- auto* box4 = To<LayoutBlockFlow>(GetLayoutObjectByElementId("box4"));
-
- // Ensure we cached the result for box1 in the first layout pass.
- result = RunCachedLayoutResult(space300, NGBlockNode(box1));
- EXPECT_NE(result.get(), nullptr);
-
- // box1 was sized to its max-content size in the first layout pass, passing
- // an available size larger than the fragment should hit the cache.
- result = RunCachedLayoutResult(space400, NGBlockNode(box1));
- EXPECT_NE(result.get(), nullptr);
-
- // Passing an available size smaller than the fragment should miss the cache
- // as the fragment may shrink.
- result = RunCachedLayoutResult(space100, NGBlockNode(box1));
- EXPECT_EQ(result.get(), nullptr);
-
- // Ensure we cached the result for box2 in the first layout pass.
- result = RunCachedLayoutResult(space300, NGBlockNode(box2));
- EXPECT_NE(result.get(), nullptr);
-
- // box2 was sized to its min-content size in the first layout pass, passing
- // an available size smaller than the fragment should hit the cache.
- result = RunCachedLayoutResult(space200, NGBlockNode(box2));
- EXPECT_NE(result.get(), nullptr);
-
- // Passing an available size larger than the fragment should miss the cache
- // as the fragment may shrink.
- result = RunCachedLayoutResult(space400, NGBlockNode(box2));
- EXPECT_EQ(result.get(), nullptr);
-
- // box3 was sized to its min-content size in the first layout pass, however
- // it should miss the cache as it has a %-min-size.
- result = RunCachedLayoutResult(space200, NGBlockNode(box3));
- EXPECT_EQ(result.get(), nullptr);
-
- // box4 was sized to its max-content size in the first layout pass (the same
- // as box1) however it should miss the cache due to its margin.
- result = RunCachedLayoutResult(space250, NGBlockNode(box4));
- EXPECT_EQ(result.get(), nullptr);
-}
-
TEST_F(NGBlockLayoutAlgorithmTest, LineOffsetCaching) {
- ScopedLayoutNGFragmentCachingForTest layout_ng_fragment_caching(true);
-
SetBodyInnerHTML(R"HTML(
<div id="container" style="display: flow-root; width: 300px; height: 100px;">
<div id="box1" style="width: 100px; margin: 0 auto 0 auto;"></div>
@@ -404,10 +306,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, LineOffsetCaching) {
builder.SetAvailableSize(size);
builder.SetPercentageResolutionSize(size);
builder.SetTextDirection(TextDirection::kLtr);
- builder.AddBaselineRequest({NGBaselineAlgorithmType::kAtomicInline,
- FontBaseline::kAlphabeticBaseline});
- builder.AddBaselineRequest({NGBaselineAlgorithmType::kFirstLine,
- FontBaseline::kAlphabeticBaseline});
+ builder.SetNeedsBaseline(true);
builder.SetBfcOffset(bfc_offset);
return builder.ToConstraintSpace();
};
@@ -1645,7 +1544,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, ComputeMinMaxContent) {
NGBlockNode container(ToLayoutBox(GetLayoutObjectByElementId("container")));
- MinMaxSize sizes = RunComputeMinAndMax(container);
+ MinMaxSizes sizes = RunComputeMinMaxSizes(container);
EXPECT_EQ(kSecondChildWidth, sizes.min_size);
EXPECT_EQ(kSecondChildWidth, sizes.max_size);
}
@@ -1666,7 +1565,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, ComputeMinMaxContentFloats) {
NGBlockNode container(ToLayoutBox(GetLayoutObjectByElementId("container")));
- MinMaxSize sizes = RunComputeMinAndMax(container);
+ MinMaxSizes sizes = RunComputeMinMaxSizes(container);
EXPECT_EQ(LayoutUnit(40), sizes.min_size);
EXPECT_EQ(LayoutUnit(90), sizes.max_size);
}
@@ -1687,7 +1586,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, ComputeMinMaxContentFloatsClearance) {
NGBlockNode container(ToLayoutBox(GetLayoutObjectByElementId("container")));
- MinMaxSize sizes = RunComputeMinAndMax(container);
+ MinMaxSizes sizes = RunComputeMinMaxSizes(container);
EXPECT_EQ(LayoutUnit(40), sizes.min_size);
EXPECT_EQ(LayoutUnit(50), sizes.max_size);
}
@@ -1708,7 +1607,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, ComputeMinMaxContentNewFormattingContext) {
NGBlockNode container(ToLayoutBox(GetLayoutObjectByElementId("container")));
- MinMaxSize sizes = RunComputeMinAndMax(container);
+ MinMaxSizes sizes = RunComputeMinMaxSizes(container);
EXPECT_EQ(LayoutUnit(100), sizes.min_size);
EXPECT_EQ(LayoutUnit(100), sizes.max_size);
}
@@ -1730,7 +1629,7 @@ TEST_F(NGBlockLayoutAlgorithmTest,
NGBlockNode container(ToLayoutBox(GetLayoutObjectByElementId("container")));
- MinMaxSize sizes = RunComputeMinAndMax(container);
+ MinMaxSizes sizes = RunComputeMinMaxSizes(container);
EXPECT_EQ(LayoutUnit(30), sizes.min_size);
EXPECT_EQ(LayoutUnit(70), sizes.max_size);
}
@@ -1748,7 +1647,7 @@ TEST_F(NGBlockLayoutAlgorithmTest,
NGBlockNode container(ToLayoutBox(GetLayoutObjectByElementId("container")));
- MinMaxSize sizes = RunComputeMinAndMax(container);
+ MinMaxSizes sizes = RunComputeMinMaxSizes(container);
EXPECT_EQ(LayoutUnit(), sizes.min_size);
EXPECT_EQ(LayoutUnit(), sizes.max_size);
}
View Lorry Controller Status