| Index: LayoutTests/platform/win/svg/W3C-SVG-1.1/filters-composite-02-b-expected.txt
|
| diff --git a/LayoutTests/platform/win/svg/W3C-SVG-1.1/filters-composite-02-b-expected.txt b/LayoutTests/platform/win/svg/W3C-SVG-1.1/filters-composite-02-b-expected.txt
|
| index cd4232cd6001e996e3307ca2a5596b81eb653ccb..e974dc9e1f530af7c4d75d4c221ba8428d09ee5a 100644
|
| --- a/LayoutTests/platform/win/svg/W3C-SVG-1.1/filters-composite-02-b-expected.txt
|
| +++ b/LayoutTests/platform/win/svg/W3C-SVG-1.1/filters-composite-02-b-expected.txt
|
| @@ -8,51 +8,51 @@ layer at (0,0) size 480x360
|
| RenderSVGPath {path} at (15,0) size 150x90 [fill={[type=SOLID] [color=#FF00FF]}] [data="M 0 0 L 0 150 L 150 0 Z"]
|
| RenderSVGPath {path} at (15,0) size 150x90 [fill={[type=SOLID] [color=#00FFFF] [opacity=0.50]}] [data="M 0 0 L 150 0 L 150 150 Z"]
|
| RenderSVGPath {path} at (15,0) size 150x90 [fill={[type=SOLID] [color=#FF00FF] [opacity=0.50]}] [data="M 0 0 L 0 150 L 150 0 Z"]
|
| - RenderSVGResourceFilter {filter} [id="over"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
|
| + LayoutSVGResourceFilter {filter} [id="over"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
|
| [feComposite operation="OVER"]
|
| [feImage image-size="150x150"]
|
| [feImage image-size="150x150"]
|
| - RenderSVGResourceFilter {filter} [id="over50"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
|
| + LayoutSVGResourceFilter {filter} [id="over50"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
|
| [feComposite operation="OVER"]
|
| [feImage image-size="150x150"]
|
| [feImage image-size="150x150"]
|
| - RenderSVGResourceFilter {filter} [id="in"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
|
| + LayoutSVGResourceFilter {filter} [id="in"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
|
| [feComposite operation="IN"]
|
| [feImage image-size="150x150"]
|
| [feImage image-size="150x150"]
|
| - RenderSVGResourceFilter {filter} [id="in50"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
|
| + LayoutSVGResourceFilter {filter} [id="in50"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
|
| [feComposite operation="IN"]
|
| [feImage image-size="150x150"]
|
| [feImage image-size="150x150"]
|
| - RenderSVGResourceFilter {filter} [id="out"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
|
| + LayoutSVGResourceFilter {filter} [id="out"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
|
| [feComposite operation="OUT"]
|
| [feImage image-size="150x150"]
|
| [feImage image-size="150x150"]
|
| - RenderSVGResourceFilter {filter} [id="out50"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
|
| + LayoutSVGResourceFilter {filter} [id="out50"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
|
| [feComposite operation="OUT"]
|
| [feImage image-size="150x150"]
|
| [feImage image-size="150x150"]
|
| - RenderSVGResourceFilter {filter} [id="atop"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
|
| + LayoutSVGResourceFilter {filter} [id="atop"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
|
| [feComposite operation="ATOP"]
|
| [feImage image-size="150x150"]
|
| [feImage image-size="150x150"]
|
| - RenderSVGResourceFilter {filter} [id="atop50"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
|
| + LayoutSVGResourceFilter {filter} [id="atop50"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
|
| [feComposite operation="ATOP"]
|
| [feImage image-size="150x150"]
|
| [feImage image-size="150x150"]
|
| - RenderSVGResourceFilter {filter} [id="xor"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
|
| + LayoutSVGResourceFilter {filter} [id="xor"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
|
| [feComposite operation="XOR"]
|
| [feImage image-size="150x150"]
|
| [feImage image-size="150x150"]
|
| - RenderSVGResourceFilter {filter} [id="xor50"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
|
| + LayoutSVGResourceFilter {filter} [id="xor50"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
|
| [feComposite operation="XOR"]
|
| [feImage image-size="150x150"]
|
| [feImage image-size="150x150"]
|
| - RenderSVGResourceFilter {filter} [id="arithmetic"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
|
| + LayoutSVGResourceFilter {filter} [id="arithmetic"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
|
| [feComposite operation="ARITHMETIC" k1="0.50" k2="0.50" k3="0.50" k4="0.50"]
|
| [feImage image-size="150x150"]
|
| [feImage image-size="150x150"]
|
| - RenderSVGResourceFilter {filter} [id="arithmetic50"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
|
| + LayoutSVGResourceFilter {filter} [id="arithmetic50"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
|
| [feComposite operation="ARITHMETIC" k1="0.50" k2="0.50" k3="0.50" k4="0.50"]
|
| [feImage image-size="150x150"]
|
| [feImage image-size="150x150"]
|
| @@ -66,52 +66,52 @@ layer at (0,0) size 480x360
|
| chunk 1 text run 1 at (100.00,180.00) startOffset 0 endOffset 25 width 794.74: "on second row opacity 0.5"
|
| RenderSVGContainer {g} at (26,102) size 60x165 [transform={m=((1.00,0.00)(0.00,1.00)) t=(15.00,230.00)}]
|
| RenderSVGRect {rect} at (26,102) size 60x60 [fill={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=150.00] [height=150.00]
|
| - [filter="over"] RenderSVGResourceFilter {filter} at (0,0) size 150x150
|
| + [filter="over"] LayoutSVGResourceFilter {filter} at (0,0) size 150x150
|
| RenderSVGText {text} at (10,340) size 134x73 contains 1 chunk(s)
|
| RenderSVGInlineText {#text} at (0,0) size 134x73
|
| chunk 1 text run 1 at (10.00,400.00) startOffset 0 endOffset 4 width 133.27: "over"
|
| RenderSVGContainer {g} at (26,182) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(15.00,430.00)}]
|
| RenderSVGRect {rect} at (26,182) size 60x60 [fill={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=150.00] [height=150.00]
|
| - [filter="over50"] RenderSVGResourceFilter {filter} at (0,0) size 150x150
|
| + [filter="over50"] LayoutSVGResourceFilter {filter} at (0,0) size 150x150
|
| RenderSVGContainer {g} at (98,102) size 60x165 [transform={m=((1.00,0.00)(0.00,1.00)) t=(195.00,230.00)}]
|
| RenderSVGRect {rect} at (98,102) size 60x60 [fill={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=150.00] [height=150.00]
|
| - [filter="in"] RenderSVGResourceFilter {filter} at (0,0) size 150x150
|
| + [filter="in"] LayoutSVGResourceFilter {filter} at (0,0) size 150x150
|
| RenderSVGText {text} at (10,340) size 55x73 contains 1 chunk(s)
|
| RenderSVGInlineText {#text} at (0,0) size 55x73
|
| chunk 1 text run 1 at (10.00,400.00) startOffset 0 endOffset 2 width 54.43: "in"
|
| RenderSVGContainer {g} at (98,182) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(195.00,430.00)}]
|
| RenderSVGRect {rect} at (98,182) size 60x60 [fill={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=150.00] [height=150.00]
|
| - [filter="in50"] RenderSVGResourceFilter {filter} at (0,0) size 150x150
|
| + [filter="in50"] LayoutSVGResourceFilter {filter} at (0,0) size 150x150
|
| RenderSVGContainer {g} at (170,102) size 60x165 [transform={m=((1.00,0.00)(0.00,1.00)) t=(375.00,230.00)}]
|
| RenderSVGRect {rect} at (170,102) size 60x60 [fill={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=150.00] [height=150.00]
|
| - [filter="out"] RenderSVGResourceFilter {filter} at (0,0) size 150x150
|
| + [filter="out"] LayoutSVGResourceFilter {filter} at (0,0) size 150x150
|
| RenderSVGText {text} at (10,340) size 99x73 contains 1 chunk(s)
|
| RenderSVGInlineText {#text} at (0,0) size 99x73
|
| chunk 1 text run 1 at (10.00,400.00) startOffset 0 endOffset 3 width 98.03: "out"
|
| RenderSVGContainer {g} at (170,182) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(375.00,430.00)}]
|
| RenderSVGRect {rect} at (170,182) size 60x60 [fill={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=150.00] [height=150.00]
|
| - [filter="out50"] RenderSVGResourceFilter {filter} at (0,0) size 150x150
|
| + [filter="out50"] LayoutSVGResourceFilter {filter} at (0,0) size 150x150
|
| RenderSVGContainer {g} at (242,102) size 60x165 [transform={m=((1.00,0.00)(0.00,1.00)) t=(555.00,230.00)}]
|
| RenderSVGRect {rect} at (242,102) size 60x60 [fill={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=150.00] [height=150.00]
|
| - [filter="atop"] RenderSVGResourceFilter {filter} at (0,0) size 150x150
|
| + [filter="atop"] LayoutSVGResourceFilter {filter} at (0,0) size 150x150
|
| RenderSVGText {text} at (10,340) size 134x73 contains 1 chunk(s)
|
| RenderSVGInlineText {#text} at (0,0) size 134x73
|
| chunk 1 text run 1 at (10.00,400.00) startOffset 0 endOffset 4 width 133.48: "atop"
|
| RenderSVGContainer {g} at (242,182) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(555.00,430.00)}]
|
| RenderSVGRect {rect} at (242,182) size 60x60 [fill={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=150.00] [height=150.00]
|
| - [filter="atop50"] RenderSVGResourceFilter {filter} at (0,0) size 150x150
|
| + [filter="atop50"] LayoutSVGResourceFilter {filter} at (0,0) size 150x150
|
| RenderSVGContainer {g} at (314,102) size 60x165 [transform={m=((1.00,0.00)(0.00,1.00)) t=(735.00,230.00)}]
|
| RenderSVGRect {rect} at (314,102) size 60x60 [fill={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=150.00] [height=150.00]
|
| - [filter="xor"] RenderSVGResourceFilter {filter} at (0,0) size 150x150
|
| + [filter="xor"] LayoutSVGResourceFilter {filter} at (0,0) size 150x150
|
| RenderSVGText {text} at (10,340) size 98x73 contains 1 chunk(s)
|
| RenderSVGInlineText {#text} at (0,0) size 98x73
|
| chunk 1 text run 1 at (10.00,400.00) startOffset 0 endOffset 3 width 97.53: "xor"
|
| RenderSVGContainer {g} at (314,182) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(735.00,430.00)}]
|
| RenderSVGRect {rect} at (314,182) size 60x60 [fill={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=150.00] [height=150.00]
|
| - [filter="xor50"] RenderSVGResourceFilter {filter} at (0,0) size 150x150
|
| + [filter="xor50"] LayoutSVGResourceFilter {filter} at (0,0) size 150x150
|
| RenderSVGContainer {g} at (376,102) size 70x193 [transform={m=((1.00,0.00)(0.00,1.00)) t=(915.00,230.00)}]
|
| RenderSVGRect {rect} at (386,102) size 60x60 [fill={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=150.00] [height=150.00]
|
| - [filter="arithmetic"] RenderSVGResourceFilter {filter} at (0,0) size 150x150
|
| + [filter="arithmetic"] LayoutSVGResourceFilter {filter} at (0,0) size 150x150
|
| RenderSVGText {text} at (-25,340) size 167x73 contains 1 chunk(s)
|
| RenderSVGInlineText {#text} at (0,0) size 167x73
|
| chunk 1 text run 1 at (-25.00,400.00) startOffset 0 endOffset 6 width 166.96: "arith-"
|
| @@ -120,7 +120,7 @@ layer at (0,0) size 480x360
|
| chunk 1 text run 1 at (-25.00,470.00) startOffset 0 endOffset 5 width 165.47: "metic"
|
| RenderSVGContainer {g} at (386,182) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(915.00,430.00)}]
|
| RenderSVGRect {rect} at (386,182) size 60x60 [fill={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=150.00] [height=150.00]
|
| - [filter="arithmetic50"] RenderSVGResourceFilter {filter} at (0,0) size 150x150
|
| + [filter="arithmetic50"] LayoutSVGResourceFilter {filter} at (0,0) size 150x150
|
| RenderSVGText {text} at (10,304) size 264x45 contains 1 chunk(s)
|
| RenderSVGInlineText {#text} at (0,0) size 264x45
|
| chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 263.34: "$Revision: 1.5 $"
|
|
|