LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-diamond-margin-polygon.html - Issue 14959014: [CSS Exclusions] Programmatic layout tests fail when subpixel layout is disabled

Unified Diff: LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-diamond-margin-polygon.html

Issue 14959014: [CSS Exclusions] Programmatic layout tests fail when subpixel layout is disabled (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 7 years, 7 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

« LayoutTests/fast/exclusions/shape-inside/shape-inside-polygon-padding-003.html ('K') | « LayoutTests/fast/exclusions/shape-inside/shape-inside-rounded-rectangle-fit-002-expected.html ('k') | LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-diamond-margin-polygon-expected.txt » ('j') | Source/core/rendering/exclusions/ExclusionPolygon.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-diamond-margin-polygon.html

diff --git a/LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-diamond-margin-polygon.html b/LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-diamond-margin-polygon.html

index 213839cd85bb47cc7911aa0824848a29d8026f46..31d40cd8ec02dc316ad8ccce8b6c5ad4b1d71034 100644

--- a/LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-diamond-margin-polygon.html

+++ b/LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-diamond-margin-polygon.html

@@ -12,7 +12,7 @@

#container {

font: 20px/1 Ahem, sans-serif;

width: 200px;

- height: 300px;

+ height: 150px;

}

#float-left {

@@ -25,14 +25,14 @@

#svg-shape {

position: absolute;

- display:block;

+ display: block;

+ top: 0px;

+ left: 0px;

width: 100px;

height: 100px;

}

</style>

<body>

-<p></p>

@@ -41,9 +41,10 @@

</div>

</div>

+<div id="console"></div>

</body>

-function elementRect(elementId)

+function elementRect(elementId)

{

var s = document.getElementById("container").getBoundingClientRect();

var r = document.getElementById(elementId).getBoundingClientRect();

@@ -58,27 +59,29 @@ function elementRect(elementId)

function marginLeftXIntercept(lineNumber)

{

- return SubPixelLayout.roundLineLeft(lineNumber * 20 + 20 * Math.sqrt(2) + 50);

+ var f = SubPixelLayout.snapToLayoutUnit(lineNumber * 20 + 20 * Math.sqrt(2) + 50);

+ return Math.round(f);

}

+var quiet = true; // PASS output depends on SubPixelLayout.isEnabled()

shouldBe("elementRect('l1').top", "0");

-shouldBeCloseTo("elementRect('l1').left", marginLeftXIntercept(1), 1);

+shouldBeCloseTo("elementRect('l1').left", marginLeftXIntercept(1), 1, quiet);

shouldBe("elementRect('l2').top", "20");

-shouldBeCloseTo("elementRect('l2').left", marginLeftXIntercept(2), 1);

+shouldBeCloseTo("elementRect('l2').left", marginLeftXIntercept(2), 1, quiet);

shouldBe("elementRect('l3').top", "40");

-shouldBeCloseTo("elementRect('l3').left", marginLeftXIntercept(3), 1);

+shouldBeCloseTo("elementRect('l3').left", marginLeftXIntercept(3), 1, quiet);

shouldBe("elementRect('l4').top", "80");

-shouldBeCloseTo("elementRect('l4').left", marginLeftXIntercept(3), 1);

+shouldBeCloseTo("elementRect('l4').left", marginLeftXIntercept(3), 1, quiet);

shouldBe("elementRect('l5').top", "100");

-shouldBeCloseTo("elementRect('l5').left", marginLeftXIntercept(2), 1);

+shouldBeCloseTo("elementRect('l5').left", marginLeftXIntercept(2), 1, quiet);

shouldBe("elementRect('l6').top", "120");

-shouldBeCloseTo("elementRect('l6').left", marginLeftXIntercept(1), 1);

+shouldBeCloseTo("elementRect('l6').left", marginLeftXIntercept(1), 1, quiet);

</script>

</html>