Rewrite SVG text pattern test to avoid debug-specific pixel differences (2)

svg/transforms/text-with-pattern-inside-transformed-html.xhtml has small
pixel differences in debug and release due to antialiasing of the border.
These differences are not related to the test itself which is concerned
with SVG text and patterns.

This patch is a second attempt [1] at reworking the test to remove
debug-specific differences. This has been manually verified to be
equivalent on mac 10.11.3, and linux.

[1] https://crrev.com/271c91e974143cfd5649934a97cb284dab7dd37d

BUG=581963

Review URL: https://codereview.chromium.org/1831233003

Cr-Commit-Position: refs/heads/master@{#383343}

4 files changed, 18 insertions, 17 deletions

diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations
index 831e070..382b91b 100644
--- a/third_party/WebKit/LayoutTests/TestExpectations
+++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -126,7 +126,6 @@ crbug.com/492664 [ Mac ] imported/csswg-test/css-writing-modes-3/bidi-embed-002.
 crbug.com/492664 [ Mac ] imported/csswg-test/css-writing-modes-3/bidi-isolate-002.html [ Failure ]
 crbug.com/492664 [ Win ] imported/csswg-test/css-writing-modes-3/bidi-override-005.html [ Failure ]
 crbug.com/492664 [ Win ] imported/csswg-test/css-writing-modes-3/bidi-plaintext-001.html [ Failure ]
-crbug.com/463358 crbug.com/581963 [ Linux Mac Debug ] svg/transforms/text-with-pattern-inside-transformed-html.xhtml [ Failure ]
 crbug.com/463358 [ Mac Linux Debug ] fast/backgrounds/transformed-body-html-background.html [ Failure ]
 crbug.com/463358 [ Mac Linux Debug ] css3/masking/clip-path-polygon-nonzero.html [ Failure ]
 crbug.com/463358 [ Mac Linux ] fast/transforms/transformed-caret.html [ Pass Failure ]
@@ -134,6 +133,8 @@ crbug.com/463358 [ Mac Linux Debug ] fast/backgrounds/transformed-body-backgroun
 crbug.com/463358 [ Mac Linux Debug ] css3/masking/clip-path-polygon.html [ Failure ]
 crbug.com/463358 [ Mac Linux Debug ] svg/W3C-SVG-1.1/paths-data-02-t.svg [ Failure ]
 
+crbug.com/581963 svg/transforms/text-with-pattern-inside-transformed-html.xhtml [ NeedsRebaseline ]
+
 crbug.com/267206 [ Mac ] virtual/rootlayerscrolls/fast/scrolling/scrollbar-tickmarks-hittest.html [ Timeout ]
 
 crbug.com/582836 imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-font-face-01.html [ Failure ]
diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/transforms/text-with-pattern-inside-transformed-html-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/transforms/text-with-pattern-inside-transformed-html-expected.png
index f40f9b9..1c9f08e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/transforms/text-with-pattern-inside-transformed-html-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/transforms/text-with-pattern-inside-transformed-html-expected.png
diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/transforms/text-with-pattern-inside-transformed-html-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/svg/transforms/text-with-pattern-inside-transformed-html-expected.txt
index 6f2b168..7fc1f7a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/transforms/text-with-pattern-inside-transformed-html-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/transforms/text-with-pattern-inside-transformed-html-expected.txt
@@ -1,4 +1,4 @@
-layer at (0,0) size 800x600 scrollHeight 617
+layer at (0,0) size 800x600 scrollHeight 632
   LayoutView at (0,0) size 800x600
 layer at (0,0) size 800x534
   LayoutBlockFlow {html} at (0,0) size 800x534
@@ -9,26 +9,26 @@ layer at (0,0) size 800x534
           text run at (319,0) width 237: "objectBoundingBox patterns on text."
 layer at (58,84) size 400x400
   LayoutBlockFlow {div} at (50,68) size 400x400
-    LayoutSVGRoot {svg} at (65,57) size 480x420
+    LayoutSVGRoot {svg} at (75,31) size 496x496
       LayoutSVGResourcePattern {pattern} [id="pat1"] [patternUnits=objectBoundingBox] [patternContentUnits=userSpaceOnUse]
-        LayoutSVGRect {rect} at (167,62) size 13x13 [fill={[type=SOLID] [color=#FF0000]}] [x=5.00] [y=5.00] [width=10.00] [height=10.00]
-        LayoutSVGRect {rect} at (170,67) size 12x13 [fill={[type=SOLID] [color=#008000]}] [x=10.00] [y=10.00] [width=10.00] [height=10.00]
-      LayoutSVGRect {rect} at (167,71) size 357x173 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=PATTERN] [id="pat1"]}] [x=25.00] [y=10.00] [width=430.00] [height=60.00]
+        LayoutSVGRect {rect} at (281,36) size 14x14 [fill={[type=SOLID] [color=#FF0000]}] [x=5.00] [y=5.00] [width=10.00] [height=10.00]
+        LayoutSVGRect {rect} at (281,42) size 14x14 [fill={[type=SOLID] [color=#008000]}] [x=10.00] [y=10.00] [width=10.00] [height=10.00]
+      LayoutSVGRect {rect} at (260,50) size 292x292 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=PATTERN] [id="pat1"]}] [x=25.00] [y=10.00] [width=430.00] [height=60.00]
       LayoutSVGText {text} at (25,74) size 387x14 contains 1 chunk(s)
         LayoutSVGInlineText {#text} at (0,0) size 387x14
           chunk 1 text run 1 at (25.00,85.00) startOffset 0 endOffset 75 width 386.91: "Pattern created using red and green rectangles applied to fill of rectangle"
       LayoutSVGResourcePattern {pattern} [id="pat2"] [patternUnits=objectBoundingBox] [patternContentUnits=userSpaceOnUse]
-        LayoutSVGRect {rect} at (165,57) size 12x13 [fill={[type=SOLID] [color=#FF0000]}] [x=0.00] [y=0.00] [width=10.00] [height=10.00]
-        LayoutSVGRect {rect} at (172,60) size 13x12 [fill={[type=SOLID] [color=#008000]}] [x=10.00] [y=0.00] [width=10.00] [height=10.00]
-        LayoutSVGRect {rect} at (162,65) size 13x12 [fill={[type=SOLID] [color=#0000FF]}] [x=0.00] [y=10.00] [width=10.00] [height=10.00]
-        LayoutSVGRect {rect} at (170,67) size 12x13 [fill={[type=SOLID] [color=#FFFF00]}] [x=10.00] [y=10.00] [width=10.00] [height=10.00]
-      LayoutSVGRect {rect} at (141,142) size 357x172 [stroke={[type=PATTERN] [id="pat2"] [stroke width=20.00]}] [x=35.00] [y=110.00] [width=410.00] [height=40.00]
+        LayoutSVGRect {rect} at (281,31) size 14x13 [fill={[type=SOLID] [color=#FF0000]}] [x=0.00] [y=0.00] [width=10.00] [height=10.00]
+        LayoutSVGRect {rect} at (287,36) size 14x14 [fill={[type=SOLID] [color=#008000]}] [x=10.00] [y=0.00] [width=10.00] [height=10.00]
+        LayoutSVGRect {rect} at (275,36) size 14x14 [fill={[type=SOLID] [color=#0000FF]}] [x=0.00] [y=10.00] [width=10.00] [height=10.00]
+        LayoutSVGRect {rect} at (281,42) size 14x14 [fill={[type=SOLID] [color=#FFFF00]}] [x=10.00] [y=10.00] [width=10.00] [height=10.00]
+      LayoutSVGRect {rect} at (207,103) size 292x292 [stroke={[type=PATTERN] [id="pat2"] [stroke width=20.00]}] [x=35.00] [y=110.00] [width=410.00] [height=40.00]
       LayoutSVGText {text} at (25,164) size 302x14 contains 1 chunk(s)
         LayoutSVGInlineText {#text} at (0,0) size 302x14
           chunk 1 text run 1 at (25.00,175.00) startOffset 0 endOffset 59 width 301.52: "Pattern of 4 rectangles applied to a stroke of a rectangle."
       LayoutSVGResourcePattern {pattern} [id="pat3"] [patternUnits=objectBoundingBox] [patternContentUnits=userSpaceOnUse]
-        LayoutSVGRect {rect} at (165,57) size 12x13 [fill={[type=SOLID] [color=#FF0000]}] [x=0.00] [y=0.00] [width=10.00] [height=10.00]
-        LayoutSVGRect {rect} at (162,65) size 13x12 [fill={[type=SOLID] [color=#008000]}] [x=0.00] [y=10.00] [width=10.00] [height=10.00]
+        LayoutSVGRect {rect} at (281,31) size 14x13 [fill={[type=SOLID] [color=#FF0000]}] [x=0.00] [y=0.00] [width=10.00] [height=10.00]
+        LayoutSVGRect {rect} at (275,36) size 14x14 [fill={[type=SOLID] [color=#008000]}] [x=0.00] [y=10.00] [width=10.00] [height=10.00]
       LayoutSVGText {text} at (25,174) size 292x57 contains 1 chunk(s)
         LayoutSVGInlineText {#text} at (0,0) size 292x57
           chunk 1 text run 1 at (25.00,220.00) startOffset 0 endOffset 15 width 291.77: "Pattern on fill"
@@ -36,8 +36,8 @@ layer at (58,84) size 400x400
         LayoutSVGInlineText {#text} at (0,0) size 206x14
           chunk 1 text run 1 at (25.00,235.00) startOffset 0 endOffset 38 width 205.44: "Pattern consists of red and green rows"
       LayoutSVGResourcePattern {pattern} [id="pat4"] [patternUnits=objectBoundingBox] [patternContentUnits=userSpaceOnUse]
-        LayoutSVGRect {rect} at (165,57) size 12x13 [fill={[type=SOLID] [color=#FF0000]}] [x=0.00] [y=0.00] [width=10.00] [height=10.00]
-        LayoutSVGRect {rect} at (172,60) size 13x12 [fill={[type=SOLID] [color=#0000FF]}] [x=10.00] [y=0.00] [width=10.00] [height=10.00]
+        LayoutSVGRect {rect} at (281,31) size 14x13 [fill={[type=SOLID] [color=#FF0000]}] [x=0.00] [y=0.00] [width=10.00] [height=10.00]
+        LayoutSVGRect {rect} at (287,36) size 14x14 [fill={[type=SOLID] [color=#0000FF]}] [x=10.00] [y=0.00] [width=10.00] [height=10.00]
       LayoutSVGText {text} at (25,239) size 305x45 contains 1 chunk(s)
         LayoutSVGInlineText {#text} at (0,0) size 305x45
           chunk 1 text run 1 at (25.00,275.00) startOffset 0 endOffset 17 width 304.58: "Pattern on stroke"
@@ -47,5 +47,5 @@ layer at (58,84) size 400x400
       LayoutSVGText {text} at (10,304) size 264x46 contains 1 chunk(s)
         LayoutSVGInlineText {#text} at (0,0) size 264x46
           chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 263.31: "$Revision: 1.6 $"
-      LayoutSVGRect {rect} at (65,57) size 480x420 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
+      LayoutSVGRect {rect} at (75,31) size 496x496 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
     LayoutText {#text} at (0,0) size 0x0
diff --git a/third_party/WebKit/LayoutTests/svg/transforms/text-with-pattern-inside-transformed-html.xhtml b/third_party/WebKit/LayoutTests/svg/transforms/text-with-pattern-inside-transformed-html.xhtml
index e6e1d4e..ba9ff50 100644
--- a/third_party/WebKit/LayoutTests/svg/transforms/text-with-pattern-inside-transformed-html.xhtml
+++ b/third_party/WebKit/LayoutTests/svg/transforms/text-with-pattern-inside-transformed-html.xhtml
@@ -9,7 +9,7 @@
       height: 400px;
       width: 400px;
       margin: 50px;
-      transform: translate(30px, 30px) rotate(20deg);
+      transform: translate(30px, 30px) rotate(45deg);
     }
   </style>
 </head>