Reviewed by Darin.

        http://bugs.webkit.org/show_bug.cgi?id=12439
        SVG parser complains about points attribute in polygon and polyline element

        Return true when the parsed points specification is valid.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@19732 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a8fbc7b4c1d89b988eda9aa01853a15823649f79..8ef131e24b3ec543fde1bf8b84959db4959c2c64 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,41 @@
+2007-02-20  Rob Buis  <buis@kde.org>
+
+        Reviewed by Darin.
+
+        http://bugs.webkit.org/show_bug.cgi?id=12439
+        SVG parser complains about points attribute in polygon and polyline element
+
+        Add a test for testing the poly parser. Also update test results.
+
+        * svg/W3C-SVG-1.1/animate-elem-30-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-33-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-34-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-37-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-41-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-78-t-expected.txt:
+        * svg/W3C-SVG-1.1/color-prop-03-t-expected.txt:
+        * svg/W3C-SVG-1.1/interact-cursor-01-f-expected.txt:
+        * svg/W3C-SVG-1.1/linking-uri-01-b-expected.txt:
+        * svg/W3C-SVG-1.1/linking-uri-02-b-expected.txt:
+        * svg/W3C-SVG-1.1/metadata-example-01-b-expected.txt:
+        * svg/W3C-SVG-1.1/painting-marker-03-f-expected.txt:
+        * svg/W3C-SVG-1.1/shapes-polygon-01-t-expected.txt:
+        * svg/W3C-SVG-1.1/shapes-polyline-01-t-expected.txt:
+        * svg/W3C-SVG-1.1/struct-group-03-t-expected.txt:
+        * svg/W3C-SVG-1.1/struct-use-01-t-expected.txt:
+        * svg/W3C-SVG-1.1/styling-css-01-b-expected.txt:
+        * svg/W3C-SVG-1.1/styling-css-02-b-expected.txt:
+        * svg/W3C-SVG-1.1/styling-css-03-b-expected.txt:
+        * svg/custom/js-update-polygon-changes-expected.txt:
+        * svg/custom/js-update-polygon-removal-expected.txt:
+        * svg/custom/polyline-hittest-expected.txt:
+        * svg/custom/polyline-invalid-points-expected.checksum:
+        * svg/custom/polyline-invalid-points-expected.txt:
+        * svg/custom/polyline-invalid-points.svg:
+        * svg/custom/svgpolyparser-extra-space-expected.txt:
+        * svg/dom/points-parser-expected.txt: Added.
+        * svg/dom/points-parser.html: Added.
+
 2007-02-19  Mitz Pettel  <mitz@webkit.org>
 
         Reviewed by Hyatt.

diff --git a/LayoutTests/svg/W3C-SVG-1.1/animate-elem-30-t-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/animate-elem-30-t-expected.txt
index 91188975f3aa9c4e9ba42b5d252c0065342eb9b0..7b159a50ee16787d75943db2e8be773097f71b2e 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/animate-elem-30-t-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/animate-elem-30-t-expected.txt
@@ -1,9 +1,3 @@
-CONSOLE MESSAGE: line 33: Error: Problem parsing points="200,20 200,40 220,40 220,60"
-CONSOLE MESSAGE: line 34: Error: Problem parsing points="200,120 200,140 220,140 220,160"
-CONSOLE MESSAGE: line 84: Error: Problem parsing points="200,20 200,40 220,40 220,60"
-CONSOLE MESSAGE: line 91: Error: Problem parsing points="240,20 240,40 260,40 260,20"
-CONSOLE MESSAGE: line 117: Error: Problem parsing points="200,20 200,40 220,40 220,60"
-CONSOLE MESSAGE: line 121: Error: Problem parsing points="240,20 240,40 260,40 260,20"
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
     RenderSVGContainer {svg} at (0.50,0.50) size 479x359

diff --git a/LayoutTests/svg/W3C-SVG-1.1/animate-elem-33-t-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/animate-elem-33-t-expected.txt
index 38fe893b69e7e09bfac0e895ecbeb2e57f7290ed..2a340d1f11a6f902c397cd739757ccfd29f77674 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/animate-elem-33-t-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/animate-elem-33-t-expected.txt
@@ -1,8 +1,3 @@
-CONSOLE MESSAGE: line 30: Error: Problem parsing points="-150,0 0,0 150,0"
-CONSOLE MESSAGE: line 48: Error: Problem parsing points="-150,0 -90,0"
-CONSOLE MESSAGE: line 49: Error: Problem parsing points="90,0 150,0"
-CONSOLE MESSAGE: line 76: Error: Problem parsing points="-105,0 -25,-60 25,-60 105,0"
-CONSOLE MESSAGE: line 97: Error: Problem parsing points="-125,0 125,0"
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
     RenderSVGContainer {svg} at (0.50,0.50) size 479x359

