Index: LayoutTests/platform/win/svg/as-image/img-preserveAspectRatio-support-1-expected.txt |
diff --git a/LayoutTests/platform/win/svg/as-image/img-preserveAspectRatio-support-1-expected.txt b/LayoutTests/platform/win/svg/as-image/img-preserveAspectRatio-support-1-expected.txt |
index d7b0defb6b0c4efa1c6c9c7c4f7149e835122e76..0903009f558d43469732f0b564a46f888c5ff72c 100644 |
--- a/LayoutTests/platform/win/svg/as-image/img-preserveAspectRatio-support-1-expected.txt |
+++ b/LayoutTests/platform/win/svg/as-image/img-preserveAspectRatio-support-1-expected.txt |
@@ -27,12 +27,6 @@ layer at (0,0) size 800x504 |
RenderImage {IMG} at (1,1) size 200x50 [border: (2px dashed #800000)] |
RenderText {#text} at (0,0) size 0x0 |
RenderTableCell {TD} at (466,24) size 202x56 [r=1 c=3 rs=1 cs=1] |
- RenderEmbeddedObject {OBJECT} at (1,1) size 200x50 [border: (1px dashed #008000)] |
- layer at (0,0) size 192x42 |
- RenderView at (0,0) size 192x42 |
- layer at (0,0) size 192x42 |
- RenderSVGRoot {svg} at (0,0) size 192x42 |
- RenderSVGEllipse {circle} at (0,0) size 192x42 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [cx=110.00] [cy=110.00] [r=110.00] |
RenderText {#text} at (0,0) size 0x0 |
RenderTableRow {TR} at (0,82) size 670x56 |
RenderTableCell {TH} at (97,100) size 163x20 [bgcolor=#DDDD99] [r=2 c=1 rs=1 cs=1] |
@@ -42,14 +36,6 @@ layer at (0,0) size 800x504 |
RenderImage {IMG} at (1,1) size 200x50 [border: (2px dashed #800000)] |
RenderText {#text} at (0,0) size 0x0 |
RenderTableCell {TD} at (466,82) size 202x56 [r=2 c=3 rs=1 cs=1] |
- RenderEmbeddedObject {OBJECT} at (1,1) size 200x50 [border: (1px dashed #008000)] |
- layer at (0,0) size 192x42 |
- RenderView at (0,0) size 192x42 |
- layer at (0,0) size 192x42 |
- RenderSVGRoot {svg} at (0,0) size 192x42 |
- RenderSVGHiddenContainer {defs} at (0,0) size 0x0 |
- RenderSVGContainer {g} at (0,0) size 192x42 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}] |
- RenderSVGPath {path} at (0,0) size 192x42 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.419 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"] |
RenderText {#text} at (0,0) size 0x0 |
RenderTableRow {TR} at (0,140) size 670x56 |
RenderTableCell {TH} at (97,158) size 163x20 [bgcolor=#DDDD99] [r=3 c=1 rs=1 cs=1] |
@@ -59,14 +45,6 @@ layer at (0,0) size 800x504 |
RenderImage {IMG} at (1,1) size 200x50 [border: (2px dashed #800000)] |
RenderText {#text} at (0,0) size 0x0 |
RenderTableCell {TD} at (466,140) size 202x56 [r=3 c=3 rs=1 cs=1] |
- RenderEmbeddedObject {OBJECT} at (1,1) size 200x50 [border: (1px dashed #008000)] |
- layer at (0,0) size 192x42 |
- RenderView at (0,0) size 192x42 |
- layer at (0,0) size 192x42 |
- RenderSVGRoot {svg} at (0,0) size 192x42 |
- RenderSVGHiddenContainer {defs} at (0,0) size 0x0 |
- RenderSVGContainer {g} at (0,0) size 192x42 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}] |
- RenderSVGPath {path} at (0,0) size 192x42 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.419 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"] |
RenderText {#text} at (0,0) size 0x0 |
RenderTableRow {TR} at (0,198) size 670x56 |
RenderTableCell {TH} at (97,216) size 163x20 [bgcolor=#DDDD99] [r=4 c=1 rs=1 cs=1] |
@@ -76,14 +54,6 @@ layer at (0,0) size 800x504 |
RenderImage {IMG} at (1,1) size 200x50 [border: (2px dashed #800000)] |
RenderText {#text} at (0,0) size 0x0 |
RenderTableCell {TD} at (466,198) size 202x56 [r=4 c=3 rs=1 cs=1] |
- RenderEmbeddedObject {OBJECT} at (1,1) size 200x50 [border: (1px dashed #008000)] |
- layer at (0,0) size 192x42 |
- RenderView at (0,0) size 192x42 |
- layer at (0,0) size 192x42 |
- RenderSVGRoot {svg} at (0,0) size 192x42 |
- RenderSVGHiddenContainer {defs} at (0,0) size 0x0 |
- RenderSVGContainer {g} at (0,0) size 192x42 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}] |
- RenderSVGPath {path} at (0,0) size 192x42 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.419 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"] |
RenderText {#text} at (0,0) size 0x0 |
RenderTableRow {TR} at (0,256) size 670x56 |
RenderTableCell {TH} at (2,361) size 93x20 [bgcolor=#DDDD99] [r=5 c=0 rs=4 cs=1] |
@@ -94,14 +64,6 @@ layer at (0,0) size 800x504 |
RenderImage {IMG} at (1,1) size 200x50 [border: (2px dashed #800000)] |
RenderText {#text} at (0,0) size 0x0 |
RenderTableCell {TD} at (466,256) size 202x56 [r=5 c=3 rs=1 cs=1] |
- RenderEmbeddedObject {OBJECT} at (1,1) size 200x50 [border: (1px dashed #008000)] |
- layer at (0,0) size 192x42 |
- RenderView at (0,0) size 192x42 |
- layer at (0,0) size 192x42 |
- RenderSVGRoot {svg} at (75,0) size 31x31 |
- RenderSVGHiddenContainer {defs} at (0,0) size 0x0 |
- RenderSVGContainer {g} at (75,0) size 31x31 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}] |
- RenderSVGPath {path} at (75,0) size 31x31 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.419 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"] |
RenderText {#text} at (0,0) size 0x0 |
RenderTableRow {TR} at (0,314) size 670x56 |
RenderTableCell {TH} at (97,332) size 163x20 [bgcolor=#DDDD99] [r=6 c=1 rs=1 cs=1] |
@@ -111,14 +73,6 @@ layer at (0,0) size 800x504 |
RenderImage {IMG} at (1,1) size 200x50 [border: (2px dashed #800000)] |
RenderText {#text} at (0,0) size 0x0 |
RenderTableCell {TD} at (466,314) size 202x56 [r=6 c=3 rs=1 cs=1] |
- RenderEmbeddedObject {OBJECT} at (1,1) size 200x50 [border: (1px dashed #008000)] |
- layer at (0,0) size 192x42 |
- RenderView at (0,0) size 192x42 |
- layer at (0,0) size 192x42 |
- RenderSVGRoot {svg} at (0,0) size 140x31 |
- RenderSVGHiddenContainer {defs} at (0,0) size 0x0 |
- RenderSVGContainer {g} at (0,0) size 140x31 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}] |
- RenderSVGPath {path} at (0,0) size 140x31 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.419 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"] |
RenderText {#text} at (0,0) size 0x0 |
RenderTableRow {TR} at (0,372) size 670x56 |
RenderTableCell {TH} at (97,390) size 163x20 [bgcolor=#DDDD99] [r=7 c=1 rs=1 cs=1] |
@@ -128,14 +82,6 @@ layer at (0,0) size 800x504 |
RenderImage {IMG} at (1,1) size 200x50 [border: (2px dashed #800000)] |
RenderText {#text} at (0,0) size 0x0 |
RenderTableCell {TD} at (466,372) size 202x56 [r=7 c=3 rs=1 cs=1] |
- RenderEmbeddedObject {OBJECT} at (1,1) size 200x50 [border: (1px dashed #008000)] |
- layer at (0,0) size 192x42 |
- RenderView at (0,0) size 192x42 |
- layer at (0,0) size 192x42 |
- RenderSVGRoot {svg} at (75,0) size 31x31 |
- RenderSVGHiddenContainer {defs} at (0,0) size 0x0 |
- RenderSVGContainer {g} at (75,0) size 31x31 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}] |
- RenderSVGPath {path} at (75,0) size 31x31 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.419 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"] |
RenderText {#text} at (0,0) size 0x0 |
RenderTableRow {TR} at (0,430) size 670x56 |
RenderTableCell {TH} at (97,448) size 163x20 [bgcolor=#DDDD99] [r=8 c=1 rs=1 cs=1] |
@@ -145,12 +91,74 @@ layer at (0,0) size 800x504 |
RenderImage {IMG} at (1,1) size 200x50 [border: (2px dashed #800000)] |
RenderText {#text} at (0,0) size 0x0 |
RenderTableCell {TD} at (466,430) size 202x56 [r=8 c=3 rs=1 cs=1] |
- RenderEmbeddedObject {OBJECT} at (1,1) size 200x50 [border: (1px dashed #008000)] |
- layer at (0,0) size 192x42 |
- RenderView at (0,0) size 192x42 |
- layer at (0,0) size 192x42 |
- RenderSVGRoot {svg} at (0,0) size 140x42 |
- RenderSVGHiddenContainer {defs} at (0,0) size 0x0 |
- RenderSVGContainer {g} at (0,0) size 140x42 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}] |
- RenderSVGPath {path} at (0,0) size 140x42 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.419 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"] |
RenderText {#text} at (0,0) size 0x0 |
+layer at (475,33) size 200x50 |
+ RenderEmbeddedObject {OBJECT} at (1,1) size 200x50 [border: (1px dashed #008000)] |
+ layer at (0,0) size 192x42 |
+ RenderView at (0,0) size 192x42 |
+ layer at (0,0) size 192x42 |
+ RenderSVGRoot {svg} at (0,0) size 192x42 |
+ RenderSVGEllipse {circle} at (0,0) size 192x42 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [cx=110.00] [cy=110.00] [r=110.00] |
+layer at (475,91) size 200x50 |
+ RenderEmbeddedObject {OBJECT} at (1,1) size 200x50 [border: (1px dashed #008000)] |
+ layer at (0,0) size 192x42 |
+ RenderView at (0,0) size 192x42 |
+ layer at (0,0) size 192x42 |
+ RenderSVGRoot {svg} at (0,0) size 192x42 |
+ RenderSVGHiddenContainer {defs} at (0,0) size 0x0 |
+ RenderSVGContainer {g} at (0,0) size 192x42 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}] |
+ RenderSVGPath {path} at (0,0) size 192x42 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.419 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"] |
+layer at (475,149) size 200x50 |
+ RenderEmbeddedObject {OBJECT} at (1,1) size 200x50 [border: (1px dashed #008000)] |
+ layer at (0,0) size 192x42 |
+ RenderView at (0,0) size 192x42 |
+ layer at (0,0) size 192x42 |
+ RenderSVGRoot {svg} at (0,0) size 192x42 |
+ RenderSVGHiddenContainer {defs} at (0,0) size 0x0 |
+ RenderSVGContainer {g} at (0,0) size 192x42 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}] |
+ RenderSVGPath {path} at (0,0) size 192x42 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.419 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"] |
+layer at (475,207) size 200x50 |
+ RenderEmbeddedObject {OBJECT} at (1,1) size 200x50 [border: (1px dashed #008000)] |
+ layer at (0,0) size 192x42 |
+ RenderView at (0,0) size 192x42 |
+ layer at (0,0) size 192x42 |
+ RenderSVGRoot {svg} at (0,0) size 192x42 |
+ RenderSVGHiddenContainer {defs} at (0,0) size 0x0 |
+ RenderSVGContainer {g} at (0,0) size 192x42 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}] |
+ RenderSVGPath {path} at (0,0) size 192x42 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.419 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"] |
+layer at (475,265) size 200x50 |
+ RenderEmbeddedObject {OBJECT} at (1,1) size 200x50 [border: (1px dashed #008000)] |
+ layer at (0,0) size 192x42 |
+ RenderView at (0,0) size 192x42 |
+ layer at (0,0) size 192x42 |
+ RenderSVGRoot {svg} at (75,0) size 31x31 |
+ RenderSVGHiddenContainer {defs} at (0,0) size 0x0 |
+ RenderSVGContainer {g} at (75,0) size 31x31 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}] |
+ RenderSVGPath {path} at (75,0) size 31x31 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.419 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"] |
+layer at (475,323) size 200x50 |
+ RenderEmbeddedObject {OBJECT} at (1,1) size 200x50 [border: (1px dashed #008000)] |
+ layer at (0,0) size 192x42 |
+ RenderView at (0,0) size 192x42 |
+ layer at (0,0) size 192x42 |
+ RenderSVGRoot {svg} at (0,0) size 140x31 |
+ RenderSVGHiddenContainer {defs} at (0,0) size 0x0 |
+ RenderSVGContainer {g} at (0,0) size 140x31 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}] |
+ RenderSVGPath {path} at (0,0) size 140x31 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.419 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"] |
+layer at (475,381) size 200x50 |
+ RenderEmbeddedObject {OBJECT} at (1,1) size 200x50 [border: (1px dashed #008000)] |
+ layer at (0,0) size 192x42 |
+ RenderView at (0,0) size 192x42 |
+ layer at (0,0) size 192x42 |
+ RenderSVGRoot {svg} at (75,0) size 31x31 |
+ RenderSVGHiddenContainer {defs} at (0,0) size 0x0 |
+ RenderSVGContainer {g} at (75,0) size 31x31 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}] |
+ RenderSVGPath {path} at (75,0) size 31x31 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.419 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"] |
+layer at (475,439) size 200x50 |
+ RenderEmbeddedObject {OBJECT} at (1,1) size 200x50 [border: (1px dashed #008000)] |
+ layer at (0,0) size 192x42 |
+ RenderView at (0,0) size 192x42 |
+ layer at (0,0) size 192x42 |
+ RenderSVGRoot {svg} at (0,0) size 140x42 |
+ RenderSVGHiddenContainer {defs} at (0,0) size 0x0 |
+ RenderSVGContainer {g} at (0,0) size 140x42 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}] |
+ RenderSVGPath {path} at (0,0) size 140x42 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.419 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"] |