Commit b5f39e86 authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

Renaming unit_test function ConstructConstraintSpace to not collide

ng_block_layout_algorithm_test and ng_constraint_space both use a local
function ConstructConstraintSpace for testing. That is normally
no big deal but in jumbo builds they can be compiled in
the same translation unit and then the functions will collide.
This patch gives the functions unique names.

R=fs@opera.com

Change-Id: I3941094aad201b7ec6796d63664da8cfba8056c3
Reviewed-on: https://chromium-review.googlesource.com/574237Reviewed-by: default avatarFredrik Söderquist <fs@opera.com>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#487072}
parent 3e1f3ae5
......@@ -13,7 +13,7 @@ namespace blink {
namespace {
RefPtr<NGConstraintSpace> ConstructConstraintSpace(
RefPtr<NGConstraintSpace> ConstructTestConstraintSpace(
NGWritingMode writing_mode,
TextDirection direction,
NGLogicalSize size,
......@@ -33,8 +33,8 @@ TEST(NGConstraintSpaceTest, LayoutOpportunitiesNoExclusions) {
NGLogicalSize size;
size.inline_size = LayoutUnit(600);
size.block_size = LayoutUnit(400);
RefPtr<NGConstraintSpace> space =
ConstructConstraintSpace(kHorizontalTopBottom, TextDirection::kLtr, size);
RefPtr<NGConstraintSpace> space = ConstructTestConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr, size);
NGLayoutOpportunityIterator iterator(
space->Exclusions().get(), space->AvailableSize(), NGLogicalOffset());
......@@ -50,8 +50,8 @@ TEST(NGConstraintSpaceTest, LayoutOpportunitiesTopRightExclusion) {
size.inline_size = LayoutUnit(600);
size.block_size = LayoutUnit(400);
// Create a space with a 100x100 exclusion in the top right corner.
RefPtr<NGConstraintSpace> space =
ConstructConstraintSpace(kHorizontalTopBottom, TextDirection::kLtr, size);
RefPtr<NGConstraintSpace> space = ConstructTestConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr, size);
NGExclusion exclusion;
exclusion.rect.size = {LayoutUnit(100), LayoutUnit(100)};
exclusion.rect.offset = {LayoutUnit(500), LayoutUnit()};
......@@ -77,8 +77,8 @@ TEST(NGConstraintSpaceTest, LayoutOpportunitiesTopLeftExclusion) {
size.inline_size = LayoutUnit(600);
size.block_size = LayoutUnit(400);
// Create a space with a 100x100 exclusion in the top left corner.
RefPtr<NGConstraintSpace> space =
ConstructConstraintSpace(kHorizontalTopBottom, TextDirection::kLtr, size);
RefPtr<NGConstraintSpace> space = ConstructTestConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr, size);
NGExclusion exclusion;
exclusion.rect.size = {LayoutUnit(100), LayoutUnit(100)};
space->AddExclusion(exclusion);
......@@ -126,8 +126,8 @@ TEST(NGConstraintSpaceTest, LayoutOpportunitiesTwoInMiddle) {
NGLogicalSize size;
size.inline_size = LayoutUnit(600);
size.block_size = LayoutUnit(400);
RefPtr<NGConstraintSpace> space =
ConstructConstraintSpace(kHorizontalTopBottom, TextDirection::kLtr, size);
RefPtr<NGConstraintSpace> space = ConstructTestConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr, size);
// Add exclusions
NGExclusion exclusion1;
exclusion1.rect.size = {LayoutUnit(100), LayoutUnit(100)};
......@@ -189,8 +189,8 @@ TEST(NGConstraintSpaceTest, LayoutOpportunitiesTwoInMiddle) {
// available constraint space, i.e. 0,0 600x200
TEST(NGConstraintSpaceTest, LayoutOpportunitiesWithOutOfBoundsExclusions) {
NGLogicalSize size = {LayoutUnit(600), LayoutUnit(100)};
RefPtr<NGConstraintSpace> space =
ConstructConstraintSpace(kHorizontalTopBottom, TextDirection::kLtr, size);
RefPtr<NGConstraintSpace> space = ConstructTestConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr, size);
NGExclusion exclusion;
exclusion.rect.size = {LayoutUnit(100), LayoutUnit(100)};
exclusion.rect.offset = {LayoutUnit(), LayoutUnit(150)};
......@@ -208,9 +208,9 @@ TEST(NGConstraintSpaceTest, LayoutOpportunitiesWithOutOfBoundsExclusions) {
// Verifies that we combine 2 adjoining left exclusions into one left exclusion.
TEST(NGConstraintSpaceTest, TwoLeftExclusionsShadowEachOther) {
NGLogicalOffset bfc_offset = {LayoutUnit(8), LayoutUnit(8)};
RefPtr<NGConstraintSpace> space =
ConstructConstraintSpace(kHorizontalTopBottom, TextDirection::kLtr,
{LayoutUnit(200), LayoutUnit(200)}, bfc_offset);
RefPtr<NGConstraintSpace> space = ConstructTestConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr,
{LayoutUnit(200), LayoutUnit(200)}, bfc_offset);
NGExclusion small_left;
small_left.rect.size = {LayoutUnit(10), LayoutUnit(10)};
......@@ -250,9 +250,9 @@ TEST(NGConstraintSpaceTest, TwoLeftExclusionsShadowEachOther) {
// exclusion.
TEST(NGConstraintSpaceTest, TwoRightExclusionsShadowEachOther) {
NGLogicalOffset bfc_offset = {LayoutUnit(8), LayoutUnit(8)};
RefPtr<NGConstraintSpace> space =
ConstructConstraintSpace(kHorizontalTopBottom, TextDirection::kLtr,
{LayoutUnit(200), LayoutUnit(200)}, bfc_offset);
RefPtr<NGConstraintSpace> space = ConstructTestConstraintSpace(
kHorizontalTopBottom, TextDirection::kLtr,
{LayoutUnit(200), LayoutUnit(200)}, bfc_offset);
NGExclusion small_right;
small_right.rect.size = {LayoutUnit(10), LayoutUnit(10)};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment