[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
rwlbuis at webkit.org
rwlbuis at webkit.org
Wed Dec 22 12:06:51 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit bb92f3d0ff4e99aef60eb30513c53b418e28cfbe
Author: rwlbuis at webkit.org <rwlbuis at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Aug 14 17:53:47 2010 +0000
2010-08-14 Rob Buis <rwlbuis at gmail.com>
Reviewed by Dirk Schulze.
IE SVG empty path test fails
https://bugs.webkit.org/show_bug.cgi?id=44008
Change createLine to allow creating zero-length lines. This makes it possible
to have markers and line-caps applied to zero-length lines.
Test: svg/custom/marker-empty-path.svg
* platform/graphics/Path.cpp:
(WebCore::Path::createLine):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65370 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 588c889..7086fd9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,25 @@
+2010-08-14 Rob Buis <rwlbuis at gmail.com>
+
+ Reviewed by Dirk Schulze.
+
+ IE SVG empty path test fails
+ https://bugs.webkit.org/show_bug.cgi?id=44008
+
+ Added one test and updated test results. animate-elem-80-t.svg
+ is only pixel result change and an improvement.
+
+ * platform/mac-leopard/svg/W3C-SVG-1.1/animate-elem-80-t-expected.checksum:
+ * platform/mac-leopard/svg/W3C-SVG-1.1/animate-elem-80-t-expected.png:
+ * platform/mac/svg/W3C-SVG-1.1/animate-elem-32-t-expected.txt:
+ * platform/mac/svg/W3C-SVG-1.1/animate-elem-80-t-expected.checksum:
+ * platform/mac/svg/W3C-SVG-1.1/animate-elem-80-t-expected.png:
+ * platform/mac/svg/W3C-SVG-1.1/animate-elem-80-t-expected.txt:
+ * platform/mac/svg/W3C-SVG-1.1/shapes-intro-01-t-expected.txt:
+ * platform/mac/svg/custom/marker-empty-path-expected.checksum: Added.
+ * platform/mac/svg/custom/marker-empty-path-expected.png: Added.
+ * platform/mac/svg/custom/marker-empty-path-expected.txt: Added.
+ * svg/custom/marker-empty-path.svg: Added.
+
2010-08-14 Ariya Hidayat <ariya at sencha.com>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/LayoutTests/platform/mac-leopard/svg/W3C-SVG-1.1/animate-elem-80-t-expected.checksum b/LayoutTests/platform/mac-leopard/svg/W3C-SVG-1.1/animate-elem-80-t-expected.checksum
index f0c4d52..fd43350 100644
--- a/LayoutTests/platform/mac-leopard/svg/W3C-SVG-1.1/animate-elem-80-t-expected.checksum
+++ b/LayoutTests/platform/mac-leopard/svg/W3C-SVG-1.1/animate-elem-80-t-expected.checksum
@@ -1 +1 @@
-0f9386d2aec90a11646442a49e92e9c9
\ No newline at end of file
+059d892699532200005b0ecccd0848c4
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/svg/W3C-SVG-1.1/animate-elem-80-t-expected.png b/LayoutTests/platform/mac-leopard/svg/W3C-SVG-1.1/animate-elem-80-t-expected.png
index 06c56f4..7a95d7d 100644
Binary files a/LayoutTests/platform/mac-leopard/svg/W3C-SVG-1.1/animate-elem-80-t-expected.png and b/LayoutTests/platform/mac-leopard/svg/W3C-SVG-1.1/animate-elem-80-t-expected.png differ
diff --git a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-32-t-expected.txt b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-32-t-expected.txt
index 7f312cb..384d468 100644
--- a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-32-t-expected.txt
+++ b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-32-t-expected.txt
@@ -50,7 +50,7 @@ layer at (0,0) size 480x360
RenderPath {ellipse} at (0,0) size 0x0 [fill={[type=SOLID] [color=#FF0000]}] [data=""]
RenderPath {ellipse} at (0,0) size 0x0 [stroke={[type=SOLID] [color=#0000FF]}] [fill={[type=SOLID] [color=#00FF00]}] [data=""]
RenderPath {ellipse} at (0,0) size 0x0 [fill={[type=SOLID] [color=#FF0000]}] [data=""]
- RenderPath {line} at (0,0) size 0x0 [stroke={[type=SOLID] [color=#0000FF]}] [fill={[type=SOLID] [color=#000000]}] [data=""]
+ RenderPath {line} at (0,0) size 0x0 [stroke={[type=SOLID] [color=#0000FF]}] [fill={[type=SOLID] [color=#000000]}] [data="M240.00,265.00 L240.00,265.00"]
RenderSVGText {text} at (10,304) size 284x46 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 284x46
chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 17 width 284.00: "$Revision: 1.16 $"
diff --git a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-80-t-expected.checksum b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-80-t-expected.checksum
index 2a764cb..fd43350 100644
--- a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-80-t-expected.checksum
+++ b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-80-t-expected.checksum
@@ -1 +1 @@
-d1e9c7bedf88bcbf675aa6fe6637dbcb
\ No newline at end of file
+059d892699532200005b0ecccd0848c4
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-80-t-expected.png b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-80-t-expected.png
index 17179c8..7a95d7d 100644
Binary files a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-80-t-expected.png and b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-80-t-expected.png differ
diff --git a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-80-t-expected.txt b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-80-t-expected.txt
index 98c6c09..17fbb88 100644
--- a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-80-t-expected.txt
+++ b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-80-t-expected.txt
@@ -14,18 +14,18 @@ layer at (0,0) size 480x360
RenderPath {circle} at (0,0) size 41x41 [stroke={[type=SOLID] [color=#C0C0C0] [stroke width=2.00]}] [data="M40.00,0.00 L39.92,2.51 L39.68,5.01 L39.29,7.50 L38.74,9.95 L38.04,12.36 L37.19,14.72 L36.19,17.03 L35.05,19.27 L33.77,21.43 L32.36,23.51 L30.82,25.50 L29.16,27.38 L27.38,29.16 L25.50,30.82 L23.51,32.36 L21.43,33.77 L19.27,35.05 L17.03,36.19 L14.72,37.19 L12.36,38.04 L9.95,38.74 L7.50,39.29 L5.01,39.68 L2.51,39.92 L-0.00,40.00 L-2.51,39.92 L-5.01,39.68 L-7.50,39.29 L-9.95,38.74 L-12.36,38.04 L-14.72,37.19 L-17.03,36.19 L-19.27,35.05 L-21.43,33.77 L-23.51,32.36 L-25.50,30.82 L-27.38,29.16 L-29.16,27.38 L-30.82,25.50 L-32.36,23.51 L-33.77,21.43 L-35.05,19.27 L-36.19,17.03 L-37.19,14.72 L-38.04,12.36 L-38.74,9.95 L-39.29,7.50 L-39.68,5.01 L-39.92,2.51 L-40.00,-0.00 L-39.92,-2.51 L-39.68,-5.01 L-39.29,-7.50 L-38.74,-9.95 L-38.04,-12.36 L-37.19,-14.72 L-36.19,-17.03 L-35.05,-19.27 L-33.77,-21.43 L-32.36,-23.51 L-30.82,-25.50 L-29.16,-27.38 L-27.38,-29.16 L-25.50,-30.82 L-23.51,-32.36 L-21.43,-33.77 L-19.27,-35.05 L-17.03,-36.19 L-14.72,-37.19 L-12.36,-38.04 L-9.95,-38.74 L-7.50,-39.29 L-5.01,-39.68 L-2.51,-39.92 L0.00,-40.00 L2.51,-39.92 L5.01,-39.68 L7.50,-39.29 L9.95,-38.74 L12.36,-38.04 L14.72,-37.19 L17.03,-36.19 L19.27,-35.05 L21.43,-33.77 L23.51,-32.36 L25.50,-30.82 L27.38,-29.16 L29.16,-27.38 L30.82,-25.50 L32.36,-23.51 L33.77,-21.43 L35.05,-19.27 L36.19,-17.03 L37.19,-14.72 L38.04,-12.36 L38.74,-9.95 L39.29,-7.50 L39.68,-5.01 L39.92,-2.51 Z"]
RenderPath {line} at (0,0) size 45x1 [stroke={[type=SOLID] [color=#C0C0C0]}] [data="M-45.00,0.00 L45.00,0.00"]
RenderPath {line} at (0,0) size 1x45 [stroke={[type=SOLID] [color=#C0C0C0]}] [data="M0.00,-45.00 L0.00,45.00"]
- RenderSVGContainer {g} at (15,45) size 447x254
- RenderSVGContainer {g} at (15,45) size 90x109 [transform={m=((1.00,0.00)(0.00,1.00)) t=(60.00,90.00)}]
+ RenderSVGContainer {g} at (11,41) size 451x258
+ RenderSVGContainer {g} at (11,41) size 98x113 [transform={m=((1.00,0.00)(0.00,1.00)) t=(60.00,90.00)}]
RenderSVGContainer {use} at (15,45) size 90x90
RenderSVGContainer {g} at (15,45) size 90x90
RenderSVGContainer {g} at (15,45) size 90x90
RenderPath {circle} at (19,49) size 82x82 [stroke={[type=SOLID] [color=#C0C0C0] [stroke width=2.00]}] [data="M40.00,0.00 L39.92,2.51 L39.68,5.01 L39.29,7.50 L38.74,9.95 L38.04,12.36 L37.19,14.72 L36.19,17.03 L35.05,19.27 L33.77,21.43 L32.36,23.51 L30.82,25.50 L29.16,27.38 L27.38,29.16 L25.50,30.82 L23.51,32.36 L21.43,33.77 L19.27,35.05 L17.03,36.19 L14.72,37.19 L12.36,38.04 L9.95,38.74 L7.50,39.29 L5.01,39.68 L2.51,39.92 L-0.00,40.00 L-2.51,39.92 L-5.01,39.68 L-7.50,39.29 L-9.95,38.74 L-12.36,38.04 L-14.72,37.19 L-17.03,36.19 L-19.27,35.05 L-21.43,33.77 L-23.51,32.36 L-25.50,30.82 L-27.38,29.16 L-29.16,27.38 L-30.82,25.50 L-32.36,23.51 L-33.77,21.43 L-35.05,19.27 L-36.19,17.03 L-37.19,14.72 L-38.04,12.36 L-38.74,9.95 L-39.29,7.50 L-39.68,5.01 L-39.92,2.51 L-40.00,-0.00 L-39.92,-2.51 L-39.68,-5.01 L-39.29,-7.50 L-38.74,-9.95 L-38.04,-12.36 L-37.19,-14.72 L-36.19,-17.03 L-35.05,-19.27 L-33.77,-21.43 L-32.36,-23.51 L-30.82,-25.50 L-29.16,-27.38 L-27.38,-29.16 L-25.50,-30.82 L-23.51,-32.36 L-21.43,-33.77 L-19.27,-35.05 L-17.03,-36.19 L-14.72,-37.19 L-12.36,-38.04 L-9.95,-38.74 L-7.50,-39.29 L-5.01,-39.68 L-2.51,-39.92 L0.00,-40.00 L2.51,-39.92 L5.01,-39.68 L7.50,-39.29 L9.95,-38.74 L12.36,-38.04 L14.72,-37.19 L17.03,-36.19 L19.27,-35.05 L21.43,-33.77 L23.51,-32.36 L25.50,-30.82 L27.38,-29.16 L29.16,-27.38 L30.82,-25.50 L32.36,-23.51 L33.77,-21.43 L35.05,-19.27 L36.19,-17.03 L37.19,-14.72 L38.04,-12.36 L38.74,-9.95 L39.29,-7.50 L39.68,-5.01 L39.92,-2.51 Z"]
RenderPath {line} at (15,89) size 90x2 [stroke={[type=SOLID] [color=#C0C0C0]}] [data="M-45.00,0.00 L45.00,0.00"]
RenderPath {line} at (59,45) size 2x90 [stroke={[type=SOLID] [color=#C0C0C0]}] [data="M0.00,-45.00 L0.00,45.00"]
- RenderPath {line} at (0,0) size 0x0 [stroke={[type=SOLID] [color=#C0C0C0] [stroke width=15.00] [line cap=ROUND]}] [fill={[type=SOLID] [color=#000000]}] [data=""]
- RenderPath {line} at (0,0) size 0x0 [transform={m=((0.00,1.00)(-1.00,0.00)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#C0C0C0] [stroke width=15.00] [line cap=ROUND]}] [fill={[type=SOLID] [color=#000000]}] [data=""]
- RenderPath {line} at (0,0) size 0x0 [transform={m=((-1.00,0.00)(-0.00,-1.00)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#C0C0C0] [stroke width=15.00] [line cap=ROUND]}] [fill={[type=SOLID] [color=#000000]}] [data=""]
- RenderPath {line} at (0,0) size 0x0 [transform={m=((-0.00,-1.00)(1.00,-0.00)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#C0C0C0] [stroke width=15.00] [line cap=ROUND]}] [fill={[type=SOLID] [color=#000000]}] [data=""]
+ RenderPath {line} at (91,81) size 18x18 [stroke={[type=SOLID] [color=#C0C0C0] [stroke width=15.00] [line cap=ROUND]}] [fill={[type=SOLID] [color=#000000]}] [data="M40.00,0.00 L40.00,0.00"]
+ RenderPath {line} at (51,121) size 18x18 [transform={m=((0.00,1.00)(-1.00,0.00)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#C0C0C0] [stroke width=15.00] [line cap=ROUND]}] [fill={[type=SOLID] [color=#000000]}] [data="M40.00,0.00 L40.00,0.00"]
+ RenderPath {line} at (11,81) size 18x18 [transform={m=((-1.00,0.00)(-0.00,-1.00)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#C0C0C0] [stroke width=15.00] [line cap=ROUND]}] [fill={[type=SOLID] [color=#000000]}] [data="M40.00,0.00 L40.00,0.00"]
+ RenderPath {line} at (51,41) size 18x18 [transform={m=((-0.00,-1.00)(1.00,-0.00)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#C0C0C0] [stroke width=15.00] [line cap=ROUND]}] [fill={[type=SOLID] [color=#000000]}] [data="M40.00,0.00 L40.00,0.00"]
RenderPath {line} at (55,85) size 50x10 [stroke={[type=SOLID] [color=#C85050] [stroke width=10.00] [line cap=ROUND]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L40.00,0.00"]
RenderSVGText {text} at (-36,46) size 72x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 72x18
@@ -59,17 +59,17 @@ layer at (0,0) size 480x360
RenderSVGText {text} at (-35,61) size 70x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 70x18
chunk 1 (middle anchor) text run 1 at (-34.50,75.00) startOffset 0 endOffset 11 width 69.00: "(sx and sy)"
- RenderSVGContainer {g} at (15,175) size 90x124 [transform={m=((1.00,0.00)(0.00,1.00)) t=(20.00,180.00)}]
+ RenderSVGContainer {g} at (11,171) size 98x128 [transform={m=((1.00,0.00)(0.00,1.00)) t=(20.00,180.00)}]
RenderSVGContainer {use} at (15,175) size 90x90
RenderSVGContainer {g} at (15,175) size 90x90 [transform={m=((1.00,0.00)(0.00,1.00)) t=(40.00,40.00)}]
RenderSVGContainer {g} at (15,175) size 90x90
RenderPath {circle} at (19,179) size 82x82 [stroke={[type=SOLID] [color=#C0C0C0] [stroke width=2.00]}] [data="M40.00,0.00 L39.92,2.51 L39.68,5.01 L39.29,7.50 L38.74,9.95 L38.04,12.36 L37.19,14.72 L36.19,17.03 L35.05,19.27 L33.77,21.43 L32.36,23.51 L30.82,25.50 L29.16,27.38 L27.38,29.16 L25.50,30.82 L23.51,32.36 L21.43,33.77 L19.27,35.05 L17.03,36.19 L14.72,37.19 L12.36,38.04 L9.95,38.74 L7.50,39.29 L5.01,39.68 L2.51,39.92 L-0.00,40.00 L-2.51,39.92 L-5.01,39.68 L-7.50,39.29 L-9.95,38.74 L-12.36,38.04 L-14.72,37.19 L-17.03,36.19 L-19.27,35.05 L-21.43,33.77 L-23.51,32.36 L-25.50,30.82 L-27.38,29.16 L-29.16,27.38 L-30.82,25.50 L-32.36,23.51 L-33.77,21.43 L-35.05,19.27 L-36.19,17.03 L-37.19,14.72 L-38.04,12.36 L-38.74,9.95 L-39.29,7.50 L-39.68,5.01 L-39.92,2.51 L-40.00,-0.00 L-39.92,-2.51 L-39.68,-5.01 L-39.29,-7.50 L-38.74,-9.95 L-38.04,-12.36 L-37.19,-14.72 L-36.19,-17.03 L-35.05,-19.27 L-33.77,-21.43 L-32.36,-23.51 L-30.82,-25.50 L-29.16,-27.38 L-27.38,-29.16 L-25.50,-30.82 L-23.51,-32.36 L-21.43,-33.77 L-19.27,-35.05 L-17.03,-36.19 L-14.72,-37.19 L-12.36,-38.04 L-9.95,-38.74 L-7.50,-39.29 L-5.01,-39.68 L-2.51,-39.92 L0.00,-40.00 L2.51,-39.92 L5.01,-39.68 L7.50,-39.29 L9.95,-38.74 L12.36,-38.04 L14.72,-37.19 L17.03,-36.19 L19.27,-35.05 L21.43,-33.77 L23.51,-32.36 L25.50,-30.82 L27.38,-29.16 L29.16,-27.38 L30.82,-25.50 L32.36,-23.51 L33.77,-21.43 L35.05,-19.27 L36.19,-17.03 L37.19,-14.72 L38.04,-12.36 L38.74,-9.95 L39.29,-7.50 L39.68,-5.01 L39.92,-2.51 Z"]
RenderPath {line} at (15,219) size 90x2 [stroke={[type=SOLID] [color=#C0C0C0]}] [data="M-45.00,0.00 L45.00,0.00"]
RenderPath {line} at (59,175) size 2x90 [stroke={[type=SOLID] [color=#C0C0C0]}] [data="M0.00,-45.00 L0.00,45.00"]
- RenderPath {line} at (0,0) size 0x0 [stroke={[type=SOLID] [color=#C0C0C0] [stroke width=15.00] [line cap=ROUND]}] [fill={[type=SOLID] [color=#000000]}] [data=""]
- RenderPath {line} at (0,0) size 0x0 [transform={m=((0.00,1.00)(-1.00,0.00)) t=(80.00,0.00)}] [stroke={[type=SOLID] [color=#C0C0C0] [stroke width=15.00] [line cap=ROUND]}] [fill={[type=SOLID] [color=#000000]}] [data=""]
- RenderPath {line} at (0,0) size 0x0 [transform={m=((-1.00,0.00)(-0.00,-1.00)) t=(80.00,80.00)}] [stroke={[type=SOLID] [color=#C0C0C0] [stroke width=15.00] [line cap=ROUND]}] [fill={[type=SOLID] [color=#000000]}] [data=""]
- RenderPath {line} at (0,0) size 0x0 [transform={m=((-0.00,-1.00)(1.00,-0.00)) t=(0.00,80.00)}] [stroke={[type=SOLID] [color=#C0C0C0] [stroke width=15.00] [line cap=ROUND]}] [fill={[type=SOLID] [color=#000000]}] [data=""]
+ RenderPath {line} at (91,211) size 18x18 [stroke={[type=SOLID] [color=#C0C0C0] [stroke width=15.00] [line cap=ROUND]}] [fill={[type=SOLID] [color=#000000]}] [data="M80.00,40.00 L80.00,40.00"]
+ RenderPath {line} at (51,251) size 18x18 [transform={m=((0.00,1.00)(-1.00,0.00)) t=(80.00,0.00)}] [stroke={[type=SOLID] [color=#C0C0C0] [stroke width=15.00] [line cap=ROUND]}] [fill={[type=SOLID] [color=#000000]}] [data="M80.00,40.00 L80.00,40.00"]
+ RenderPath {line} at (11,211) size 18x18 [transform={m=((-1.00,0.00)(-0.00,-1.00)) t=(80.00,80.00)}] [stroke={[type=SOLID] [color=#C0C0C0] [stroke width=15.00] [line cap=ROUND]}] [fill={[type=SOLID] [color=#000000]}] [data="M80.00,40.00 L80.00,40.00"]
+ RenderPath {line} at (51,171) size 18x18 [transform={m=((-0.00,-1.00)(1.00,-0.00)) t=(0.00,80.00)}] [stroke={[type=SOLID] [color=#C0C0C0] [stroke width=15.00] [line cap=ROUND]}] [fill={[type=SOLID] [color=#000000]}] [data="M80.00,40.00 L80.00,40.00"]
RenderPath {line} at (55,215) size 50x10 [stroke={[type=SOLID] [color=#C85050] [stroke width=10.00] [line cap=ROUND]}] [fill={[type=SOLID] [color=#000000]}] [data="M40.00,40.00 L80.00,40.00"]
RenderSVGText {text} at (4,86) size 72x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 72x18
diff --git a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-intro-01-t-expected.txt b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-intro-01-t-expected.txt
index 924d87c..fe33aba 100644
--- a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-intro-01-t-expected.txt
+++ b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-intro-01-t-expected.txt
@@ -50,7 +50,7 @@ layer at (0,0) size 480x360
RenderPath {ellipse} at (0,0) size 0x0 [fill={[type=SOLID] [color=#00FF00]}] [data=""]
RenderPath {ellipse} at (0,0) size 0x0 [stroke={[type=SOLID] [color=#000000]}] [data=""]
RenderPath {ellipse} at (0,0) size 0x0 [fill={[type=SOLID] [color=#FF0000]}] [data=""]
- RenderPath {line} at (0,0) size 0x0 [stroke={[type=SOLID] [color=#0000FF]}] [fill={[type=SOLID] [color=#000000]}] [data=""]
+ RenderPath {line} at (0,0) size 0x0 [stroke={[type=SOLID] [color=#0000FF]}] [fill={[type=SOLID] [color=#000000]}] [data="M240.00,265.00 L240.00,265.00"]
RenderSVGText {text} at (10,304) size 264x46 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 264x46
chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.9 $"
diff --git a/LayoutTests/platform/mac/svg/custom/marker-empty-path-expected.checksum b/LayoutTests/platform/mac/svg/custom/marker-empty-path-expected.checksum
new file mode 100644
index 0000000..e9bebdd
--- /dev/null
+++ b/LayoutTests/platform/mac/svg/custom/marker-empty-path-expected.checksum
@@ -0,0 +1 @@
+e0431c7fe5ffd7f9fd2c7ea3889a7661
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/svg/custom/marker-empty-path-expected.png b/LayoutTests/platform/mac/svg/custom/marker-empty-path-expected.png
new file mode 100644
index 0000000..d3d49d4
Binary files /dev/null and b/LayoutTests/platform/mac/svg/custom/marker-empty-path-expected.png differ
diff --git a/LayoutTests/platform/mac/svg/custom/marker-empty-path-expected.txt b/LayoutTests/platform/mac/svg/custom/marker-empty-path-expected.txt
new file mode 100644
index 0000000..e431b5a
--- /dev/null
+++ b/LayoutTests/platform/mac/svg/custom/marker-empty-path-expected.txt
@@ -0,0 +1,10 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderSVGRoot {svg} at (0,0) size 72x172
+ RenderSVGContainer {g} at (0,0) size 72x172
+ RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+ RenderSVGResourceMarker {marker} [id="testMarker"] [markerUnits=strokeWidth] [ref at (0,0)] [angle=0.00]
+ RenderPath {rect} at (0,0) size 3x3 [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L96.00,0.00 L96.00,96.00 L0.00,96.00 Z"]
+ RenderPath {path} at (0,0) size 72x72 [fill={[type=SOLID] [color=#000000]}] [end marker=testMarker] [data="M0.00,0.00 L0.00,0.00"]
+ RenderPath {line} at (0,100) size 72x72 [fill={[type=SOLID] [color=#000000]}] [end marker=testMarker] [data="M0.00,100.00 L0.00,100.00"]
diff --git a/LayoutTests/svg/custom/marker-empty-path.svg b/LayoutTests/svg/custom/marker-empty-path.svg
new file mode 100644
index 0000000..2d52228
--- /dev/null
+++ b/LayoutTests/svg/custom/marker-empty-path.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%">
+ <title>SVG 1.1 2nd Edition Test: Markers and zero-length 'path' and 'line' segments</title>
+ <g>
+ <defs>
+ <marker id="testMarker" viewBox="0 0 100 100">
+ <rect width="96" height="96" fill="green"/>
+ </marker>
+ </defs>
+ <path d="m 0 0 L 0 0" stroke-width="25" marker-end="url(#testMarker)"/>
+ <line x1="0" x2="0" y1="100" y2="100" stroke-width="25" marker-end="url(#testMarker)"/>
+ </g>
+</svg>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 463db76..c0fa56c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-14 Rob Buis <rwlbuis at gmail.com>
+
+ Reviewed by Dirk Schulze.
+
+ IE SVG empty path test fails
+ https://bugs.webkit.org/show_bug.cgi?id=44008
+
+ Change createLine to allow creating zero-length lines. This makes it possible
+ to have markers and line-caps applied to zero-length lines.
+
+ Test: svg/custom/marker-empty-path.svg
+
+ * platform/graphics/Path.cpp:
+ (WebCore::Path::createLine):
+
2010-08-14 Patrick Gansterer <paroga at paroga.com>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/platform/graphics/Path.cpp b/WebCore/platform/graphics/Path.cpp
index af94be7..333afcb 100644
--- a/WebCore/platform/graphics/Path.cpp
+++ b/WebCore/platform/graphics/Path.cpp
@@ -266,8 +266,6 @@ Path Path::createCircle(const FloatPoint& center, float r)
Path Path::createLine(const FloatPoint& start, const FloatPoint& end)
{
Path path;
- if (start.x() == end.x() && start.y() == end.y())
- return path;
path.moveTo(start);
path.addLineTo(end);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list