diff --git a/LayoutTests/svg/W3C-SVG-1.1/animate-elem-34-t-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/animate-elem-34-t-expected.txt
index 667473606e4e2b13d64575650db4bdc609e10d30..57c04aa8c410dde4f2db2ec4ae840b624e5e9485 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/animate-elem-34-t-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/animate-elem-34-t-expected.txt
@@ -1,8 +1,3 @@
-CONSOLE MESSAGE: line 32: Error: Problem parsing points="248.5,38.5 276.5,22.5 298.5,19.5 316.5,26.5 332.5,40.5 331.5,57.5 322.5,70.5 307.5,76.5             314.5,80.5 324.5,86.5 333.5,99.5 333.5,121.5 327.5,130.5 312.5,143.5 292.5,149.5             270.5,148.5 248.5,142.5 252.5,114.5 267.5,119.5 282.5,119.5 297.5,115.5             304.5,109.5 295.5,99.5 284.5,92.5 277.5,84.5 270.5,74.5 281.5,66.5 293.5,60.5             297.5,50.5 292.5,45.5 281.5,45.5 274.5,49.5 266.5,53.5"
-CONSOLE MESSAGE: line 34: Error: Problem parsing points="108.5,38.5 123.5,26.5 148.5,16.5 172.5,17.5 188.5,19.5 202.5,23.5 206.5,26.5 210.5,37.5          213.5,44.5 215.5,57.5 209.5,68.5 203.5,81.5 187.5,98.5 164.5,120.5 206.5,121.5          224.5,121.5 220.5,149.5 194.5,147.5 181.5,147.5 167.5,146.5 150.5,147.5          133.5,149.5 117.5,148.5 117.5,136.5 118.5,124.5 133.5,115.5 151.5,97.5 170.5,78.5          186.5,59.5 179.5,43.5 159.5,35.5 139.5,40.5 125.5,49.5"
-CONSOLE MESSAGE: line 36: Error: Problem parsing points="26.5,32.5 33.5,32.5 40.5,29.5 47.5,23.5 61.5,17.5 73.5,16.5 74.5,33.5 73.5,50.5 73.5,64.5          72.5,77.5 72.5,90.5 72.5,105.5 71.5,126.5 89.5,128.5 90.5,138.5 89.5,151.5          72.5,151.5 54.5,152.5 38.5,152.5 27.5,152.5 28.5,139.5 30.5,127.5 44.5,125.5          46.5,112.5 47.5,99.5 46.5,87.5 48.5,73.5 48.5,53.5 34.5,52.5 22.5,52.5          22.5,51.5 22.5,41.5 22.5,33.5"
-CONSOLE MESSAGE: line 38: Error: Problem parsing points="427.5,17.5 439.5,15.5 449.5,15.5 449.5,29.5 447.5,44.5 447.5,59.5 465.5,60.5 466.5,74.5          465.5,89.5 450.5,87.5 449.5,102.5 449.5,123.5 449.5,140.5 449.5,153.5          420.5,154.5 421.5,137.5 420.5,123.5 420.5,111.5 419.5,99.5 392.5,97.5 367.5,99.5          366.5,79.5 367.5,69.5 376.5,43.5 381.5,27.5 384.5,17.5 412.5,16.5 406.5,36.5          400.5,49.5 394.5,70.5 419.5,71.5 423.5,49.5 424.5,33.5"
-CONSOLE MESSAGE: line 41: Error: Problem parsing points="26.5,32.5 33.5,32.5 40.5,29.5 47.5,23.5 61.5,17.5 73.5,16.5 74.5,33.5 73.5,50.5 73.5,64.5              72.5,77.5 72.5,90.5 72.5,105.5 71.5,126.5 89.5,128.5 90.5,138.5 89.5,151.5              72.5,151.5 54.5,152.5 38.5,152.5 27.5,152.5 28.5,139.5 30.5,127.5 44.5,125.5              46.5,112.5 47.5,99.5 46.5,87.5 48.5,73.5 48.5,53.5 34.5,52.5 22.5,52.5              22.5,51.5 22.5,41.5 22.5,33.5"
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
     RenderSVGContainer {svg} at (0.50,0.50) size 479x359

diff --git a/LayoutTests/svg/W3C-SVG-1.1/animate-elem-37-t-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/animate-elem-37-t-expected.txt
index 6eec78b9d377d08382ef59bb3e475fe23ba2f78f..b218df0f643ce410a962f69d7fd20d4f8a33d7aa 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/animate-elem-37-t-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/animate-elem-37-t-expected.txt
@@ -1,5 +1,3 @@
-CONSOLE MESSAGE: line 67: Error: Problem parsing points="-30 20 -30 -20 30 20 30 -20"
-CONSOLE MESSAGE: line 73: Error: Problem parsing points="-30 20 -30 -20 30 20 30 -20"
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
     RenderSVGContainer {svg} at (0.50,0.50) size 479x359

diff --git a/LayoutTests/svg/W3C-SVG-1.1/animate-elem-41-t-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/animate-elem-41-t-expected.txt
index 958f8a05c08252aea66259069c08c90dcf33b388..17a371042d1991b196a65ad96c58b587e79e5f9a 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/animate-elem-41-t-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/animate-elem-41-t-expected.txt
@@ -1,36 +1,3 @@
-CONSOLE MESSAGE: line 109: Error: Problem parsing points="20,10,0,10,15,20,10,2,5,20,20,10"
-CONSOLE MESSAGE: line 110: Error: Problem parsing points="20,10,0,10,15,20,10,2,5,20,20,10"
-CONSOLE MESSAGE: line 113: Error: Problem parsing points="20,10,0,10,15,20,10,2,5,20,20,10"
-CONSOLE MESSAGE: line 113: Error: Problem parsing points="20,10,0,10,15,20,10,2,5,20,20,10"
-CONSOLE MESSAGE: line 114: Error: Problem parsing points="20,10,0,10,15,20,10,2,5,20,20,10"
-CONSOLE MESSAGE: line 114: Error: Problem parsing points="20,10,0,10,15,20,10,2,5,20,20,10"
-CONSOLE MESSAGE: line 115: Error: Problem parsing points="20,10,0,10,15,20,10,2,5,20,20,10"
-CONSOLE MESSAGE: line 115: Error: Problem parsing points="20,10,0,10,15,20,10,2,5,20,20,10"
-CONSOLE MESSAGE: line 117: Error: Problem parsing points="20,10,0,10,15,20,10,2,5,20,20,10"
-CONSOLE MESSAGE: line 125: Error: Problem parsing points="20,10,0,10,15,20,10,2,5,20,20,10"
-CONSOLE MESSAGE: line 131: Error: Problem parsing points="20,10,0,10,15,20,10,2,5,20,20,10"
-CONSOLE MESSAGE: line 229: Error: Problem parsing points="5,2,20,5,5,8"
-CONSOLE MESSAGE: line 230: Error: Problem parsing points="5,2,20,5,5,8"
-CONSOLE MESSAGE: line 233: Error: Problem parsing points="5,2,20,5,5,8"
-CONSOLE MESSAGE: line 233: Error: Problem parsing points="5,2,20,5,5,8"
-CONSOLE MESSAGE: line 234: Error: Problem parsing points="5,2,20,5,5,8"
-CONSOLE MESSAGE: line 234: Error: Problem parsing points="5,2,20,5,5,8"
-CONSOLE MESSAGE: line 235: Error: Problem parsing points="5,2,20,5,5,8"
-CONSOLE MESSAGE: line 235: Error: Problem parsing points="5,2,20,5,5,8"
-CONSOLE MESSAGE: line 237: Error: Problem parsing points="5,2,20,5,5,8"
-CONSOLE MESSAGE: line 245: Error: Problem parsing points="5,2,20,5,5,8"
-CONSOLE MESSAGE: line 251: Error: Problem parsing points="5,2,20,5,5,8"
-CONSOLE MESSAGE: line 258: Error: Problem parsing points="5,0,20,5,5,10"
-CONSOLE MESSAGE: line 259: Error: Problem parsing points="5,0,20,5,5,10"
-CONSOLE MESSAGE: line 262: Error: Problem parsing points="5,0,20,5,5,10"
-CONSOLE MESSAGE: line 262: Error: Problem parsing points="5,0,20,5,5,10"
-CONSOLE MESSAGE: line 263: Error: Problem parsing points="5,0,20,5,5,10"
-CONSOLE MESSAGE: line 263: Error: Problem parsing points="5,0,20,5,5,10"
-CONSOLE MESSAGE: line 264: Error: Problem parsing points="5,0,20,5,5,10"
-CONSOLE MESSAGE: line 264: Error: Problem parsing points="5,0,20,5,5,10"
-CONSOLE MESSAGE: line 266: Error: Problem parsing points="5,0,20,5,5,10"
-CONSOLE MESSAGE: line 274: Error: Problem parsing points="5,0,20,5,5,10"
-CONSOLE MESSAGE: line 280: Error: Problem parsing points="5,0,20,5,5,10"
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
     RenderSVGContainer {svg} at (0.50,0.50) size 479x359

