Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(96)

Unified Diff: third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm_test.cc

Issue 2921463004: [LayoutNG] PODify NGLayoutInputNode and sub-classes. (Closed)
Patch Set: new ng-bot expectations Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 75c5210c251a95f1eb05863c6b107eb9d7516972..0c522c76703c20f2ba3b950c396bc5dcce0bbd0f 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
@@ -60,14 +60,14 @@ class NGBlockLayoutAlgorithmTest : public NGBaseLayoutAlgorithmTest {
RefPtr<NGPhysicalBoxFragment> RunBlockLayoutAlgorithm(
NGConstraintSpace* space,
- NGBlockNode* node) {
+ NGBlockNode node) {
RefPtr<NGLayoutResult> result =
NGBlockLayoutAlgorithm(node, space).Layout();
return ToNGPhysicalBoxFragment(result->PhysicalFragment().Get());
}
- MinMaxContentSize RunComputeMinAndMax(NGBlockNode* node) {
+ MinMaxContentSize RunComputeMinAndMax(NGBlockNode node) {
// The constraint space is not used for min/max computation, but we need
// it to create the algorithm.
RefPtr<NGConstraintSpace> space =
@@ -122,7 +122,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, FixedSize) {
kHorizontalTopBottom, TextDirection::kLtr,
NGLogicalSize(LayoutUnit(100), NGSizeIndefinite));
- auto* box = new NGBlockNode(GetLayoutObjectByElementId("box"));
+ NGBlockNode box(ToLayoutBox(GetLayoutObjectByElementId("box")));
RefPtr<NGPhysicalFragment> frag = RunBlockLayoutAlgorithm(space.Get(), box);
@@ -144,7 +144,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, LayoutBlockChildren) {
const int kHeight2 = 30;
const int kMarginTop = 5;
- auto* container = new NGBlockNode(GetLayoutObjectByElementId("container"));
+ NGBlockNode container(ToLayoutBox(GetLayoutObjectByElementId("container")));
RefPtr<NGConstraintSpace> space = ConstructConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr,
NGLogicalSize(LayoutUnit(100), NGSizeIndefinite));
@@ -188,7 +188,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, LayoutBlockChildrenWithWritingMode) {
const int kHeight = 50;
const int kMarginLeft = 100;
- auto* container = new NGBlockNode(GetLayoutObjectByElementId("container"));
+ NGBlockNode container(ToLayoutBox(GetLayoutObjectByElementId("container")));
RefPtr<NGConstraintSpace> space =
ConstructConstraintSpace(kHorizontalTopBottom, TextDirection::kLtr,
NGLogicalSize(LayoutUnit(500), LayoutUnit(500)));
@@ -607,7 +607,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, DISABLED_CollapsingMarginsCase6) {
const int kMarginBottom = 10;
const int kMarginTop = 40;
- auto* container = new NGBlockNode(GetLayoutObjectByElementId("container"));
+ NGBlockNode container(ToLayoutBox(GetLayoutObjectByElementId("container")));
RefPtr<NGConstraintSpace> space =
ConstructConstraintSpace(kHorizontalTopBottom, TextDirection::kLtr,
NGLogicalSize(LayoutUnit(500), LayoutUnit(500)));
@@ -711,7 +711,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, BorderAndPadding) {
const int kPaddingBottom = 7;
const int kPaddingLeft = 8;
- auto* container = new NGBlockNode(GetLayoutObjectByElementId("container"));
+ NGBlockNode container(ToLayoutBox(GetLayoutObjectByElementId("container")));
RefPtr<NGConstraintSpace> space = ConstructConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr,
@@ -748,7 +748,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, PercentageResolutionSize) {
const int kPaddingLeft = 10;
const int kWidth = 30;
- auto* container = new NGBlockNode(GetLayoutObjectByElementId("container"));
+ NGBlockNode container(ToLayoutBox(GetLayoutObjectByElementId("container")));
RefPtr<NGConstraintSpace> space = ConstructConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr,
@@ -780,7 +780,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, AutoMargin) {
const int kWidth = 30;
const int kChildWidth = 10;
- auto* container = new NGBlockNode(GetLayoutObjectByElementId("container"));
+ NGBlockNode container(ToLayoutBox(GetLayoutObjectByElementId("container")));
RefPtr<NGConstraintSpace> space = ConstructConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr,
@@ -1198,7 +1198,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, ComputeMinMaxContent) {
const int kSecondChildWidth = 30;
- auto* container = new NGBlockNode(GetLayoutObjectByElementId("container"));
+ NGBlockNode container(ToLayoutBox(GetLayoutObjectByElementId("container")));
MinMaxContentSize sizes = RunComputeMinAndMax(container);
EXPECT_EQ(kSecondChildWidth, sizes.min_content);
@@ -1215,7 +1215,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, ShrinkToFit) {
)HTML");
const int kWidthChild2 = 30;
- auto* container = new NGBlockNode(GetLayoutObjectByElementId("container"));
+ NGBlockNode container(ToLayoutBox(GetLayoutObjectByElementId("container")));
RefPtr<NGConstraintSpace> space = ConstructConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr,
@@ -1245,7 +1245,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, DISABLED_EmptyMulticol) {
</div>
)HTML");
- auto* container = new NGBlockNode(GetLayoutObjectByElementId("container"));
+ NGBlockNode container(ToLayoutBox(GetLayoutObjectByElementId("container")));
RefPtr<NGConstraintSpace> space = ConstructConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr,
NGLogicalSize(LayoutUnit(1000), NGSizeIndefinite));
@@ -1279,7 +1279,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, DISABLED_EmptyBlock) {
</div>
)HTML");
- auto* container = new NGBlockNode(GetLayoutObjectByElementId("container"));
+ NGBlockNode container(ToLayoutBox(GetLayoutObjectByElementId("container")));
RefPtr<NGConstraintSpace> space = ConstructConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr,
NGLogicalSize(LayoutUnit(1000), NGSizeIndefinite));
@@ -1322,7 +1322,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, DISABLED_BlockInOneColumn) {
</div>
)HTML");
- auto* container = new NGBlockNode(GetLayoutObjectByElementId("container"));
+ NGBlockNode container(ToLayoutBox(GetLayoutObjectByElementId("container")));
RefPtr<NGConstraintSpace> space = ConstructConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr,
NGLogicalSize(LayoutUnit(1000), NGSizeIndefinite));
@@ -1365,7 +1365,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, DISABLED_BlockInTwoColumns) {
</div>
)HTML");
- auto* container = new NGBlockNode(GetLayoutObjectByElementId("container"));
+ NGBlockNode container(ToLayoutBox(GetLayoutObjectByElementId("container")));
RefPtr<NGConstraintSpace> space = ConstructConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr,
NGLogicalSize(LayoutUnit(1000), NGSizeIndefinite));
@@ -1417,7 +1417,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, DISABLED_BlockInThreeColumns) {
</div>
)HTML");
- auto* container = new NGBlockNode(GetLayoutObjectByElementId("container"));
+ NGBlockNode container(ToLayoutBox(GetLayoutObjectByElementId("container")));
RefPtr<NGConstraintSpace> space = ConstructConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr,
NGLogicalSize(LayoutUnit(1000), NGSizeIndefinite));
@@ -1478,7 +1478,7 @@ TEST_F(NGBlockLayoutAlgorithmTest,
</div>
)HTML");
- auto* container = new NGBlockNode(GetLayoutObjectByElementId("container"));
+ NGBlockNode container(ToLayoutBox(GetLayoutObjectByElementId("container")));
RefPtr<NGConstraintSpace> space = ConstructConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr,
NGLogicalSize(LayoutUnit(1000), NGSizeIndefinite));
@@ -1540,7 +1540,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, DISABLED_TwoBlocksInTwoColumns) {
</div>
)HTML");
- auto* container = new NGBlockNode(GetLayoutObjectByElementId("container"));
+ NGBlockNode container(ToLayoutBox(GetLayoutObjectByElementId("container")));
RefPtr<NGConstraintSpace> space = ConstructConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr,
NGLogicalSize(LayoutUnit(1000), NGSizeIndefinite));
@@ -1604,7 +1604,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, DISABLED_OverflowedBlock) {
</div>
)HTML");
- auto* container = new NGBlockNode(GetLayoutObjectByElementId("container"));
+ NGBlockNode container(ToLayoutBox(GetLayoutObjectByElementId("container")));
RefPtr<NGConstraintSpace> space = ConstructConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr,
NGLogicalSize(LayoutUnit(1000), NGSizeIndefinite));
@@ -1679,7 +1679,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, DISABLED_FloatInOneColumn) {
</div>
)HTML");
- auto* container = new NGBlockNode(GetLayoutObjectByElementId("container"));
+ NGBlockNode container(ToLayoutBox(GetLayoutObjectByElementId("container")));
RefPtr<NGConstraintSpace> space = ConstructConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr,
NGLogicalSize(LayoutUnit(1000), NGSizeIndefinite));
@@ -1725,7 +1725,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, DISABLED_TwoFloatsInOneColumn) {
</div>
)HTML");
- auto* container = new NGBlockNode(GetLayoutObjectByElementId("container"));
+ NGBlockNode container(ToLayoutBox(GetLayoutObjectByElementId("container")));
RefPtr<NGConstraintSpace> space = ConstructConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr,
NGLogicalSize(LayoutUnit(1000), NGSizeIndefinite));
@@ -1777,7 +1777,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, DISABLED_TwoFloatsInTwoColumns) {
</div>
)HTML");
- auto* container = new NGBlockNode(GetLayoutObjectByElementId("container"));
+ NGBlockNode container(ToLayoutBox(GetLayoutObjectByElementId("container")));
RefPtr<NGConstraintSpace> space = ConstructConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr,
NGLogicalSize(LayoutUnit(1000), NGSizeIndefinite));
@@ -1974,8 +1974,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, NoFragmentation) {
LayoutUnit kFragmentainerSpaceAvailable(200);
- NGBlockNode* node = new NGBlockNode(
- ToLayoutBlockFlow(GetLayoutObjectByElementId("container")));
+ NGBlockNode node(ToLayoutBox(GetLayoutObjectByElementId("container")));
RefPtr<NGConstraintSpace> space = ConstructConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr,
NGLogicalSize(LayoutUnit(1000), NGSizeIndefinite), false, true,
@@ -2003,8 +2002,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, SimpleFragmentation) {
LayoutUnit kFragmentainerSpaceAvailable(200);
- NGBlockNode* node = new NGBlockNode(
- ToLayoutBlockFlow(GetLayoutObjectByElementId("container")));
+ NGBlockNode node(ToLayoutBox(GetLayoutObjectByElementId("container")));
RefPtr<NGConstraintSpace> space = ConstructConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr,
NGLogicalSize(LayoutUnit(1000), NGSizeIndefinite), false, true,
@@ -2050,8 +2048,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, InnerChildrenFragmentation) {
LayoutUnit kFragmentainerSpaceAvailable(200);
- NGBlockNode* node = new NGBlockNode(
- ToLayoutBlockFlow(GetLayoutObjectByElementId("container")));
+ NGBlockNode node(ToLayoutBox(GetLayoutObjectByElementId("container")));
RefPtr<NGConstraintSpace> space = ConstructConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr,
NGLogicalSize(LayoutUnit(1000), NGSizeIndefinite), false, true,
@@ -2118,8 +2115,7 @@ TEST_F(NGBlockLayoutAlgorithmTest,
LayoutUnit kFragmentainerSpaceAvailable(200);
- NGBlockNode* node = new NGBlockNode(
- ToLayoutBlockFlow(GetLayoutObjectByElementId("container")));
+ NGBlockNode node(ToLayoutBox(GetLayoutObjectByElementId("container")));
RefPtr<NGConstraintSpace> space = ConstructConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr,
NGLogicalSize(LayoutUnit(1000), NGSizeIndefinite), false, true,
@@ -2184,8 +2180,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, InnerChildrenFragmentationSmallHeight) {
LayoutUnit kFragmentainerSpaceAvailable(200);
- NGBlockNode* node = new NGBlockNode(
- ToLayoutBlockFlow(GetLayoutObjectByElementId("container")));
+ NGBlockNode node(ToLayoutBox(GetLayoutObjectByElementId("container")));
RefPtr<NGConstraintSpace> space = ConstructConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr,
NGLogicalSize(LayoutUnit(1000), NGSizeIndefinite), false, true,
@@ -2251,8 +2246,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, FloatFragmentationParallelFlows) {
LayoutUnit kFragmentainerSpaceAvailable(150);
- NGBlockNode* node = new NGBlockNode(
- ToLayoutBlockFlow(GetLayoutObjectByElementId("container")));
+ NGBlockNode node(ToLayoutBlockFlow(GetLayoutObjectByElementId("container")));
RefPtr<NGConstraintSpace> space = ConstructConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr,
NGLogicalSize(LayoutUnit(1000), NGSizeIndefinite), false, true,
@@ -2334,8 +2328,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, FloatFragmentationOrthogonalFlows) {
LayoutUnit kFragmentainerSpaceAvailable(150);
- NGBlockNode* node = new NGBlockNode(
- ToLayoutBlockFlow(GetLayoutObjectByElementId("container")));
+ NGBlockNode node(ToLayoutBlockFlow(GetLayoutObjectByElementId("container")));
RefPtr<NGConstraintSpace> space = ConstructConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr,
NGLogicalSize(LayoutUnit(1000), NGSizeIndefinite), false, true,
@@ -2385,8 +2378,7 @@ TEST_F(NGBlockLayoutAlgorithmTest, DISABLED_FloatFragmentationZeroHeight) {
LayoutUnit kFragmentainerSpaceAvailable(150);
- NGBlockNode* node = new NGBlockNode(
- ToLayoutBlockFlow(GetLayoutObjectByElementId("container")));
+ NGBlockNode node(ToLayoutBlockFlow(GetLayoutObjectByElementId("container")));
RefPtr<NGConstraintSpace> space = ConstructConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr,
NGLogicalSize(LayoutUnit(1000), NGSizeIndefinite), false, true,

Powered by Google App Engine
This is Rietveld 408576698