Changeset 19427 in webkit

Timestamp:

Feb 6, 2007 7:34:47 AM (17 years ago)

Author:

eseidel

Message:

2007-02-06 Eric Seidel <​eric@webkit.org>

Reviewed by mitz.

WebKit ignores floating point values for stroke-miterlimit
​http://bugs.webkit.org/show_bug.cgi?id=12577

Test: svg/W3C-SVG-1.1/painting-stroke-07-t.svg

• ksvg2/css/SVGCSSParser.cpp: (WebCore::CSSParser::parseSVGValue):
• ksvg2/css/SVGCSSStyleSelector.cpp: (WebCore::CSSStyleSelector::applySVGProperty):
• ksvg2/css/SVGRenderStyle.h:
• ksvg2/css/SVGRenderStyleDefs.h: (WebCore::StyleStrokeData::operator!=):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/W3C-SVG-1.1/animate-elem-41-t-expected.txt (modified) (1 diff)
• LayoutTests/svg/W3C-SVG-1.1/animate-elem-78-t-expected.txt (modified) (1 diff)
• LayoutTests/svg/W3C-SVG-1.1/painting-stroke-03-t-expected.txt (modified) (1 diff)
• LayoutTests/svg/W3C-SVG-1.1/painting-stroke-07-t-expected.checksum (modified) (1 diff)
• LayoutTests/svg/W3C-SVG-1.1/painting-stroke-07-t-expected.png (modified) (previous)
• LayoutTests/svg/W3C-SVG-1.1/painting-stroke-07-t-expected.txt (modified) (1 diff)
• LayoutTests/svg/W3C-SVG-1.1/struct-group-03-t-expected.txt (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/ksvg2/css/SVGCSSParser.cpp (modified) (1 diff)
• WebCore/ksvg2/css/SVGCSSStyleSelector.cpp (modified) (1 diff)
• WebCore/ksvg2/css/SVGRenderStyle.h (modified) (1 diff)
• WebCore/ksvg2/css/SVGRenderStyleDefs.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-02-06  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by mitz.
+        
+        http://bugs.webkit.org/show_bug.cgi?id=12577
+        Update test results now that stroke-miterlimit is a float.
+
+        * 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/painting-stroke-03-t-expected.txt:
+        * svg/W3C-SVG-1.1/painting-stroke-07-t-expected.checksum:
+        * svg/W3C-SVG-1.1/painting-stroke-07-t-expected.png:
+        * svg/W3C-SVG-1.1/painting-stroke-07-t-expected.txt:
+        * svg/W3C-SVG-1.1/struct-group-03-t-expected.txt:
+
 2007-02-06  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/LayoutTests/svg/W3C-SVG-1.1/animate-elem-41-t-expected.txt

@@ -220 +220 @@
             RenderSVGHiddenContainer {defs} at (0,0) size 0x0
               RenderSVGContainer {g} at (4.71,0.53) size 45.59x8.94
-                RenderPath {polyline} at (4.71,0.53) size 22.94x8.94 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
-                RenderPath {polyline} at (34.71,0.53) size 15.59x8.94 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10] [line join=BEVEL]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
+                RenderPath {polyline} at (4.71,0.53) size 22.94x8.94 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10.00]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
+                RenderPath {polyline} at (34.71,0.53) size 15.59x8.94 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10.00] [line join=BEVEL]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
             RenderSVGContainer {use} at (169.71,175.53) size 45.59x8.94
               RenderSVGContainer {g} at (169.71,175.53) size 45.59x8.94
                 RenderSVGContainer {g} at (169.71,175.53) size 45.59x8.94