diff --git a/LayoutTests/svg/W3C-SVG-1.1/animate-elem-78-t-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/animate-elem-78-t-expected.txt
index 38c46d43f824c3a6113260340ed04022ca3c17ad..4a2e46a3011b0ac596bdafa4e334082eb00ffa56 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/animate-elem-78-t-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/animate-elem-78-t-expected.txt
@@ -1,36 +1,3 @@
-CONSOLE MESSAGE: line 185: Error: Problem parsing points="20,10,0,10,15,20,10,2,5,20,20,10"
-CONSOLE MESSAGE: line 187: Error: Problem parsing points="20,10,0,10,15,20,10,2,5,20,20,10"
-CONSOLE MESSAGE: line 191: Error: Problem parsing points="20,10,0,10,15,20,10,2,5,20,20,10"
-CONSOLE MESSAGE: line 191: Error: Problem parsing points="20,10,0,10,15,20,10,2,5,20,20,10"
-CONSOLE MESSAGE: line 192: Error: Problem parsing points="20,10,0,10,15,20,10,2,5,20,20,10"
-CONSOLE MESSAGE: line 192: Error: Problem parsing points="20,10,0,10,15,20,10,2,5,20,20,10"
-CONSOLE MESSAGE: line 193: Error: Problem parsing points="20,10,0,10,15,20,10,2,5,20,20,10"
-CONSOLE MESSAGE: line 193: Error: Problem parsing points="20,10,0,10,15,20,10,2,5,20,20,10"
-CONSOLE MESSAGE: line 195: Error: Problem parsing points="20,10,0,10,15,20,10,2,5,20,20,10"
-CONSOLE MESSAGE: line 202: Error: Problem parsing points="20,10,0,10,15,20,10,2,5,20,20,10"
-CONSOLE MESSAGE: line 209: Error: Problem parsing points="20,10,0,10,15,20,10,2,5,20,20,10"
-CONSOLE MESSAGE: line 316: Error: Problem parsing points="5,2,20,5,5,8"
-CONSOLE MESSAGE: line 318: Error: Problem parsing points="5,2,20,5,5,8"
-CONSOLE MESSAGE: line 322: Error: Problem parsing points="5,2,20,5,5,8"
-CONSOLE MESSAGE: line 322: Error: Problem parsing points="5,2,20,5,5,8"
-CONSOLE MESSAGE: line 323: Error: Problem parsing points="5,2,20,5,5,8"
-CONSOLE MESSAGE: line 323: Error: Problem parsing points="5,2,20,5,5,8"
-CONSOLE MESSAGE: line 324: Error: Problem parsing points="5,2,20,5,5,8"
-CONSOLE MESSAGE: line 324: Error: Problem parsing points="5,2,20,5,5,8"
-CONSOLE MESSAGE: line 326: Error: Problem parsing points="5,2,20,5,5,8"
-CONSOLE MESSAGE: line 333: Error: Problem parsing points="5,2,20,5,5,8"
-CONSOLE MESSAGE: line 340: Error: Problem parsing points="5,2,20,5,5,8"
-CONSOLE MESSAGE: line 349: Error: Problem parsing points="5,0,20,5,5,10"
-CONSOLE MESSAGE: line 350: Error: Problem parsing points="5,0,20,5,5,10"
-CONSOLE MESSAGE: line 353: Error: Problem parsing points="5,0,20,5,5,10"
-CONSOLE MESSAGE: line 353: Error: Problem parsing points="5,0,20,5,5,10"
-CONSOLE MESSAGE: line 354: Error: Problem parsing points="5,0,20,5,5,10"
-CONSOLE MESSAGE: line 354: Error: Problem parsing points="5,0,20,5,5,10"
-CONSOLE MESSAGE: line 355: Error: Problem parsing points="5,0,20,5,5,10"
-CONSOLE MESSAGE: line 355: Error: Problem parsing points="5,0,20,5,5,10"
-CONSOLE MESSAGE: line 357: Error: Problem parsing points="5,0,20,5,5,10"
-CONSOLE MESSAGE: line 364: Error: Problem parsing points="5,0,20,5,5,10"
-CONSOLE MESSAGE: line 371: Error: Problem parsing points="5,0,20,5,5,10"
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
     RenderSVGContainer {svg} at (0.50,0.50) size 479x359

