LayoutTests/platform/win-xp/svg/W3C-SVG-1.1/metadata-example-01-b-expected.txt - Issue 923533002: Move RenderSVGContainer to layout/svg/LayoutSVGContainer.

Unified Diff: LayoutTests/platform/win-xp/svg/W3C-SVG-1.1/metadata-example-01-b-expected.txt

Issue 923533002: Move RenderSVGContainer to layout/svg/LayoutSVGContainer. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

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

« no previous file with comments | « LayoutTests/platform/win-xp/svg/W3C-SVG-1.1/masking-path-05-f-expected.txt ('k') | LayoutTests/platform/win-xp/svg/W3C-SVG-1.1/painting-fill-01-t-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: LayoutTests/platform/win-xp/svg/W3C-SVG-1.1/metadata-example-01-b-expected.txt

diff --git a/LayoutTests/platform/win-xp/svg/W3C-SVG-1.1/metadata-example-01-b-expected.txt b/LayoutTests/platform/win-xp/svg/W3C-SVG-1.1/metadata-example-01-b-expected.txt

index e5b2f12abd59323d826dfcdd9d26bd85e9e27ec8..a0bce3562b61950a1c777e8874feb1023f1a9cd0 100644

--- a/LayoutTests/platform/win-xp/svg/W3C-SVG-1.1/metadata-example-01-b-expected.txt

+++ b/LayoutTests/platform/win-xp/svg/W3C-SVG-1.1/metadata-example-01-b-expected.txt

@@ -2,9 +2,9 @@ layer at (0,0) size 480x360

RenderView at (0,0) size 480x360

layer at (0,0) size 480x360

RenderSVGRoot {svg} at (0,0) size 480x360

- RenderSVGContainer {g} at (0,0) size 480x277 [transform={m=((1.20,0.00)(0.00,1.20)) t=(0.00,0.00)}]

- RenderSVGContainer {g} at (0,0) size 273x277

+ LayoutSVGContainer {g} at (0,0) size 480x277 [transform={m=((1.20,0.00)(0.00,1.20)) t=(0.00,0.00)}]

+ LayoutSVGContainer {g} at (0,0) size 273x277