-                  RenderPath {polyline} at (169.71,175.53) size 22.94x8.94 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
-                  RenderPath {polyline} at (199.71,175.53) size 15.59x8.94 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10] [line join=BEVEL]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
+                  RenderPath {polyline} at (169.71,175.53) size 22.94x8.94 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10.00]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
+                  RenderPath {polyline} at (199.71,175.53) size 15.59x8.94 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10.00] [line join=BEVEL]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
             RenderSVGContainer {use} at (279.71,175.53) size 45.59x8.94
               RenderSVGContainer {g} at (279.71,175.53) size 45.59x8.94 [transform={m=((1.00,0.00)(0.00,1.00)) t=(110.00,0.00)}]
                 RenderSVGContainer {g} at (279.71,175.53) size 45.59x8.94
-                  RenderPath {polyline} at (279.71,175.53) size 22.94x8.94 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
-                  RenderPath {polyline} at (309.71,175.53) size 15.59x8.94 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10] [line join=BEVEL]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
+                  RenderPath {polyline} at (279.71,175.53) size 22.94x8.94 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10.00]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
+                  RenderPath {polyline} at (309.71,175.53) size 15.59x8.94 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10.00] [line join=BEVEL]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
             RenderSVGContainer {use} at (389.71,175.53) size 45.59x8.94
               RenderSVGContainer {g} at (389.71,175.53) size 45.59x8.94 [transform={m=((1.00,0.00)(0.00,1.00)) t=(220.00,0.00)}]
                 RenderSVGContainer {g} at (389.71,175.53) size 45.59x8.94