diff --git a/LayoutTests/svg/W3C-SVG-1.1/color-prop-03-t-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/color-prop-03-t-expected.txt
index 6b627e763211745fa1ce5108eb3cf5a79b547c8a..9c77651ff2747c519d8b92fb974882ab3c7eed0d 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/color-prop-03-t-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/color-prop-03-t-expected.txt
@@ -1,6 +1,3 @@
-CONSOLE MESSAGE: line 60: Error: Problem parsing points="95,40 115,60 95,80 75,60"
-CONSOLE MESSAGE: line 68: Error: Problem parsing points="220,40 240,60 220,80 200,60"
-CONSOLE MESSAGE: line 75: Error: Problem parsing points="345,40 365,60 345,80 325,60"
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
     RenderSVGContainer {svg} at (0.50,0.50) size 479x359

diff --git a/LayoutTests/svg/W3C-SVG-1.1/interact-cursor-01-f-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/interact-cursor-01-f-expected.txt
index 6ae52b682bede1546ed96f9a1ebaa254318b0adc..0bae81eadde9b9cbd3e53e7343fb8896fe8471a9 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/interact-cursor-01-f-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/interact-cursor-01-f-expected.txt
@@ -1,13 +1,3 @@
-CONSOLE MESSAGE: line 111: Error: Problem parsing points="116,36 116,68 148,36"
-CONSOLE MESSAGE: line 112: Error: Problem parsing points="364,36 364,68 332,36"
-CONSOLE MESSAGE: line 113: Error: Problem parsing points="364,280 332,280 364,248"
-CONSOLE MESSAGE: line 114: Error: Problem parsing points="116,280 148,280 116,248"
-CONSOLE MESSAGE: line 115: Error: Problem parsing points="340,134 340,182 364,158"
-CONSOLE MESSAGE: line 116: Error: Problem parsing points="116,158 140,134 140,182"
-CONSOLE MESSAGE: line 117: Error: Problem parsing points="240,36 264,63.3 214,63.3"
-CONSOLE MESSAGE: line 118: Error: Problem parsing points="240,280 264,252.7 214,252.7"
-CONSOLE MESSAGE: line 125: Error: Problem parsing points="390,295 390,335"
-CONSOLE MESSAGE: line 126: Error: Problem parsing points="370,315 410,315"
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
     RenderSVGContainer {svg} at (0.50,0.50) size 479x359

diff --git a/LayoutTests/svg/W3C-SVG-1.1/linking-uri-01-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/linking-uri-01-b-expected.txt
index d6fe358e2e24694d6f235d8653bd016a366aecf3..063f85728e71dbf9513a6a9190780df507c65650 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/linking-uri-01-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/linking-uri-01-b-expected.txt
@@ -1,4 +1,3 @@
-CONSOLE MESSAGE: line 156: Error: Problem parsing points="87,211 134,238 116,283 57,283 39,238 87,211"
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
     RenderSVGContainer {svg} at (0.50,0.50) size 479x359

diff --git a/LayoutTests/svg/W3C-SVG-1.1/linking-uri-02-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/linking-uri-02-b-expected.txt
index c6df1af698493ea3be640f59394cb73d78709ba8..f4e03a048050c6ac5c84de0cda090bdcc36c94a5 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/linking-uri-02-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/linking-uri-02-b-expected.txt
@@ -1,4 +1,3 @@
-CONSOLE MESSAGE: line 166: Error: Problem parsing points="87,211 134,238 116,283 57,283 39,238 87,211"
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
     RenderSVGContainer {svg} at (0.50,0.50) size 479x359

diff --git a/LayoutTests/svg/W3C-SVG-1.1/metadata-example-01-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/metadata-example-01-b-expected.txt
index 0d23b034bff47942b94f200d6d33be35b06a3932..cb6b6addccaaa6f70664baa6bab495615f73ace8 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/metadata-example-01-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/metadata-example-01-b-expected.txt
@@ -1,8 +1,3 @@
-CONSOLE MESSAGE: line 149: Error: Problem parsing points="433,107 425,111 425,103"
-CONSOLE MESSAGE: line 150: Error: Problem parsing points="428,160 421,165 420,157"
-CONSOLE MESSAGE: line 151: Error: Problem parsing points="600,210 592,214 592,206"
-CONSOLE MESSAGE: line 152: Error: Problem parsing points="511,264 503,268 503,260"
-CONSOLE MESSAGE: line 153: Error: Problem parsing points="597,324 590,329 588,321"
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
     RenderSVGContainer {svg} at (0,0) size 479.50x359.50

diff --git a/LayoutTests/svg/W3C-SVG-1.1/painting-marker-03-f-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/painting-marker-03-f-expected.txt
index a98a6f5667b16c90b83fbef5936bd2acd5e68ac8..b264f04259131ecbb21d41c83fab2b27d74c7f9e 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/painting-marker-03-f-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/painting-marker-03-f-expected.txt
@@ -1,7 +1,3 @@
-CONSOLE MESSAGE: line 59: Error: Problem parsing points="100,60 120,140 140,60 160,140 180,60 180,100 100,100"
-CONSOLE MESSAGE: line 60: Error: Problem parsing points="190,60 210,140 230,60 250,140 270,60 270,100 190,100"
-CONSOLE MESSAGE: line 68: Error: Problem parsing points="100,60 120,140 140,60 160,140 180,60 180,100 100,100"
-CONSOLE MESSAGE: line 69: Error: Problem parsing points="190,60 210,140 230,60 250,140 270,60 270,100 190,100"
 KCanvasResource {id="marker1" [type=MARKER] [angle=0.00] [ref x=50.00 y=50.00]}
 KCanvasResource {id="marker2" [type=MARKER] [angle=0.00] [ref x=100.00 y=100.00]}
 layer at (0,0) size 480x360