RenderSVGPath {path} at (28,8) size 244x269 [fill={[type=SOLID] [color=#000000]}] [data="M 132.386 113.177 C 132.78 110.532 133.364 106.988 134.067 102.915 C 126.47 97.26 114.803 88.427 107.303 76.927 L 105.636 76.26 C 110.969 91.427 130.636 109.093 132.386 113.177 L 147.969 128.427 C 147.969 128.427 157.969 139.094 160.136 142.26 C 162.303 145.427 163.636 149.427 161.469 152.093 C 159.802 151.093 156.636 146.76 153.469 142.926 C 153.469 142.926 146.469 141.426 139.636 141.593 C 139.636 141.593 142.303 147.093 143.469 149.593 C 144.032 150.8 143.934 151.734 143.533 152.64 C 149.774 157.468 155.785 166.441 159.635 171.093 C 163.635 175.926 165.183 179.915 171.802 181.26 C 182.469 183.427 188.469 188.76 191.469 191.26 C 194.469 193.76 194.469 195.26 193.302 196.093 C 193.302 196.093 189.135 197.593 182.302 198.093 C 175.469 198.593 169.969 194.76 167.135 194.76 C 162.802 194.593 160.802 191.76 159.302 188.427 C 157.802 185.094 154.802 183.594 150.135 180.76 C 145.842 178.154 135.277 172.866 131.082 166.586 C 126.291 169.749 120.439 172.342 113.635 174.926 L 112.302 173.593 C 110.369 174.366 107.764 175.113 104.728 175.518 C 106.841 181.688 112.654 190.641 114.885 192.426 C 117.385 194.426 119.135 196.676 119.135 198.926 C 119.135 201.176 118.385 204.426 115.385 208.426 C 114.885 221.426 109.385 228.176 102.885 230.676 C 98.385 215.676 102.385 205.426 104.385 199.426 C 104.385 199.426 96.913 192.613 91.447 186.818 C 92.177 190.797 92.915 194.521 93.635 197.76 C 93.635 197.76 92.403 199.335 90.135 198.593 C 81.468 195.76 67.968 188.26 62.802 182.26 C 60.135 174.427 56.302 148.593 55.135 137.927 C 55.135 137.927 49.968 136.594 44.968 135.26 C 44.968 135.26 44.301 134.927 43.468 131.76 C 43.468 131.76 37.801 130.093 31.635 128.76 C 25.468 127.427 25.968 126.093 24.968 122.593 C 23.968 119.093 25.635 94.0931 27.468 85.9261 C 29.301 77.7591 37.968 63.7591 43.301 57.9261 C 43.301 57.9261 42.295 57.7911 41.468 55.4261 C 35.635 38.7591 33.635 28.0931 40.801 17.7591 C 47.968 7.42606 60.968 11.7591 67.468 14.9261 C 73.968 18.0931 74.135 23.2591 75.635 25.7591 C 77.135 28.2591 75.968 30.5921 77.635 32.9261 C 95.302 39.9261 104.468 49.5931 116.468 60.0931 C 123.968 63.7601 130.135 69.7601 135.135 73.9261 C 136.259 74.8631 137.458 76.0771 138.691 77.4511 C 140.135 69.7881 141.549 62.5151 142.635 57.1761 C 145.635 42.4261 152.135 10.1761 152.885 7.92606 L 155.885 8.17606 C 185.135 8.42606 225.635 7.17606 225.635 7.17606 C 225.885 27.4261 225.885 69.6761 225.885 81.4261 C 225.885 93.1761 225.885 120.426 226.135 123.676 C 226.135 123.676 222.385 125.676 217.802 126.426 C 218.802 126.593 219.469 128.926 217.635 129.759 C 214.635 129.926 192.302 129.926 184.635 128.759 C 183.39 128.57 181.712 128.433 179.756 128.337 C 182.197 130.821 188.662 137.176 199.385 146.175 L 199.135 154.425 L 190.135 154.675 L 158.183 128.249 C 153.518 128.33 149.658 128.425 147.968 128.425 L 132.385 113.175 Z"]

RenderSVGPath {path} at (0,0) size 75x163 [fill={[type=SOLID] [color=#000000]}] [data="M 60.654 1.358 C 59.81 2.273 58.846 3.621 57.797 5.296 C 56.602 4.226 54.057 2.08 51.455 0.73 L 49.551 3.143 L 55.609 9.025 C 55.478 9.261 55.345 9.502 55.212 9.746 C 46.57 3.133 43.441 0.554 43.441 0.554 L 41.051 3.32 C 45.023 7.952 50.504 12.236 52.942 14.049 C 52.731 14.462 52.519 14.88 52.306 15.304 C 39.417 5.651 34.449 0.917 34.449 0.917 L 31.732 3.862 C 39.379 11.192 47.649 18.616 49.756 20.5 C 49.552 20.925 49.348 21.354 49.143 21.784 C 36.8 12.691 27.994 4.367 25.422 0.449 L 23.032 3.214 C 31.136 11.753 43.351 22.425 47.259 25.797 C 47.053 26.24 46.848 26.685 46.642 27.13 C 37.115 20.82 32.015 15.82 27.711 11.698 C 23.201 7.377 17.976 1.917 15.896 0 L 13.02 3.119 C 20.737 11.622 38.128 27.123 44.639 31.518 C 44.396 32.055 44.154 32.591 43.913 33.125 C 30.32 22.46 10.721 5.175 6.985 2.362 L 4.901 4.448 C 13.773 13.522 36.57 33.784 41.516 38.486 C 41.216 39.163 40.919 39.832 40.626 40.492 C 25.883 27.823 2.664 6.874 2.664 6.874 L 1.12 9.939 C 11.613 20.509 35.072 42.483 38.378 45.577 C 38.119 46.162 37.866 46.735 37.62 47.292 C 22.515 33.526 7.848 20.476 3.401 16.852 L 1.164 19.278 C 12.303 30.264 31.642 47.796 35.745 51.505 C 35.422 52.225 35.117 52.899 34.832 53.52 C 21.063 40.369 5.95 27.057 2.685 23.887 L 0.302 26.819 C 8.993 35.279 30.011 54.559 33.04 57.334 C 32.736 57.985 32.392 58.738 32.011 59.581 C 18.259 46.584 5.606 34.76 2.869 32.553 L 0.619 34.645 C 10.568 45.47 26.957 60.551 30.439 63.096 C 30.119 63.82 29.783 64.581 29.433 65.376 C 16.333 52.826 2.679 40.233 2.679 40.233 L 0.455 42.992 C 9.522 52.67 23.596 66.032 27.798 69.112 C 27.501 69.795 27.196 70.495 26.886 71.21 C 15.543 60.602 2.703 49.073 2.703 49.073 C 1.238 49.966 0 52.352 0 52.352 C 11.334 63.218 22.136 73.12 24.95 75.689 C 24.689 76.295 24.425 76.909 24.158 77.53 C 8.771 63.626 2.36 57.093 2.36 57.093 L 0.476 60.005 C 8.895 68.856 19.285 79.065 22.254 81.968 C 22.097 82.334 21.941 82.701 21.782 83.07 C 10.825 74.056 2.944 67.412 2.944 67.412 L 1.207 69.817 C 9.581 77.94 17.667 84.8 20.155 86.882 C 19.913 87.449 19.671 88.019 19.427 88.591 C 10.261 82.019 3.115 75.745 3.115 75.745 L 1.265 79.49 C 9.426 87.427 15.635 92.395 17.27 93.673 C 17.026 94.249 16.782 94.825 16.538 95.402 C 7.159 87.785 4.131 84.377 4.131 84.377 L 1.768 87.809 C 7.21 93.487 13.147 97.562 15.087 98.832 C 14.837 99.424 14.587 100.015 14.339 100.605 L 3.629 92.57 L 1.745 95.482 L 12.462 105.061 C 12.31 105.423 12.159 105.784 12.007 106.144 L 3.404 99.419 L 1.68 102.157 L 10.472 109.804 C 10.196 110.463 9.923 111.117 9.651 111.766 L 3.201 106.766 L 1.464 109.171 L 7.973 115.789 C 7.783 116.246 7.594 116.7 7.407 117.149 L 2.312 113.64 L 0.928 116.532 L 5.888 120.81 C 5.744 121.157 5.602 121.5 5.461 121.841 L 2.915 120.288 L 1.704 123.339 L 3.903 125.62 C 2.562 128.882 1.395 131.751 0.47 134.064 L 3.195 135.455 C 4.399 132.237 34.423 62.133 39.195 52.266 C 43.967 42.399 60.577 7.7 62.173 1.797 L 60.654 1.358 Z"]

RenderSVGPath {path} at (160,8) size 113x145 [fill={[type=SOLID] [color=#FFFFFF]}] [data="M 142.803 106.261 C 141.803 106.761 139.803 107.261 137.803 105.761 C 137.803 105.761 134.136 118.094 135.136 123.428 C 138.803 125.261 177.969 125.928 187.803 125.928 C 204.636 125.928 213.97 126.928 217.803 126.428 C 222.386 125.678 226.136 123.678 226.136 123.678 C 225.886 120.428 225.886 93.178 225.886 81.428 C 225.886 69.678 227.219 27.074 225.636 7.178 C 225.636 7.178 185.136 8.428 155.886 8.178 C 156.386 13.928 153.491 26.007 151.886 32.428 C 150.386 38.428 146.886 57.678 141.957 81.322 C 145.213 85.362 148.456 89.791 150.969 92.595 C 150.969 92.595 151.058 94.292 150.78 96.116 C 154.636 97.178 157.261 99.178 158.761 101.428 C 160.261 103.678 161.011 107.053 160.136 109.303 C 160.761 112.428 160.636 114.678 159.261 115.053 C 157.886 115.428 156.761 116.053 154.761 115.303 C 153.886 118.553 153.511 118.803 153.511 118.803 C 151.761 118.803 151.136 118.678 151.136 118.678 C 148.136 114.553 142.469 110.845 142.803 106.261 Z"]

@@ -33,7 +33,7 @@ layer at (0,0) size 480x360

RenderSVGPath {path} at (71,67) size 13x11 [fill={[type=SOLID] [color=#FFFFFF]}] [data="M 69.303 59.469 C 68.803 61.469 68.47 64.302 68.47 64.302 C 65.637 63.802 61.47 62.135 60.137 59.302 C 59.97 57.469 59.637 55.969 59.637 55.969 C 63.804 58.302 67.47 59.802 69.304 59.469 Z"]

RenderSVGPath {path} at (50,17) size 32x11 [fill={[type=SOLID] [color=#FFFFFF]}] [data="M 61.041 22.638 C 62.305 22.618 65.454 22.43 68.303 21.136 C 66.803 14.803 51.803 15.469 49.303 15.969 C 46.803 16.469 43.303 19.802 41.97 22.636 C 42.377 22.714 42.791 22.783 43.211 22.845 C 43.564 21.874 43.976 21.415 44.178 21.235 C 44.717 21.094 45.242 20.966 45.757 20.849 L 45.636 23.123 C 46.084 23.161 46.533 23.192 46.983 23.217 C 47.261 22.578 47.819 21.332 48.351 20.338 C 49.267 20.189 50.147 20.08 50.999 20.013 L 50.366 23.304 C 51.1 23.303 51.82 23.289 52.517 23.268 L 53.536 19.932 C 54.656 19.952 55.737 20.048 56.802 20.219 L 56.802 23.024 C 57.075 23.002 57.337 22.979 57.586 22.956 L 58.791 20.627 C 59.497 20.803 60.2 21.012 60.909 21.254 L 61.041 22.64 Z"]

RenderSVGPath {path} at (66,30) size 35x37 [fill={[type=SOLID] [color=#FFFFFF]}] [data="M 80.719 45.948 C 79.503 47.878 77.102 49.067 75.886 49.177 C 75.886 49.177 77.151 46.544 79.389 44.177 C 79.969 43.698 79.969 42.948 79.269 42.531 C 78.802 42.769 78.071 43.192 77.385 43.801 C 76.26 44.801 74.635 43.551 74.135 42.301 C 74.916 40.851 77.486 40.893 79.096 40.474 C 79.718 39.947 78.968 39.134 78.968 39.134 C 76.135 36.134 71.801 34.801 71.801 32.301 C 71.801 30.887 72.174 29.794 72.498 29.11 C 71.855 29.232 71.026 28.745 70.884 28.176 C 70.683 27.371 70.561 26.807 69.477 25.444 C 69.33 25.534 69.182 25.625 69.033 25.717 C 69.425 26.744 70.02 28.244 70.76 29.926 C 72.135 33.051 68.635 32.551 68.51 31.051 C 68.417 29.933 67.768 28.399 66.822 27.12 C 66.703 27.198 66.585 27.277 66.466 27.356 C 67.216 29.234 67.776 31.853 68.259 34.175 C 68.884 37.175 65.884 36.425 65.634 35.175 C 65.429 34.152 64.804 31.62 63.555 29.431 C 63.428 29.529 63.302 29.627 63.176 29.727 C 63.736 32.015 64.123 35.367 64.509 37.3 C 65.009 39.8 62.134 39.8 61.884 37.8 C 61.672 36.104 61.639 34.856 60.642 31.922 C 60.434 32.122 60.228 32.324 60.026 32.53 C 60.038 35.653 60.017 41.02 59.758 43.176 C 59.383 46.301 56.883 45.551 57.008 44.176 C 57.117 42.979 56.847 41.022 56.94 36.409 C 56.894 36.485 56.845 36.559 56.8 36.635 C 55.967 41.968 55.633 49.468 61.633 52.135 C 67.633 54.802 75.925 55.448 79.633 52.635 C 83.841 50.072 80.716 48.322 80.716 45.947 Z"]

- RenderSVGContainer {g} at (73,43) size 79x159

+ LayoutSVGContainer {g} at (73,43) size 79x159

RenderSVGPath {path} at (116,172) size 15x9 [fill={[type=SOLID] [color=#000000]}] [data="M 108.89 146.162 C 108.064 145.37 107.251 144.576 106.459 143.787 C 103.128 145.616 98.846 146.949 96.949 147.492 C 97.549 148.487 98.171 149.505 98.804 150.532 C 104.431 148.94 107.459 147.192 108.889 146.163 Z"]

RenderSVGPath {path} at (112,165) size 13x9 [fill={[type=SOLID] [color=#000000]}] [data="M 101.191 138.181 C 99.009 139.89 95.206 141.322 93.656 141.863 C 94.156 142.758 94.71 143.72 95.303 144.731 C 99.506 143.633 102.346 142.216 103.969 141.239 C 102.976 140.193 102.043 139.169 101.191 138.181 Z"]

RenderSVGPath {path} at (120,178) size 17x10 [fill={[type=SOLID] [color=#000000]}] [data="M 102.346 156.194 C 108.222 154.566 112.048 152.15 113.876 150.79 C 113.042 150.038 112.203 149.272 111.368 148.497 C 108.639 150.954 102.678 152.656 100.475 153.222 C 101.102 154.224 101.728 155.22 102.346 156.195 Z"]

@@ -41,29 +41,29 @@ layer at (0,0) size 480x360

RenderSVGPath {path} at (125,184) size 19x11 [fill={[type=SOLID] [color=#000000]}] [data="M 117.5 154 C 114.467 156.28 107.292 158.545 104.388 159.402 C 105.045 160.428 105.673 161.404 106.257 162.309 C 112.61 160.346 117.387 157.538 119.773 155.958 C 119.038 155.332 118.277 154.677 117.5 154 Z"]

RenderSVGPath {path} at (109,160) size 11x7 [fill={[type=SOLID] [color=#000000]}] [data="M 99.333 135.915 C 98.751 135.16 98.236 134.439 97.802 133.761 C 95.469 135.261 91.135 136.761 91.135 136.761 C 91.308 137.28 91.618 137.982 92.037 138.827 C 94.796 138.819 97.022 138.053 99.333 135.914 Z"]

RenderSVGPath {path} at (73,43) size 14x11 [fill={[type=SOLID] [color=#000000]}] [data="M 66.386 44.677 C 68.511 42.927 71.761 40.427 71.511 37.427 L 70.261 36.802 L 70.136 36.052 C 65.011 39.302 62.386 40.427 61.636 41.052 C 62.511 42.927 64.136 42.427 64.136 42.427 C 66.261 41.302 68.136 40.052 68.136 40.052 C 66.261 42.177 65.636 43.177 65.636 43.177 C 65.636 43.177 65.511 44.052 66.386 44.677 Z"]

- RenderSVGContainer {g} at (188,0) size 292x85 [transform={m=((0.04,-0.02)(0.02,0.04)) t=(153.00,58.00)}]

- RenderSVGContainer {g} at (194,50) size 43x28

+ LayoutSVGContainer {g} at (188,0) size 292x85 [transform={m=((0.04,-0.02)(0.02,0.04)) t=(153.00,58.00)}]

+ LayoutSVGContainer {g} at (194,50) size 43x28

RenderSVGEllipse {ellipse} at (197,73) size 5x5 [stroke={[type=SOLID] [color=#426942]}] [fill={[type=SOLID] [color=#73BF73]}] [cx=195.00] [cy=210.00] [rx=27.00] [ry=18.00]

RenderSVGEllipse {ellipse} at (208,50) size 26x15 [stroke={[type=SOLID] [color=#426942]}] [fill={[type=SOLID] [color=#73BF73]}] [cx=645.00] [cy=102.00] [rx=225.00] [ry=18.00]

RenderSVGEllipse {ellipse} at (209,53) size 27x15 [stroke={[type=SOLID] [color=#426942]}] [fill={[type=SOLID] [color=#73BF73]}] [cx=645.00] [cy=156.00] [rx=230.00] [ry=18.00]

- RenderSVGContainer {g} at (215,58) size 20x16

+ LayoutSVGContainer {g} at (215,58) size 20x16

RenderSVGRect {rect} at (220,60) size 8x6 [stroke={[type=SOLID] [color=#847542]}] [fill={[type=SOLID] [color=#FFDF7B]}] [x=595.00] [y=192.00] [width=100.00] [height=36.00]

RenderSVGRect {rect} at (217,61) size 17x10 [stroke={[type=SOLID] [color=#847542]}] [fill={[type=SOLID] [color=#FFDF7B]}] [x=507.00] [y=246.00] [width=276.00] [height=36.00]

RenderSVGRect {rect} at (223,66) size 8x6 [stroke={[type=SOLID] [color=#847542]}] [fill={[type=SOLID] [color=#FFDF7B]}] [x=592.00] [y=300.00] [width=106.00] [height=36.00]

- RenderSVGContainer {g} at (197,59) size 28x24

+ LayoutSVGContainer {g} at (197,59) size 28x24

RenderSVGPath {path} at (197,63) size 15x12 [stroke={[type=SOLID] [color=#5A59CE]}] [data="M 201 193 C 212 170 215 158 240 143 C 279 122 377 112 428 107"]

RenderSVGPath {path} at (199,66) size 13x9 [stroke={[type=SOLID] [color=#5A59CE]}] [data="M 216 200 C 224 196 232 193 240 191 C 311 174 390 165 423 161"]

RenderSVGPath {path} at (201,64) size 21x11 [stroke={[type=SOLID] [color=#5A59CE]}] [data="M 221 210 C 295 210 497 210 595 210"]

RenderSVGPath {path} at (201,67) size 17x11 [stroke={[type=SOLID] [color=#5A59CE]}] [data="M 216 220 C 224 224 232 227 240 229 C 334 252 444 261 506 264"]

RenderSVGPath {path} at (200,65) size 25x18 [stroke={[type=SOLID] [color=#5A59CE]}] [data="M 201 227 C 212 253 215 265 240 280 C 352 344 508 337 592 325"]

- RenderSVGContainer {g} at (208,58) size 17x18

+ LayoutSVGContainer {g} at (208,58) size 17x18

RenderSVGPath {polygon} at (209,63) size 1x1 [fill={[type=SOLID] [color=#5A59CE]}] [points="433 107 425 111 425 103"]

RenderSVGPath {polygon} at (210,66) size 1x1 [fill={[type=SOLID] [color=#5A59CE]}] [points="428 160 421 165 420 157"]

RenderSVGPath {polygon} at (220,64) size 2x1 [fill={[type=SOLID] [color=#5A59CE]}] [points="600 210 592 214 592 206"]

RenderSVGPath {polygon} at (217,69) size 2x2 [fill={[type=SOLID] [color=#5A59CE]}] [points="511 264 503 268 503 260"]

RenderSVGPath {polygon} at (223,70) size 2x2 [fill={[type=SOLID] [color=#5A59CE]}] [points="597 324 590 329 588 321"]

- RenderSVGContainer {g} at (189,0) size 291x85

+ LayoutSVGContainer {g} at (189,0) size 291x85

LayoutSVGText {text} at (458,-145) size 7900x300 contains 1 chunk(s)

LayoutSVGInlineText {#text} at (0,0) size 7900x300

chunk 1 text run 1 at (458.00,105.00) startOffset 0 endOffset 67 width 7900.00: "http://prismstandard.org/vocabularies/1.0/resourcetype.xml#birdsEye"

@@ -82,7 +82,7 @@ layer at (0,0) size 480x360

LayoutSVGText {text} at (601,71) size 1850x300 contains 1 chunk(s)

LayoutSVGInlineText {#text} at (0,0) size 1850x300

chunk 1 text run 1 at (601.00,321.00) startOffset 0 endOffset 16 width 1850.00: "Sibyll Trelawney"

- RenderSVGContainer {g} at (192,0) size 267x81

+ LayoutSVGContainer {g} at (192,0) size 267x81

LayoutSVGText {text} at (256,-92) size 3934x300 contains 1 chunk(s)

LayoutSVGInlineText {#text} at (0,0) size 3934x300

chunk 1 text run 1 at (256.00,158.00) startOffset 0 endOffset 36 width 3933.33: "http://purl.org/dc/elements/1.1/type"