third_party/WebKit/Source/core/layout/shapes/BoxShapeTest.cpp - Issue 1656743002: Removing more implicit LayoutUnit construction

Unified Diff: third_party/WebKit/Source/core/layout/shapes/BoxShapeTest.cpp

Issue 1656743002: Removing more implicit LayoutUnit construction (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix additional test Created 4 years, 11 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

« no previous file with comments | « third_party/WebKit/Source/core/layout/line/InlineTextBox.cpp ('k') | third_party/WebKit/Source/core/layout/svg/line/SVGInlineTextBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/shapes/BoxShapeTest.cpp

diff --git a/third_party/WebKit/Source/core/layout/shapes/BoxShapeTest.cpp b/third_party/WebKit/Source/core/layout/shapes/BoxShapeTest.cpp

index f302ee6089086c30a56b5cf7ea6b72475010b6b7..97a9b691ebca13b398dd368b3c7a27559c57d865 100644

--- a/third_party/WebKit/Source/core/layout/shapes/BoxShapeTest.cpp

+++ b/third_party/WebKit/Source/core/layout/shapes/BoxShapeTest.cpp

@@ -92,15 +92,15 @@ TEST_F(BoxShapeTest, zeroRadii)

EXPECT_FALSE(shape->lineOverlapsShapeMarginBounds(LayoutUnit(60), LayoutUnit(1)));

EXPECT_FALSE(shape->lineOverlapsShapeMarginBounds(LayoutUnit(100), LayoutUnit(200)));

- TEST_EXCLUDED_INTERVAL(shape, -9, 1, -10, 110);

- TEST_EXCLUDED_INTERVAL(shape, -10, 0, -10, 110);

- TEST_EXCLUDED_INTERVAL(shape, -10, 200, -10, 110);

- TEST_EXCLUDED_INTERVAL(shape, 5, 10, -10, 110);

- TEST_EXCLUDED_INTERVAL(shape, 59, 1, -10, 110);

- TEST_NO_EXCLUDED_INTERVAL(shape, -12, 2);

- TEST_NO_EXCLUDED_INTERVAL(shape, 60, 1);

- TEST_NO_EXCLUDED_INTERVAL(shape, 100, 200);

+ TEST_EXCLUDED_INTERVAL(shape, LayoutUnit(-9), LayoutUnit(1), -10, 110);

+ TEST_EXCLUDED_INTERVAL(shape, LayoutUnit(-10), LayoutUnit(0), -10, 110);

+ TEST_EXCLUDED_INTERVAL(shape, LayoutUnit(-10), LayoutUnit(200), -10, 110);

+ TEST_EXCLUDED_INTERVAL(shape, LayoutUnit(5), LayoutUnit(10), -10, 110);

+ TEST_EXCLUDED_INTERVAL(shape, LayoutUnit(59), LayoutUnit(1), -10, 110);

+ TEST_NO_EXCLUDED_INTERVAL(shape, LayoutUnit(-12), LayoutUnit(2));

+ TEST_NO_EXCLUDED_INTERVAL(shape, LayoutUnit(60), LayoutUnit(1));

+ TEST_NO_EXCLUDED_INTERVAL(shape, LayoutUnit(100), LayoutUnit(200));

}

/* BoxShape geometry for this test. Corner radii are in parens, x and y intercepts

@@ -123,12 +123,12 @@ TEST_F(BoxShapeTest, getIntervals)

EXPECT_EQ(LayoutRect(0, 0, 100, 100), shape->shapeMarginLogicalBoundingBox());

- TEST_EXCLUDED_INTERVAL(shape, 10, 95, 0, 100);

- TEST_EXCLUDED_INTERVAL(shape, 5, 25, 0, 100);

- TEST_EXCLUDED_INTERVAL(shape, 15, 6, 0, 100);

- TEST_EXCLUDED_INTERVAL(shape, 20, 50, 0, 100);

- TEST_EXCLUDED_INTERVAL(shape, 69, 5, 0, 100);

- TEST_EXCLUDED_INTERVAL(shape, 85, 10, 0, 97.320511f);

+ TEST_EXCLUDED_INTERVAL(shape, LayoutUnit(10), LayoutUnit(95), 0, 100);

+ TEST_EXCLUDED_INTERVAL(shape, LayoutUnit(5), LayoutUnit(25), 0, 100);

+ TEST_EXCLUDED_INTERVAL(shape, LayoutUnit(15), LayoutUnit(6), 0, 100);

+ TEST_EXCLUDED_INTERVAL(shape, LayoutUnit(20), LayoutUnit(50), 0, 100);

+ TEST_EXCLUDED_INTERVAL(shape, LayoutUnit(69), LayoutUnit(5), 0, 100);

+ TEST_EXCLUDED_INTERVAL(shape, LayoutUnit(85), LayoutUnit(10), 0, 97.320511f);

}

} // anonymous namespace