diff --git a/LayoutTests/svg/W3C-SVG-1.1/shapes-polygon-01-t-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/shapes-polygon-01-t-expected.txt
index 060437811dba8b3833c4d846d45aad923c077a8b..02213d457e5123356e3ce6e392223783ffd0c9cb 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/shapes-polygon-01-t-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/shapes-polygon-01-t-expected.txt
@@ -1,9 +1,3 @@
-CONSOLE MESSAGE: line 50: Error: Problem parsing points="59,45,95,63,108,105,82,139,39,140,11,107,19,65"
-CONSOLE MESSAGE: line 52: Error: Problem parsing points="179,45,218,63,228,105,202,139,159,140,131,107,139,65,179,45"
-CONSOLE MESSAGE: line 57: Error: Problem parsing points="350,45 375,80 410,95 375,110 350,145 325,120 290,95 325,70,350,45"
-CONSOLE MESSAGE: line 62: Error: Problem parsing points="59,185,98,203,108,245,82,279,39,280,11,247,19,205,59,185"
-CONSOLE MESSAGE: line 64: Error: Problem parsing points="179,185,218,203,228,245,202,279,159,280,131,247,139,205"
-CONSOLE MESSAGE: line 68: Error: Problem parsing points="270,225 300,245 320,225 340,245 280,280                   390,280 420,240 280,185"
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
     RenderSVGContainer {svg} at (0.50,0.50) size 479x359

diff --git a/LayoutTests/svg/W3C-SVG-1.1/shapes-polyline-01-t-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/shapes-polyline-01-t-expected.txt
index 141574cac33cb2ecc0442d1e78bed554de6677da..16b929fac158629b90d240f70f69c14224e6ef05 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/shapes-polyline-01-t-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/shapes-polyline-01-t-expected.txt
@@ -1,9 +1,3 @@
-CONSOLE MESSAGE: line 55: Error: Problem parsing points="10,50,35,150,60,50,85,150,110,50,135,150"
-CONSOLE MESSAGE: line 58: Error: Problem parsing points="220,50,267,84,249,140,190,140,172,84,220,50"
-CONSOLE MESSAGE: line 64: Error: Problem parsing points="310,50,335,150,360,50,385,150,410,50,435,150"
-CONSOLE MESSAGE: line 70: Error: Problem parsing points="59,185,98,203,108,245,82,279,39,280,11,247,19,205"
-CONSOLE MESSAGE: line 73: Error: Problem parsing points="189,185,228,203,238,245,212,279,169,280,141,247,149,205"
-CONSOLE MESSAGE: line 78: Error: Problem parsing points="270,225 300,245 320,225 340,245 280,280                   390,280 420,240 280,185"
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
     RenderSVGContainer {svg} at (0.50,0.50) size 479x359

diff --git a/LayoutTests/svg/W3C-SVG-1.1/struct-group-03-t-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/struct-group-03-t-expected.txt
index 6bdb264395e96977ea3300e352c68dcc3ac99ea7..12478f1c0927fce0174f7451b4c1e4bb9a95e396 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/struct-group-03-t-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/struct-group-03-t-expected.txt
@@ -1,9 +1,3 @@
-CONSOLE MESSAGE: line 134: Error: Problem parsing points="10.5,0 21,21 0,7 21,7 0,21"
-CONSOLE MESSAGE: line 154: Error: Problem parsing points="3,40 11,10 19,40"
-CONSOLE MESSAGE: line 158: Error: Problem parsing points="3,40 11,10 19,40"
-CONSOLE MESSAGE: line 205: Error: Problem parsing points="10.5,0 21,21 0,7 21,7 0,21"
-CONSOLE MESSAGE: line 225: Error: Problem parsing points="3,40 11,10 19,40"
-CONSOLE MESSAGE: line 229: Error: Problem parsing points="3,40 11,10 19,40"
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
     RenderSVGContainer {svg} at (0.50,0.50) size 479x359

diff --git a/LayoutTests/svg/W3C-SVG-1.1/struct-use-01-t-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/struct-use-01-t-expected.txt
index 43e2804c61c56ac229d8faa8c0e0b634eda9b8c8..545f9618e5e5836ec2eebd87b4154fd698abb24c 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/struct-use-01-t-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/struct-use-01-t-expected.txt
@@ -1,7 +1,3 @@
-CONSOLE MESSAGE: line 46: Error: Problem parsing points="0,0 20,0 20,20 0,20 0 0"
-CONSOLE MESSAGE: line 47: Error: Problem parsing points="0,0 20,0 20,20"
-CONSOLE MESSAGE: line 81: Error: Problem parsing points="0,0 20,0 20,20"
-CONSOLE MESSAGE: line 82: Error: Problem parsing points="0,0 20,0 20,20 0,20 0 0"
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
     RenderSVGContainer {svg} at (0.50,0.50) size 479x359

diff --git a/LayoutTests/svg/W3C-SVG-1.1/styling-css-01-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/styling-css-01-b-expected.txt
index dcdfdca04b6fd09ffc53b9937403e17b0ea1e629..076c0d5b793b77988e0c779e7cf616f6629b65e1 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/styling-css-01-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/styling-css-01-b-expected.txt
@@ -1,5 +1,3 @@
-CONSOLE MESSAGE: line 72: Error: Problem parsing points="300,100, 320,120, 340,110, 360,120, 390,90, 340,70"
-CONSOLE MESSAGE: line 86: Error: Problem parsing points="300,100, 320,120, 340,110, 360,120, 390,90, 340,70"
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
     RenderSVGContainer {svg} at (0.50,0) size 479x359.50

diff --git a/LayoutTests/svg/W3C-SVG-1.1/styling-css-02-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/styling-css-02-b-expected.txt
index 25fc4dea78009b1dee170c16daaf11b7c32c15d6..50067f4739e879822455cc9ead20538a062abc4d 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/styling-css-02-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/styling-css-02-b-expected.txt
@@ -1,5 +1,3 @@
-CONSOLE MESSAGE: line 71: Error: Problem parsing points="300,100, 320,120, 340,110, 360,120, 390,90, 340,70"
-CONSOLE MESSAGE: line 85: Error: Problem parsing points="300,100, 320,120, 340,110, 360,120, 390,90, 340,70"
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
     RenderSVGContainer {svg} at (0.50,0) size 479x359.50

