diff options
author | Rebaseline Bot <blink-rebaseline-bot@chromium.org> | 2016-03-25 15:28:24 -0700 |
---|---|---|
committer | Rebaseline Bot <blink-rebaseline-bot@chromium.org> | 2016-03-25 22:31:46 +0000 |
commit | 5b1e167ce1d26257ec579d9fdcadab8a70360f9c (patch) | |
tree | 41c3f138283b7af6c1b576c7618809839ca487c7 | |
parent | c1b7e26ae910bd1496bd80f61b11f8f831e20c65 (diff) | |
download | chromium_src-5b1e167ce1d26257ec579d9fdcadab8a70360f9c.zip chromium_src-5b1e167ce1d26257ec579d9fdcadab8a70360f9c.tar.gz chromium_src-5b1e167ce1d26257ec579d9fdcadab8a70360f9c.tar.bz2 |
Auto-rebaseline for r383343
https://chromium.googlesource.com/chromium/src/+/5fc1fc6ee
BUG=581963
TBR=pdr@chromium.org
Review URL: https://codereview.chromium.org/1833993002 .
Cr-Commit-Position: refs/heads/master@{#383387}
5 files changed, 30 insertions, 32 deletions
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations index e000f15..2ab26b2 100644 --- a/third_party/WebKit/LayoutTests/TestExpectations +++ b/third_party/WebKit/LayoutTests/TestExpectations @@ -133,8 +133,6 @@ 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/linux/svg/transforms/text-with-pattern-inside-transformed-html-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/transforms/text-with-pattern-inside-transformed-html-expected.png Binary files differindex f89256b..cade214 100644 --- a/third_party/WebKit/LayoutTests/platform/linux/svg/transforms/text-with-pattern-inside-transformed-html-expected.png +++ b/third_party/WebKit/LayoutTests/platform/linux/svg/transforms/text-with-pattern-inside-transformed-html-expected.png diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/transforms/text-with-pattern-inside-transformed-html-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/svg/transforms/text-with-pattern-inside-transformed-html-expected.txt index 6453f0e..9ad3fe6 100644 --- a/third_party/WebKit/LayoutTests/platform/linux/svg/transforms/text-with-pattern-inside-transformed-html-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/linux/svg/transforms/text-with-pattern-inside-transformed-html-expected.txt @@ -1,4 +1,4 @@ -layer at (0,0) size 800x600 scrollHeight 619 +layer at (0,0) size 800x600 scrollHeight 634 LayoutView at (0,0) size 800x600 layer at (0,0) size 800x536 LayoutBlockFlow {html} at (0,0) size 800x536 @@ -9,26 +9,26 @@ layer at (0,0) size 800x536 text run at (299,0) width 222: "objectBoundingBox patterns on text." layer at (58,86) size 400x400 LayoutBlockFlow {div} at (50,70) size 400x400 - LayoutSVGRoot {svg} at (65,59) size 480x420 + LayoutSVGRoot {svg} at (75,33) size 496x496 LayoutSVGResourcePattern {pattern} [id="pat1"] [patternUnits=objectBoundingBox] [patternContentUnits=userSpaceOnUse] - LayoutSVGRect {rect} at (167,64) size 13x13 [fill={[type=SOLID] [color=#FF0000]}] [x=5.00] [y=5.00] [width=10.00] [height=10.00] - LayoutSVGRect {rect} at (170,69) size 12x13 [fill={[type=SOLID] [color=#008000]}] [x=10.00] [y=10.00] [width=10.00] [height=10.00] - LayoutSVGRect {rect} at (167,73) 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,38) size 14x14 [fill={[type=SOLID] [color=#FF0000]}] [x=5.00] [y=5.00] [width=10.00] [height=10.00] + LayoutSVGRect {rect} at (281,44) size 14x14 [fill={[type=SOLID] [color=#008000]}] [x=10.00] [y=10.00] [width=10.00] [height=10.00] + LayoutSVGRect {rect} at (260,52) 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,73) size 418x16 contains 1 chunk(s) LayoutSVGInlineText {#text} at (0,0) size 418x16 chunk 1 text run 1 at (25.00,85.00) startOffset 0 endOffset 75 width 417.60: "Pattern created using red and green rectangles applied to fill of rectangle" LayoutSVGResourcePattern {pattern} [id="pat2"] [patternUnits=objectBoundingBox] [patternContentUnits=userSpaceOnUse] - LayoutSVGRect {rect} at (165,59) size 12x13 [fill={[type=SOLID] [color=#FF0000]}] [x=0.00] [y=0.00] [width=10.00] [height=10.00] - LayoutSVGRect {rect} at (172,62) size 13x12 [fill={[type=SOLID] [color=#008000]}] [x=10.00] [y=0.00] [width=10.00] [height=10.00] - LayoutSVGRect {rect} at (162,67) size 13x12 [fill={[type=SOLID] [color=#0000FF]}] [x=0.00] [y=10.00] [width=10.00] [height=10.00] - LayoutSVGRect {rect} at (170,69) size 12x13 [fill={[type=SOLID] [color=#FFFF00]}] [x=10.00] [y=10.00] [width=10.00] [height=10.00] - LayoutSVGRect {rect} at (141,144) 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,33) size 14x13 [fill={[type=SOLID] [color=#FF0000]}] [x=0.00] [y=0.00] [width=10.00] [height=10.00] + LayoutSVGRect {rect} at (287,38) size 14x14 [fill={[type=SOLID] [color=#008000]}] [x=10.00] [y=0.00] [width=10.00] [height=10.00] + LayoutSVGRect {rect} at (275,38) size 14x14 [fill={[type=SOLID] [color=#0000FF]}] [x=0.00] [y=10.00] [width=10.00] [height=10.00] + LayoutSVGRect {rect} at (281,44) size 14x14 [fill={[type=SOLID] [color=#FFFF00]}] [x=10.00] [y=10.00] [width=10.00] [height=10.00] + LayoutSVGRect {rect} at (207,105) 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,163) size 322x16 contains 1 chunk(s) LayoutSVGInlineText {#text} at (0,0) size 322x16 chunk 1 text run 1 at (25.00,175.00) startOffset 0 endOffset 59 width 321.60: "Pattern of 4 rectangles applied to a stroke of a rectangle." LayoutSVGResourcePattern {pattern} [id="pat3"] [patternUnits=objectBoundingBox] [patternContentUnits=userSpaceOnUse] - LayoutSVGRect {rect} at (165,59) size 12x13 [fill={[type=SOLID] [color=#FF0000]}] [x=0.00] [y=0.00] [width=10.00] [height=10.00] - LayoutSVGRect {rect} at (162,67) size 13x12 [fill={[type=SOLID] [color=#008000]}] [x=0.00] [y=10.00] [width=10.00] [height=10.00] + LayoutSVGRect {rect} at (281,33) size 14x13 [fill={[type=SOLID] [color=#FF0000]}] [x=0.00] [y=0.00] [width=10.00] [height=10.00] + LayoutSVGRect {rect} at (275,38) 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 298x57 contains 1 chunk(s) LayoutSVGInlineText {#text} at (0,0) size 298x57 chunk 1 text run 1 at (25.00,220.00) startOffset 0 endOffset 15 width 297.60: "Pattern on fill" @@ -36,8 +36,8 @@ layer at (58,86) size 400x400 LayoutSVGInlineText {#text} at (0,0) size 214x16 chunk 1 text run 1 at (25.00,235.00) startOffset 0 endOffset 38 width 212.40: "Pattern consists of red and green rows" LayoutSVGResourcePattern {pattern} [id="pat4"] [patternUnits=objectBoundingBox] [patternContentUnits=userSpaceOnUse] - LayoutSVGRect {rect} at (165,59) size 12x13 [fill={[type=SOLID] [color=#FF0000]}] [x=0.00] [y=0.00] [width=10.00] [height=10.00] - LayoutSVGRect {rect} at (172,62) size 13x12 [fill={[type=SOLID] [color=#0000FF]}] [x=10.00] [y=0.00] [width=10.00] [height=10.00] + LayoutSVGRect {rect} at (281,33) size 14x13 [fill={[type=SOLID] [color=#FF0000]}] [x=0.00] [y=0.00] [width=10.00] [height=10.00] + LayoutSVGRect {rect} at (287,38) size 14x14 [fill={[type=SOLID] [color=#0000FF]}] [x=10.00] [y=0.00] [width=10.00] [height=10.00] LayoutSVGText {text} at (25,237) size 292x47 contains 1 chunk(s) LayoutSVGInlineText {#text} at (0,0) size 292x46 chunk 1 text run 1 at (25.00,275.00) startOffset 0 endOffset 17 width 291.60: "Pattern on stroke" @@ -47,5 +47,5 @@ layer at (58,86) size 400x400 LayoutSVGText {text} at (10,305) size 258x45 contains 1 chunk(s) LayoutSVGInlineText {#text} at (0,0) size 258x45 chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 258.00: "$Revision: 1.6 $" - LayoutSVGRect {rect} at (65,59) size 480x420 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00] + LayoutSVGRect {rect} at (75,33) 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/platform/win/svg/transforms/text-with-pattern-inside-transformed-html-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/transforms/text-with-pattern-inside-transformed-html-expected.png Binary files differindex 81981b1..b64270a 100644 --- a/third_party/WebKit/LayoutTests/platform/win/svg/transforms/text-with-pattern-inside-transformed-html-expected.png +++ b/third_party/WebKit/LayoutTests/platform/win/svg/transforms/text-with-pattern-inside-transformed-html-expected.png diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/transforms/text-with-pattern-inside-transformed-html-expected.txt b/third_party/WebKit/LayoutTests/platform/win/svg/transforms/text-with-pattern-inside-transformed-html-expected.txt index f32c008..dda4fbe 100644 --- a/third_party/WebKit/LayoutTests/platform/win/svg/transforms/text-with-pattern-inside-transformed-html-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/win/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,73) size 414x16 contains 1 chunk(s) LayoutSVGInlineText {#text} at (0,0) size 414x16 chunk 1 text run 1 at (25.00,85.00) startOffset 0 endOffset 75 width 414.00: "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,163) size 320x16 contains 1 chunk(s) LayoutSVGInlineText {#text} at (0,0) size 320x16 chunk 1 text run 1 at (25.00,175.00) startOffset 0 endOffset 59 width 319.20: "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 213x16 chunk 1 text run 1 at (25.00,235.00) startOffset 0 endOffset 38 width 211.20: "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 264x45 contains 1 chunk(s) LayoutSVGInlineText {#text} at (0,0) size 264x45 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 |