-                  RenderPath {polyline} at (389.71,175.53) size 22.94x8.94 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
-                  RenderPath {polyline} at (419.71,175.53) size 15.59x8.94 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10] [line join=BEVEL]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
-            RenderPath {polyline} at (169.71,175.53) size 22.94x8.94 [stroke={[type=SOLID] [color=#CC0066] [stroke width=3.00] [miter limit=10]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
+                  RenderPath {polyline} at (389.71,175.53) size 22.94x8.94 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10.00]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
+                  RenderPath {polyline} at (419.71,175.53) size 15.59x8.94 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10.00] [line join=BEVEL]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
+            RenderPath {polyline} at (169.71,175.53) size 22.94x8.94 [stroke={[type=SOLID] [color=#CC0066] [stroke width=3.00] [miter limit=10.00]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
             RenderSVGContainer {g} at (279.71,175.53) size 22.94x8.94 [transform={m=((1.00,0.00)(0.00,1.00)) t=(110.00,0.00)}]
-              RenderPath {polyline} at (279.71,175.53) size 22.94x8.94 [stroke={[type=SOLID] [color=#CC0066] [stroke width=3.00] [miter limit=10]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
+              RenderPath {polyline} at (279.71,175.53) size 22.94x8.94 [stroke={[type=SOLID] [color=#CC0066] [stroke width=3.00] [miter limit=10.00]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
             RenderSVGContainer {a} at (389.71,175.53) size 22.94x8.94 [transform={m=((1.00,0.00)(0.00,1.00)) t=(220.00,0.00)}]
-              RenderPath {polyline} at (389.71,175.53) size 22.94x8.94 [stroke={[type=SOLID] [color=#CC0066] [stroke width=3.00] [miter limit=10]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
+              RenderPath {polyline} at (389.71,175.53) size 22.94x8.94 [stroke={[type=SOLID] [color=#CC0066] [stroke width=3.00] [miter limit=10.00]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
           RenderSVGContainer {g} at (169.53,193.58) size 270.22x12.85 [transform={m=((1.00,0.00)(0.00,1.00)) t=(5.00,120.00)}]
             RenderSVGHiddenContainer {defs} at (0,0) size 0x0
               RenderSVGContainer {g} at (4.53,-1.42) size 50.22x12.85
-                RenderPath {polyline} at (4.53,-1.42) size 15.95x12.85 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=1]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
-                RenderPath {polyline} at (34.53,-1.42) size 20.22x12.85 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
+                RenderPath {polyline} at (4.53,-1.42) size 15.95x12.85 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=1.00]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
+                RenderPath {polyline} at (34.53,-1.42) size 20.22x12.85 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10.00]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
             RenderSVGContainer {use} at (169.53,193.58) size 50.22x12.85
               RenderSVGContainer {g} at (169.53,193.58) size 50.22x12.85
                 RenderSVGContainer {g} at (169.53,193.58) size 50.22x12.85
-                  RenderPath {polyline} at (169.53,193.58) size 15.95x12.85 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=1]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
-                  RenderPath {polyline} at (199.53,193.58) size 20.22x12.85 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
+                  RenderPath {polyline} at (169.53,193.58) size 15.95x12.85 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=1.00]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
+                  RenderPath {polyline} at (199.53,193.58) size 20.22x12.85 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10.00]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
             RenderSVGContainer {use} at (279.53,193.58) size 50.22x12.85
               RenderSVGContainer {g} at (279.53,193.58) size 50.22x12.85 [transform={m=((1.00,0.00)(0.00,1.00)) t=(110.00,0.00)}]
                 RenderSVGContainer {g} at (279.53,193.58) size 50.22x12.85
-                  RenderPath {polyline} at (279.53,193.58) size 15.95x12.85 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=1]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
-                  RenderPath {polyline} at (309.53,193.58) size 20.22x12.85 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
+                  RenderPath {polyline} at (279.53,193.58) size 15.95x12.85 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=1.00]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
+                  RenderPath {polyline} at (309.53,193.58) size 20.22x12.85 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10.00]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
             RenderSVGContainer {use} at (389.53,193.58) size 50.22x12.85
               RenderSVGContainer {g} at (389.53,193.58) size 50.22x12.85 [transform={m=((1.00,0.00)(0.00,1.00)) t=(220.00,0.00)}]
                 RenderSVGContainer {g} at (389.53,193.58) size 50.22x12.85
-                  RenderPath {polyline} at (389.53,193.58) size 15.95x12.85 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=1]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
-                  RenderPath {polyline} at (419.53,193.58) size 20.22x12.85 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
-            RenderPath {polyline} at (169.53,193.58) size 15.95x12.85 [stroke={[type=SOLID] [color=#CC0066] [stroke width=3.00] [miter limit=1]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
+                  RenderPath {polyline} at (389.53,193.58) size 15.95x12.85 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=1.00]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
+                  RenderPath {polyline} at (419.53,193.58) size 20.22x12.85 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10.00]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
+            RenderPath {polyline} at (169.53,193.58) size 15.95x12.85 [stroke={[type=SOLID] [color=#CC0066] [stroke width=3.00] [miter limit=1.00]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
             RenderSVGContainer {g} at (279.53,193.58) size 15.95x12.85 [transform={m=((1.00,0.00)(0.00,1.00)) t=(110.00,0.00)}]
-              RenderPath {polyline} at (279.53,193.58) size 15.95x12.85 [stroke={[type=SOLID] [color=#CC0066] [stroke width=3.00] [miter limit=1]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
+              RenderPath {polyline} at (279.53,193.58) size 15.95x12.85 [stroke={[type=SOLID] [color=#CC0066] [stroke width=3.00] [miter limit=1.00]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
             RenderSVGContainer {a} at (389.53,193.58) size 15.95x12.85 [transform={m=((1.00,0.00)(0.00,1.00)) t=(220.00,0.00)}]
-              RenderPath {polyline} at (389.53,193.58) size 15.95x12.85 [stroke={[type=SOLID] [color=#CC0066] [stroke width=3.00] [miter limit=1]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
+              RenderPath {polyline} at (389.53,193.58) size 15.95x12.85 [stroke={[type=SOLID] [color=#CC0066] [stroke width=3.00] [miter limit=1.00]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
           RenderSVGContainer {g} at (155,218.50) size 281.50x3 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-5.00,145.00)}]
             RenderSVGHiddenContainer {defs} at (0,0) size 0x0

trunk/LayoutTests/svg/W3C-SVG-1.1/animate-elem-78-t-expected.txt

@@ -217 +217 @@
             RenderSVGHiddenContainer {defs} at (0,0) size 0x0
               RenderSVGContainer {g} at (4.71,0.53) size 45.59x8.94
-                RenderPath {polyline} at (4.71,0.53) size 22.94x8.94 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
-                RenderPath {polyline} at (34.71,0.53) size 15.59x8.94 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10] [line join=BEVEL]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
+                RenderPath {polyline} at (4.71,0.53) size 22.94x8.94 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10.00]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
+                RenderPath {polyline} at (34.71,0.53) size 15.59x8.94 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10.00] [line join=BEVEL]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
             RenderSVGContainer {use} at (169.71,175.53) size 45.59x8.94
               RenderSVGContainer {g} at (169.71,175.53) size 45.59x8.94
                 RenderSVGContainer {g} at (169.71,175.53) size 45.59x8.94
-                  RenderPath {polyline} at (169.71,175.53) size 22.94x8.94 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
-                  RenderPath {polyline} at (199.71,175.53) size 15.59x8.94 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10] [line join=BEVEL]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
+                  RenderPath {polyline} at (169.71,175.53) size 22.94x8.94 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10.00]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
+                  RenderPath {polyline} at (199.71,175.53) size 15.59x8.94 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10.00] [line join=BEVEL]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
             RenderSVGContainer {use} at (279.71,175.53) size 45.59x8.94
               RenderSVGContainer {g} at (279.71,175.53) size 45.59x8.94 [transform={m=((1.00,0.00)(0.00,1.00)) t=(110.00,0.00)}]
                 RenderSVGContainer {g} at (279.71,175.53) size 45.59x8.94
-                  RenderPath {polyline} at (279.71,175.53) size 22.94x8.94 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
-                  RenderPath {polyline} at (309.71,175.53) size 15.59x8.94 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10] [line join=BEVEL]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
+                  RenderPath {polyline} at (279.71,175.53) size 22.94x8.94 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10.00]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
+                  RenderPath {polyline} at (309.71,175.53) size 15.59x8.94 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10.00] [line join=BEVEL]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
             RenderSVGContainer {use} at (389.71,175.53) size 45.59x8.94
               RenderSVGContainer {g} at (389.71,175.53) size 45.59x8.94 [transform={m=((1.00,0.00)(0.00,1.00)) t=(220.00,0.00)}]
                 RenderSVGContainer {g} at (389.71,175.53) size 45.59x8.94
-                  RenderPath {polyline} at (389.71,175.53) size 22.94x8.94 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
-                  RenderPath {polyline} at (419.71,175.53) size 15.59x8.94 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10] [line join=BEVEL]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
-            RenderPath {polyline} at (169.71,175.53) size 22.94x8.94 [stroke={[type=SOLID] [color=#CC0066] [stroke width=3.00] [miter limit=10]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
+                  RenderPath {polyline} at (389.71,175.53) size 22.94x8.94 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10.00]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
+                  RenderPath {polyline} at (419.71,175.53) size 15.59x8.94 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10.00] [line join=BEVEL]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
+            RenderPath {polyline} at (169.71,175.53) size 22.94x8.94 [stroke={[type=SOLID] [color=#CC0066] [stroke width=3.00] [miter limit=10.00]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
             RenderSVGContainer {g} at (279.71,175.53) size 22.94x8.94 [transform={m=((1.00,0.00)(0.00,1.00)) t=(110.00,0.00)}]
-              RenderPath {polyline} at (279.71,175.53) size 22.94x8.94 [stroke={[type=SOLID] [color=#CC0066] [stroke width=3.00] [miter limit=10]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
+              RenderPath {polyline} at (279.71,175.53) size 22.94x8.94 [stroke={[type=SOLID] [color=#CC0066] [stroke width=3.00] [miter limit=10.00]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
             RenderSVGContainer {a} at (389.71,175.53) size 22.94x8.94 [transform={m=((1.00,0.00)(0.00,1.00)) t=(220.00,0.00)}]
-              RenderPath {polyline} at (389.71,175.53) size 22.94x8.94 [stroke={[type=SOLID] [color=#CC0066] [stroke width=3.00] [miter limit=10]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
+              RenderPath {polyline} at (389.71,175.53) size 22.94x8.94 [stroke={[type=SOLID] [color=#CC0066] [stroke width=3.00] [miter limit=10.00]}] [data="M5.00,2.00L20.00,5.00L5.00,8.00"]
           RenderSVGContainer {g} at (169.53,193.58) size 270.22x12.85 [transform={m=((1.00,0.00)(0.00,1.00)) t=(5.00,120.00)}]
             RenderSVGHiddenContainer {defs} at (0,0) size 0x0
               RenderSVGContainer {g} at (4.53,-1.42) size 50.22x12.85
-                RenderPath {polyline} at (4.53,-1.42) size 15.95x12.85 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=1]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
-                RenderPath {polyline} at (34.53,-1.42) size 20.22x12.85 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
+                RenderPath {polyline} at (4.53,-1.42) size 15.95x12.85 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=1.00]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
+                RenderPath {polyline} at (34.53,-1.42) size 20.22x12.85 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10.00]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
             RenderSVGContainer {use} at (169.53,193.58) size 50.22x12.85
               RenderSVGContainer {g} at (169.53,193.58) size 50.22x12.85
                 RenderSVGContainer {g} at (169.53,193.58) size 50.22x12.85
-                  RenderPath {polyline} at (169.53,193.58) size 15.95x12.85 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=1]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
-                  RenderPath {polyline} at (199.53,193.58) size 20.22x12.85 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
+                  RenderPath {polyline} at (169.53,193.58) size 15.95x12.85 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=1.00]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
+                  RenderPath {polyline} at (199.53,193.58) size 20.22x12.85 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10.00]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
             RenderSVGContainer {use} at (279.53,193.58) size 50.22x12.85
               RenderSVGContainer {g} at (279.53,193.58) size 50.22x12.85 [transform={m=((1.00,0.00)(0.00,1.00)) t=(110.00,0.00)}]
                 RenderSVGContainer {g} at (279.53,193.58) size 50.22x12.85
-                  RenderPath {polyline} at (279.53,193.58) size 15.95x12.85 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=1]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
-                  RenderPath {polyline} at (309.53,193.58) size 20.22x12.85 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
+                  RenderPath {polyline} at (279.53,193.58) size 15.95x12.85 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=1.00]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
+                  RenderPath {polyline} at (309.53,193.58) size 20.22x12.85 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10.00]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
             RenderSVGContainer {use} at (389.53,193.58) size 50.22x12.85
               RenderSVGContainer {g} at (389.53,193.58) size 50.22x12.85 [transform={m=((1.00,0.00)(0.00,1.00)) t=(220.00,0.00)}]
                 RenderSVGContainer {g} at (389.53,193.58) size 50.22x12.85
-                  RenderPath {polyline} at (389.53,193.58) size 15.95x12.85 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=1]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
-                  RenderPath {polyline} at (419.53,193.58) size 20.22x12.85 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
-            RenderPath {polyline} at (169.53,193.58) size 15.95x12.85 [stroke={[type=SOLID] [color=#CC0066] [stroke width=3.00] [miter limit=1]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
+                  RenderPath {polyline} at (389.53,193.58) size 15.95x12.85 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=1.00]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
+                  RenderPath {polyline} at (419.53,193.58) size 20.22x12.85 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,0.00)}] [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=3.00] [miter limit=10.00]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
+            RenderPath {polyline} at (169.53,193.58) size 15.95x12.85 [stroke={[type=SOLID] [color=#CC0066] [stroke width=3.00] [miter limit=1.00]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
             RenderSVGContainer {g} at (279.53,193.58) size 15.95x12.85 [transform={m=((1.00,0.00)(0.00,1.00)) t=(110.00,0.00)}]
-              RenderPath {polyline} at (279.53,193.58) size 15.95x12.85 [stroke={[type=SOLID] [color=#CC0066] [stroke width=3.00] [miter limit=1]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
+              RenderPath {polyline} at (279.53,193.58) size 15.95x12.85 [stroke={[type=SOLID] [color=#CC0066] [stroke width=3.00] [miter limit=1.00]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
             RenderSVGContainer {a} at (389.53,193.58) size 15.95x12.85 [transform={m=((1.00,0.00)(0.00,1.00)) t=(220.00,0.00)}]
-              RenderPath {polyline} at (389.53,193.58) size 15.95x12.85 [stroke={[type=SOLID] [color=#CC0066] [stroke width=3.00] [miter limit=1]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
+              RenderPath {polyline} at (389.53,193.58) size 15.95x12.85 [stroke={[type=SOLID] [color=#CC0066] [stroke width=3.00] [miter limit=1.00]}] [data="M5.00,0.00L20.00,5.00L5.00,10.00"]
           RenderSVGContainer {g} at (155,218.50) size 281.50x3 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-5.00,145.00)}]
             RenderSVGHiddenContainer {defs} at (0,0) size 0x0

trunk/LayoutTests/svg/W3C-SVG-1.1/painting-stroke-03-t-expected.txt

@@ -7 +7 @@
             text run at (0,-33) width 474: "Basic paint: stroke properties."
         RenderPath {path} at (144.25,54.25) size 217.24x71.50 [stroke={[type=SOLID] [color=#FF0000] [stroke width=30.00] [line cap=ROUND]}] [data="M160.00,70.00L360.00,90.00L160.00,110.00"]
-        RenderPath {path} at (158.51,175.07) size 202.99x69.85 [stroke={[type=SOLID] [color=#FF0000] [stroke width=30.00] [miter limit=1]}] [data="M160.00,190.00L360.00,210.00L160.00,230.00"]
+        RenderPath {path} at (158.51,175.07) size 202.99x69.85 [stroke={[type=SOLID] [color=#FF0000] [stroke width=30.00] [miter limit=1.00]}] [data="M160.00,190.00L360.00,210.00L160.00,230.00"]
         RenderSVGText {text} at (60,160) size 480x44
           RenderSVGInlineText {#text} at (0,-36) size 399x44

trunk/LayoutTests/svg/W3C-SVG-1.1/painting-stroke-07-t-expected.checksum

@@ -1 @@
-baba7ec5a639701b322810ed43b3697e
+d8d4ee8d483d6b2aff87d0c6ebe26086

trunk/LayoutTests/svg/W3C-SVG-1.1/painting-stroke-07-t-expected.txt

@@ -4 +4 @@
       RenderSVGContainer {g} at (95.67,54.01) size 324.50x215.98
         RenderSVGContainer {g} at (95.67,54.01) size 324.50x215.98 [transform={m=((1.20,0.00)(0.00,1.20)) t=(72.00,36.00)}]
-          RenderPath {path} at (95.67,54.01) size 324.50x35.98 [stroke={[type=SOLID] [color=#000000] [stroke width=10.00] [miter limit=20]}] [data="M20.00,20.00L200.00,30.00L20.00,40.00"]
-          RenderPath {path} at (95.67,90.01) size 216.67x35.98 [stroke={[type=SOLID] [color=#000000] [stroke width=10.00]}] [data="M20.00,50.00L200.00,60.00L20.00,70.00"]
-          RenderPath {path} at (95.67,126.01) size 216.67x35.98 [stroke={[type=SOLID] [color=#000000] [stroke width=10.00]}] [data="M20.00,80.00L200.00,90.00L20.00,100.00"]
-          RenderPath {path} at (95.67,162.01) size 216.67x35.98 [stroke={[type=SOLID] [color=#000000] [stroke width=10.00] [miter limit=17]}] [data="M20.00,110.00L200.00,120.00L20.00,130.00"]
+          RenderPath {path} at (95.67,54.01) size 324.50x35.98 [stroke={[type=SOLID] [color=#000000] [stroke width=10.00] [miter limit=20.00]}] [data="M20.00,20.00L200.00,30.00L20.00,40.00"]
+          RenderPath {path} at (95.67,90.01) size 324.50x35.98 [stroke={[type=SOLID] [color=#000000] [stroke width=10.00] [miter limit=18.10]}] [data="M20.00,50.00L200.00,60.00L20.00,70.00"]
+          RenderPath {path} at (95.67,126.01) size 216.67x35.98 [stroke={[type=SOLID] [color=#000000] [stroke width=10.00] [miter limit=17.90]}] [data="M20.00,80.00L200.00,90.00L20.00,100.00"]
+          RenderPath {path} at (95.67,162.01) size 216.67x35.98 [stroke={[type=SOLID] [color=#000000] [stroke width=10.00] [miter limit=17.00]}] [data="M20.00,110.00L200.00,120.00L20.00,130.00"]
           RenderPath {path} at (95.67,198.01) size 216.67x35.98 [stroke={[type=SOLID] [color=#000000] [stroke width=10.00]}] [data="M20.00,140.00L200.00,150.00L20.00,160.00"]
-          RenderPath {path} at (95.67,234.01) size 216.67x35.98 [stroke={[type=SOLID] [color=#000000] [stroke width=10.00] [miter limit=1]}] [data="M20.00,170.00L200.00,180.00L20.00,190.00"]
+          RenderPath {path} at (95.67,234.01) size 216.67x35.98 [stroke={[type=SOLID] [color=#000000] [stroke width=10.00] [miter limit=1.00]}] [data="M20.00,170.00L200.00,180.00L20.00,190.00"]
       RenderSVGText {text} at (10,340) size 480x46
         RenderSVGInlineText {#text} at (0,-36) size 264x46

trunk/LayoutTests/svg/W3C-SVG-1.1/struct-group-03-t-expected.txt

@@ -238 +238 @@
             RenderPath {polyline} at (232.58,161.88) size 20.83x33.76 [stroke={[type=SOLID] [color=#00FF00] [stroke width=5.00] [line join=ROUND]}] [data="M3.00,40.00L11.00,10.00L19.00,40.00"]
           RenderSVGContainer {g} at (254.58,164.36) size 20.83x31.29 [transform={m=((1.00,0.00)(0.00,1.00)) t=(198.00,0.00)}]
-            RenderPath {polyline} at (254.58,164.36) size 20.83x31.29 [stroke={[type=SOLID] [color=#00FF00] [stroke width=5.00] [miter limit=1]}] [data="M3.00,40.00L11.00,10.00L19.00,40.00"]
+            RenderPath {polyline} at (254.58,164.36) size 20.83x31.29 [stroke={[type=SOLID] [color=#00FF00] [stroke width=5.00] [miter limit=1.00]}] [data="M3.00,40.00L11.00,10.00L19.00,40.00"]
           RenderSVGContainer {g} at (284.50,165) size 5x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(220.00,0.00)}]
             RenderPath {line} at (284.50,165) size 5x30 [stroke={[type=SOLID] [color=#00FF00] [stroke width=5.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M11.00,10.00L11.00,40.00"]
@@ -282 +282 @@
             RenderPath {polyline} at (232.58,211.88) size 20.83x33.76 [stroke={[type=SOLID] [color=#00FF00] [stroke width=5.00] [line join=ROUND]}] [data="M3.00,40.00L11.00,10.00L19.00,40.00"]
           RenderSVGContainer {g} at (254.58,214.36) size 20.83x31.29 [transform={m=((1.00,0.00)(0.00,1.00)) t=(198.00,0.00)}]
-            RenderPath {polyline} at (254.58,214.36) size 20.83x31.29 [stroke={[type=SOLID] [color=#00FF00] [stroke width=5.00] [miter limit=1]}] [data="M3.00,40.00L11.00,10.00L19.00,40.00"]
+            RenderPath {polyline} at (254.58,214.36) size 20.83x31.29 [stroke={[type=SOLID] [color=#00FF00] [stroke width=5.00] [miter limit=1.00]}] [data="M3.00,40.00L11.00,10.00L19.00,40.00"]
           RenderSVGContainer {g} at (284.50,215) size 5x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(220.00,0.00)}]
             RenderPath {line} at (284.50,215) size 5x30 [stroke={[type=SOLID] [color=#00FF00] [stroke width=5.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M11.00,10.00L11.00,40.00"]

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-02-06  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by mitz.
+
+        WebKit ignores floating point values for stroke-miterlimit
+        http://bugs.webkit.org/show_bug.cgi?id=12577
+        
+        Test: svg/W3C-SVG-1.1/painting-stroke-07-t.svg
+
+        * ksvg2/css/SVGCSSParser.cpp:
+        (WebCore::CSSParser::parseSVGValue):
+        * ksvg2/css/SVGCSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::applySVGProperty):
+        * ksvg2/css/SVGRenderStyle.h:
+        * ksvg2/css/SVGRenderStyleDefs.h:
+        (WebCore::StyleStrokeData::operator!=):
+
 2007-02-06  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/ksvg2/css/SVGCSSParser.cpp

@@ -127 +127 @@
 
     case SVGCSS_PROP_STROKE_MITERLIMIT:   // <miterlimit> | inherit
-        valid_primitive = validUnit(value, FInteger|FNonNeg, false);
+        valid_primitive = validUnit(value, FNumber|FNonNeg, false);
         break;
 

trunk/WebCore/ksvg2/css/SVGCSSStyleSelector.cpp

@@ -546 +546 @@
                 return;
 
-            svgstyle->setStrokeMiterLimit(lroundf(f));
+            svgstyle->setStrokeMiterLimit(f);
             break;
         }

trunk/WebCore/ksvg2/css/SVGRenderStyle.h

@@ -109 +109 @@
         RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL_REFCOUNTED(SVGPaint, stroke, paint, StrokePaint, strokePaint, SVGPaint::defaultStroke())
         RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL_REFCOUNTED(CSSValueList, stroke, dashArray, StrokeDashArray, strokeDashArray, 0)
-        RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(unsigned int, stroke, miterLimit, StrokeMiterLimit, strokeMiterLimit, 4)
+        RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(float, stroke, miterLimit, StrokeMiterLimit, strokeMiterLimit, 4.0)
         
         RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL_REFCOUNTED(CSSValue, stroke, width, StrokeWidth, strokeWidth, 0)

trunk/WebCore/ksvg2/css/SVGRenderStyleDefs.h

@@ -121 +121 @@
     public:
         StyleStrokeData();
-        StyleStrokeData(const StyleStrokeData &other);
-
-        bool operator==(const StyleStrokeData &other) const;
-        bool operator!=(const StyleStrokeData &other) const
+        StyleStrokeData(const StyleStrokeData&);
+
+        bool operator==(const StyleStrokeData&) const;
+        bool operator!=(const StyleStrokeData& other) const
         {
             return !(*this == other);
@@ -130 +130 @@
 
         float opacity;
-        unsigned int miterLimit;
+        float miterLimit;
 
         RefPtr<CSSValue> width;
@@ -139 +139 @@
 
     private:
-        StyleStrokeData &operator=(const StyleStrokeData &);
+        StyleStrokeData &operator=(const StyleStrokeData&);
     };