diff --git a/LayoutTests/svg/W3C-SVG-1.1/styling-css-03-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/styling-css-03-b-expected.txt
index 29a055ded0efda1c449dd7f48d1eee2f08e120e9..df3feac64707321be9deb027f6d38a88c925bd0a 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/styling-css-03-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/styling-css-03-b-expected.txt
@@ -1,5 +1,3 @@
-CONSOLE MESSAGE: line 86: Error: Problem parsing points="300,100, 320,120, 340,110, 360,120, 390,90, 340,70"
-CONSOLE MESSAGE: line 102: Error: Problem parsing points="300,100, 320,120, 340,110, 360,120, 390,90, 340,70"
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
     RenderSVGContainer {svg} at (0.50,0) size 479x359.50

diff --git a/LayoutTests/svg/custom/js-update-polygon-changes-expected.txt b/LayoutTests/svg/custom/js-update-polygon-changes-expected.txt
index 36243d3f9713bf779719cfcd68d8d461b5848be2..e38d443c7cade487f15dd54b033a761776bdcad2 100644 (file)
--- a/LayoutTests/svg/custom/js-update-polygon-changes-expected.txt
+++ b/LayoutTests/svg/custom/js-update-polygon-changes-expected.txt
@@ -1,4 +1,3 @@
-CONSOLE MESSAGE: line 34: Error: Problem parsing points="270,265 300,285 320,265 340,285 280,320 390,320 420,280 280,225"
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
     RenderSVGContainer {svg} at (265.20,209.61) size 161.15x104.39

diff --git a/LayoutTests/svg/custom/js-update-polygon-removal-expected.txt b/LayoutTests/svg/custom/js-update-polygon-removal-expected.txt
index 7da83b19486948a23ddc027e7339a3b3ef7960fd..8bfc8ccafdbb1861284128a39d8db3fb311491ae 100644 (file)
--- a/LayoutTests/svg/custom/js-update-polygon-removal-expected.txt
+++ b/LayoutTests/svg/custom/js-update-polygon-removal-expected.txt
@@ -1,4 +1,3 @@
-CONSOLE MESSAGE: line 30: Error: Problem parsing points="270,265 300,285 320,265 340,285 280,320 390,320 420,280 280,225"
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
     RenderSVGContainer {svg} at (265.20,259.34) size 162.25x64.66

diff --git a/LayoutTests/svg/custom/polyline-hittest-expected.txt b/LayoutTests/svg/custom/polyline-hittest-expected.txt
index e23a7adfb37facc4e123363992ba7befa61b28e9..efe97dbb0fcf63983c916fc07c2c4c66ebab54fe 100644 (file)
--- a/LayoutTests/svg/custom/polyline-hittest-expected.txt
+++ b/LayoutTests/svg/custom/polyline-hittest-expected.txt
@@ -1,4 +1,3 @@
-CONSOLE MESSAGE: line 28: Error: Problem parsing points="0 0 100 0 100 100 0 100"
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
     RenderSVGContainer {svg} at (0,0) size 100x100

diff --git a/LayoutTests/svg/custom/polyline-invalid-points-expected.checksum b/LayoutTests/svg/custom/polyline-invalid-points-expected.checksum
index 736384124a3002d4f089de3cb33b8bcfc8632d28..3a4f1f7086de2672c5ab937ddac1269be537e933 100644 (file)
--- a/LayoutTests/svg/custom/polyline-invalid-points-expected.checksum
+++ b/LayoutTests/svg/custom/polyline-invalid-points-expected.checksum
@@ -1 +1 @@
-778803df0a824ed8f2c7dfa07c56832e
\ No newline at end of file
+16310588467cfc20d551635abc59b784
\ No newline at end of file

diff --git a/LayoutTests/svg/custom/polyline-invalid-points-expected.txt b/LayoutTests/svg/custom/polyline-invalid-points-expected.txt
index 1a4f087b89f7ff80332e636b3b57fc4e658620fe..b31e854b392c460ff4a858077cfd613708f53f8e 100644 (file)
--- a/LayoutTests/svg/custom/polyline-invalid-points-expected.txt
+++ b/LayoutTests/svg/custom/polyline-invalid-points-expected.txt
@@ -2,5 +2,5 @@ CONSOLE MESSAGE: line 4: Error: Problem parsing points="50,0 50, 100,INF INF"
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
     RenderSVGContainer {svg} at (0,0) size 100x100
-      RenderPath {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L100.00,0.00L100.00,100.00L0.00,100.00"]
-      RenderPath {polyline} at (0,0) size 100x100 [stroke={[type=SOLID] [color=#008000] [stroke width=100.00]}] [data="M50.00,0.00L50.00,100.00"]
+      RenderPath {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00L100.00,0.00L100.00,100.00L0.00,100.00"]
+      RenderPath {polyline} at (0,0) size 0x0 [stroke={[type=SOLID] [color=#FF0000] [stroke width=100.00]}] [data=""]

diff --git a/LayoutTests/svg/custom/polyline-invalid-points.svg b/LayoutTests/svg/custom/polyline-invalid-points.svg
index c87acfe3b7088f2ac89ca9fce57fdf8b1200c967..6567d3dfdd75f93b4c0b20d7b966a7bea40b410e 100644 (file)
--- a/LayoutTests/svg/custom/polyline-invalid-points.svg
+++ b/LayoutTests/svg/custom/polyline-invalid-points.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg">
-    <rect x="0" y="0" width="100" height="100" fill="red"/>
-    <polyline fill="none" stroke="green" stroke-width="100" points="50,0 50, 100,INF INF"/>
+    <rect x="0" y="0" width="100" height="100" fill="green"/>
+    <polyline fill="none" stroke="red" stroke-width="100" points="50,0 50, 100,INF INF"/>
 </svg>

diff --git a/LayoutTests/svg/custom/svgpolyparser-extra-space-expected.txt b/LayoutTests/svg/custom/svgpolyparser-extra-space-expected.txt
index 4afebb588cec5db657fca350b769bc357bf471f1..552bf650d02ad93c9d0199d34b6bf856a02ae907 100644 (file)
--- a/LayoutTests/svg/custom/svgpolyparser-extra-space-expected.txt
+++ b/LayoutTests/svg/custom/svgpolyparser-extra-space-expected.txt
@@ -1,4 +1,3 @@
-CONSOLE MESSAGE: line 4: Error: Problem parsing points=" 20,100 100,20 180,100"
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
     RenderSVGContainer {svg} at (20,20) size 160x80

diff --git a/LayoutTests/svg/dom/points-parser-expected.txt b/LayoutTests/svg/dom/points-parser-expected.txt
new file mode 100644 (file)
index 0000000..bcbd566
--- /dev/null
+++ b/LayoutTests/svg/dom/points-parser-expected.txt
@@ -0,0 +1,130 @@
+CONSOLE MESSAGE: line 77: Error: Problem parsing points="a"
+CONSOLE MESSAGE: line 77: Error: Problem parsing points="10"
+CONSOLE MESSAGE: line 77: Error: Problem parsing points="10,"
+CONSOLE MESSAGE: line 77: Error: Problem parsing points="10,,"
+CONSOLE MESSAGE: line 77: Error: Problem parsing points="10,,10"
+CONSOLE MESSAGE: line 77: Error: Problem parsing points="10,10,"
+CONSOLE MESSAGE: line 77: Error: Problem parsing points="10,10a"
+CONSOLE MESSAGE: line 77: Error: Problem parsing points=",10"
+CONSOLE MESSAGE: line 77: Error: Problem parsing points=",10,"
+CONSOLE MESSAGE: line 77: Error: Problem parsing points=",10,,"
+CONSOLE MESSAGE: line 77: Error: Problem parsing points=",10,10"
+This tests the parser for points attribute values.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Test string: ' '
+PASS '' is ''
+
+Test string: '10 10'
+PASS '10 10' is '10 10'
+
+Test string: '10,10'
+PASS '10 10' is '10 10'
+
+Test string: '10, 10'
+PASS '10 10' is '10 10'
+
+Test string: '10 10 20 20'
+PASS '10 10 20 20' is '10 10 20 20'
+
+Test string: '10, 10 20 20'
+PASS '10 10 20 20' is '10 10 20 20'
+
+Test string: '10, 10, 20 20'
+PASS '10 10 20 20' is '10 10 20 20'
+
+Test string: '10, 10, 20, 20'
+PASS '10 10 20 20' is '10 10 20 20'
+
+Test string: '10, 10 20, 20'
+PASS '10 10 20 20' is '10 10 20 20'
+
+Test string: '10 10, 20, 20'
+PASS '10 10 20 20' is '10 10 20 20'
+
+Test string: '10 10 20, 20'
+PASS '10 10 20 20' is '10 10 20 20'
+
+Test string: '10+10'
+PASS '10 10' is '10 10'
+
+Test string: '10-10'
+PASS '10 -10' is '10 -10'
+
+Test string: '10,+10'
+PASS '10 10' is '10 10'
+
+Test string: '10,-10'
+PASS '10 -10' is '10 -10'
+
+Test string: '            10,10'
+PASS '10 10' is '10 10'
+
+Test string: '10,10            '
+PASS '10 10' is '10 10'
+
+Test string: '10,            10'
+PASS '10 10' is '10 10'
+
+Test string: '10            ,10'
+PASS '10 10' is '10 10'
+
+Test string: '10     ,       10'
+PASS '10 10' is '10 10'
+
+Test string: '                 10,10'
+PASS '10 10' is '10 10'
+
+Test string: '10,10                    '
+PASS '10 10' is '10 10'
+
+Test string: '10,                      10'
+PASS '10 10' is '10 10'
+
+Test string: '10                       ,10'
+PASS '10 10' is '10 10'
+
+Test string: '10               ,       10'
+PASS '10 10' is '10 10'
+
+Strings that fail to parse, and hence parse as "".
+
+Test string: 'a'
+PASS '' is ''
+
+Test string: '10'
+PASS '' is ''
+
+Test string: '10,'
+PASS '' is ''
+
+Test string: '10,,'
+PASS '' is ''
+
+Test string: '10,,10'
+PASS '' is ''
+
+Test string: '10,10,'
+PASS '' is ''
+
+Test string: '10,10a'
+PASS '' is ''
+
+Test string: ',10'
+PASS '' is ''
+
+Test string: ',10,'
+PASS '' is ''
+
+Test string: ',10,,'
+PASS '' is ''
+
+Test string: ',10,10'
+PASS '' is ''
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+

diff --git a/LayoutTests/svg/dom/points-parser.html b/LayoutTests/svg/dom/points-parser.html
new file mode 100644 (file)
index 0000000..43eda38
--- /dev/null
+++ b/LayoutTests/svg/dom/points-parser.html
@@ -0,0 +1,81 @@
+<html>
+<head>
+<link rel="stylesheet" href="../../fast/js/resources/js-test-style.css">
+<script src="../../fast/js/resources/js-test-pre.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<script>
+
+description("This tests the parser for points attribute values.");
+
+var polyElement = document.createElementNS("http://www.w3.org/2000/svg", "polyline");
+
+function parsePoints(str, result)
+{
+    polyElement.setAttributeNS(null, "points", " ");
+    polyElement.setAttributeNS(null, "points", str);
+    debug("Test string: '" + str + "'");
+    var len = polyElement.points.numberOfItems;
+    var points = "";
+    for (var i = 0; i < len; ++i) {
+        var p = polyElement.points.getItem(i);
+        if (i > 0) points += " ";
+        points = points + p.x + " " + p.y;
+    }
+    if (points === result) {
+        testPassed("'" + points + "' is '" + result + "'");
+    } else {
+        testFailed("'" + string + "' should be '" + result + "', but is '" + points + "'");
+    }
+    debug("");
+}
+
+parsePoints(" ", "");
+parsePoints("10 10", "10 10");
+parsePoints("10,10", "10 10");
+parsePoints("10, 10", "10 10");
+parsePoints("10 10 20 20", "10 10 20 20");
+parsePoints("10, 10 20 20", "10 10 20 20");
+parsePoints("10, 10, 20 20", "10 10 20 20");
+parsePoints("10, 10, 20, 20", "10 10 20 20");
+parsePoints("10, 10 20, 20", "10 10 20 20");
+parsePoints("10 10, 20, 20", "10 10 20 20");
+parsePoints("10 10 20, 20", "10 10 20 20");
+parsePoints("10+10", "10 10");
+parsePoints("10-10", "10 -10");
+parsePoints("10,+10", "10 10");
+parsePoints("10,-10", "10 -10");
+parsePoints("            10,10", "10 10");
+parsePoints("10,10            ", "10 10");
+parsePoints("10,            10", "10 10");
+parsePoints("10            ,10", "10 10");
+parsePoints("10     ,       10", "10 10");
+parsePoints("                  10,10", "10 10");
+parsePoints("10,10                     ", "10 10");
+parsePoints("10,                       10", "10 10");
+parsePoints("10                        ,10", "10 10");
+parsePoints("10                ,       10", "10 10");
+
+debug('Strings that fail to parse, and hence parse as "".');
+debug('');
+
+parsePoints("a", "");
+parsePoints("10", "");
+parsePoints("10,", "");
+parsePoints("10,,", "");
+parsePoints("10,,10", "");
+parsePoints("10,10,", "");
+parsePoints("10,10a", "");
+parsePoints(",10", "");
+parsePoints(",10,", "");
+parsePoints(",10,,", "");
+parsePoints(",10,10", "");
+
+successfullyParsed = true;
+
+</script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
+</body>
+</html>

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 21a66c9a0a327d37a86c76d3b69c195cd53b6f9d..eb5f405a6f5e946eb8dd4ce23dcb4efb6ca3a9ea 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2007-02-20  Rob Buis  <buis@kde.org>
+
+        Reviewed by Darin.
+
+        http://bugs.webkit.org/show_bug.cgi?id=12439
+        SVG parser complains about points attribute in polygon and polyline element
+
+        Return true when the parsed points specification is valid.
+
+        * ksvg2/svg/SVGParserUtilities.cpp:
+        (WebCore::parseNumber):
+        (WebCore::SVGPolyParser::parsePoints):
+        * ksvg2/svg/SVGPolyElement.cpp:
+        (WebCore::SVGPolyElement::parseMappedAttribute):
+
 2007-02-20  Zack Rusin  <zrusin@trolltech.com>
 
         Reviewed by Lars

diff --git a/WebCore/ksvg2/svg/SVGParserUtilities.cpp b/WebCore/ksvg2/svg/SVGParserUtilities.cpp
index 2797536dca0ec354d23937aae33a8a20bb5d9e4d..d48c1ac24105858cb68a6e0b5480f4f73328b70e 100644 (file)
--- a/WebCore/ksvg2/svg/SVGParserUtilities.cpp
+++ b/WebCore/ksvg2/svg/SVGParserUtilities.cpp
@@ -1,7 +1,7 @@
 /* This file is part of the KDE project
    Copyright (C) 2002, 2003 The Karbon Developers
                  2006       Alexander Kellett <lypanov@kde.org>
-                 2006       Rob Buis <buis@kde.org>
+                 2006, 2007 Rob Buis <buis@kde.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -71,7 +71,6 @@ bool parseNumber(const UChar*& ptr, const UChar* end, double& number, bool skip)
             expsign = -1;
         }
 
-        exponent = 0;
         while (ptr < end && *ptr >= '0' && *ptr <= '9') {
             exponent *= 10;
             exponent += *ptr - '0';
@@ -116,21 +115,31 @@ bool SVGPolyParser::parsePoints(const String& s) const
     const UChar* cur = s.characters();
     const UChar* end = cur + s.length();
 
-    if (!skipOptionalSpaces(cur, end))
-        return false;
+    skipOptionalSpaces(cur, end);
 
+    bool delimParsed = false;
     int segmentNum = 0;
-    while (1) {
+    while (cur < end) {
+        delimParsed = false;
         double xPos = 0;
         if (!parseNumber(cur, end, xPos))
            return false;
 
         double yPos = 0;
-        if (!parseNumber(cur, end, yPos))
+        if (!parseNumber(cur, end, yPos, false))
             return false;
 
+        skipOptionalSpaces(cur, end);
+
+        if (cur < end && *cur == ',') {
+            delimParsed = true;
+            cur++;
+        }
+        skipOptionalSpaces(cur, end);
+
         svgPolyTo(xPos, yPos, segmentNum++);
     }
+    return cur == end && !delimParsed;
 }
 
 bool SVGPathParser::parseSVG(const String& s, bool process)

diff --git a/WebCore/ksvg2/svg/SVGPolyElement.cpp b/WebCore/ksvg2/svg/SVGPolyElement.cpp
index 2b49fc2b5ee77213772819a8e6a32dc0d6f1c10a..542d2fc3396d3cfd6572d326c1ca2c5e82ee4438 100644 (file)
--- a/WebCore/ksvg2/svg/SVGPolyElement.cpp
+++ b/WebCore/ksvg2/svg/SVGPolyElement.cpp
@@ -66,8 +66,10 @@ void SVGPolyElement::parseMappedAttribute(MappedAttribute* attr)
     if (attr->name() == SVGNames::pointsAttr) {
         ExceptionCode ec = 0;
         points()->clear(ec);
-        if (!parsePoints(value) && !m_ignoreAttributeChanges)
+        if (!parsePoints(value) && !m_ignoreAttributeChanges) {
+            points()->clear(ec);
             document()->accessSVGExtensions()->reportError("Problem parsing points=\"" + value + "\"");
+        }
     } else {
         if (SVGTests::parseMappedAttribute(attr))
             return;