Bug #: 5747

Submitted by: eseidel
Reviewed by: timo
        Updated results for KCanvaPath changes:
        http://bugzilla.opendarwin.org/show_bug.cgi?id=5747

        * svg/W3C-SVG-1.1/masking-path-01-b-expected.txt:
        * svg/W3C-SVG-1.1/masking-path-02-b-expected.txt:
        * svg/W3C-SVG-1.1/masking-path-04-b-expected.txt:
        * svg/W3C-SVG-1.1/masking-path-05-f-expected.txt:
        * svg/W3C-SVG-1.1/painting-marker-02-f-expected.txt:

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ce5c1ee5763149832b80004c35c205db1137b80c..630e047e0776f798913988d354bf01387318a511 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2005-12-05  Eric Seidel  <eseidel@apple.com>
+
+        Reviewed by timo.
+
+        Updated results for KCanvaPath changes:
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=5747
+
+        * svg/W3C-SVG-1.1/masking-path-01-b-expected.txt:
+        * svg/W3C-SVG-1.1/masking-path-02-b-expected.txt:
+        * svg/W3C-SVG-1.1/masking-path-04-b-expected.txt:
+        * svg/W3C-SVG-1.1/masking-path-05-f-expected.txt:
+        * svg/W3C-SVG-1.1/painting-marker-02-f-expected.txt:
+
 2005-12-04  Anders Carlsson  <andersca@mac.com>
 
         Reviewed by Geoffrey.

diff --git a/LayoutTests/svg/W3C-SVG-1.1/masking-path-01-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/masking-path-01-b-expected.txt
index 5999b12ae1318108a6d9a6b71eaa6129910c8fdc..874ab7288cd6870a8ef7287f87ecd5836785ea9c 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/masking-path-01-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/masking-path-01-b-expected.txt
@@ -1,5 +1,5 @@
-KCanvasResource {id="clip1" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=[{cmd=MOVE x3=200.00 y3=10.00}, {cmd=LINE x3=260.00 y3=10.00}, {cmd=LINE x3=260.00 y3=110.00}, {cmd=LINE x3=200.00 y3=110.00}, {cmd=CLOSE_SUBPATH}]]]]}
-KCanvasResource {id="clip2" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=[{cmd=MOVE x3=90.00 y3=150.00}, {cmd=LINE x3=165.00 y3=150.00}, {cmd=LINE x3=165.00 y3=225.00}, {cmd=LINE x3=90.00 y3=225.00}, {cmd=CLOSE_SUBPATH}]], [winding=NON-ZERO] [path=[{cmd=MOVE x3=225.00 y3=160.00}, {cmd=LINE x3=290.00 y3=160.00}, {cmd=LINE x3=290.00 y3=225.00}, {cmd=LINE x3=225.00 y3=225.00}, {cmd=CLOSE_SUBPATH}]]]]}
+KCanvasResource {id="clip1" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=M200.00,10.00L260.00,10.00L260.00,110.00L200.00,110.00]]]}
+KCanvasResource {id="clip2" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=M90.00,150.00L165.00,150.00L165.00,225.00L90.00,225.00], [winding=NON-ZERO] [path=M225.00,160.00L290.00,160.00L290.00,225.00L225.00,225.00]]]}
 layer at (0,0) size 480x360
   RenderCanvas at (0,0) size 480x360
     KCanvasContainer {svg} at (0,0) size 479x359

diff --git a/LayoutTests/svg/W3C-SVG-1.1/masking-path-02-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/masking-path-02-b-expected.txt
index 0ceb79d5a927c6666f72fac1a397559baf12423f..033f9c5d8cec631afdf9b6bf5a622f004af21dc7 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/masking-path-02-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/masking-path-02-b-expected.txt
@@ -1,5 +1,5 @@
-KCanvasResource {id="clip1" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [bounding box mode=1] [path=[{cmd=MOVE x3=0.25 y3=0.50}, {cmd=LINE x3=0.85 y3=0.50}, {cmd=LINE x3=0.85 y3=1.50}, {cmd=LINE x3=0.25 y3=1.50}, {cmd=CLOSE_SUBPATH}]]]]}
-KCanvasResource {id="clip2" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=[{cmd=MOVE x3=60.00 y3=60.00}, {cmd=LINE x3=140.00 y3=60.00}, {cmd=LINE x3=140.00 y3=140.00}, {cmd=LINE x3=60.00 y3=140.00}, {cmd=CLOSE_SUBPATH}]]]]}
+KCanvasResource {id="clip1" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [bounding box mode=1] [path=M0.25,0.50L0.85,0.50L0.85,1.50L0.25,1.50]]]}
+KCanvasResource {id="clip2" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=M60.00,60.00L140.00,60.00L140.00,140.00L60.00,140.00]]]}
 layer at (0,0) size 480x360
   RenderCanvas at (0,0) size 480x360
     KCanvasContainer {svg} at (0,0) size 479x359

diff --git a/LayoutTests/svg/W3C-SVG-1.1/masking-path-04-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/masking-path-04-b-expected.txt
index 1a89b395c72bc98128f23da5f6b9f898794570e5..bd2bbceb54266789eb4d6f1406605e827dce3baa 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/masking-path-04-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/masking-path-04-b-expected.txt
@@ -1,4 +1,4 @@
-KCanvasResource {id="sample" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=[]]]]}
+KCanvasResource {id="sample" [type=CLIPPER] [clip data=[]]}
 layer at (0,0) size 480x360
   RenderCanvas at (0,0) size 480x360
     KCanvasContainer {svg} at (0,0) size 479x359

diff --git a/LayoutTests/svg/W3C-SVG-1.1/masking-path-05-f-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/masking-path-05-f-expected.txt
index 5ed75fab3a11675795d480f2cb7b7a14b8aa8b23..1ec136f73af697151e099d08b2dd9613c08a7867 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/masking-path-05-f-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/masking-path-05-f-expected.txt
@@ -1,5 +1,5 @@
-KCanvasResource {id="clip1" [type=CLIPPER] [clip data=[[winding=EVEN-ODD] [path=[{cmd=MOVE x3=200.00 y3=40.00}, {cmd=LINE x3=220.00 y3=40.00}, {cmd=LINE x3=220.00 y3=100.00}, {cmd=LINE x3=240.00 y3=100.00}, {cmd=LINE x3=240.00 y3=80.00}, {cmd=LINE x3=180.00 y3=80.00}, {cmd=LINE x3=180.00 y3=60.00}, {cmd=LINE x3=260.00 y3=60.00}, {cmd=LINE x3=260.00 y3=120.00}, {cmd=LINE x3=200.00 y3=120.00}, {cmd=LINE x3=200.00 y3=40.00}, {cmd=CLOSE_SUBPATH}]]]]}
-KCanvasResource {id="clip2" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=[{cmd=MOVE x3=200.00 y3=170.00}, {cmd=LINE x3=220.00 y3=170.00}, {cmd=LINE x3=220.00 y3=230.00}, {cmd=LINE x3=240.00 y3=230.00}, {cmd=LINE x3=240.00 y3=210.00}, {cmd=LINE x3=180.00 y3=210.00}, {cmd=LINE x3=180.00 y3=190.00}, {cmd=LINE x3=260.00 y3=190.00}, {cmd=LINE x3=260.00 y3=250.00}, {cmd=LINE x3=200.00 y3=250.00}, {cmd=LINE x3=200.00 y3=170.00}, {cmd=CLOSE_SUBPATH}]]]]}
+KCanvasResource {id="clip1" [type=CLIPPER] [clip data=[[winding=EVEN-ODD] [path=M200.00,40.00L220.00,40.00L220.00,100.00L240.00,100.00L240.00,80.00L180.00,80.00L180.00,60.00L260.00,60.00L260.00,120.00L200.00,120.00L200.00,40.00]]]}
+KCanvasResource {id="clip2" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=M200.00,170.00L220.00,170.00L220.00,230.00L240.00,230.00L240.00,210.00L180.00,210.00L180.00,190.00L260.00,190.00L260.00,250.00L200.00,250.00L200.00,170.00]]]}
 layer at (0,0) size 480x360
   RenderCanvas at (0,0) size 480x360
     KCanvasContainer {svg} at (0,0) size 479x359

diff --git a/LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f-expected.txt
index d1cc3a7d9020ca6405aaf1e47a0e2c524f4a34bf..e5edf3a21840c902ecbd66fbf65e8f4098c027f5 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f-expected.txt
@@ -1,5 +1,5 @@
-KCanvasResource {id="overflowHiddenClip1" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=[{cmd=MOVE x3=0.00 y3=0.00}, {cmd=LINE x3=2.00 y3=0.00}, {cmd=LINE x3=2.00 y3=2.00}, {cmd=LINE x3=0.00 y3=2.00}, {cmd=CLOSE_SUBPATH}]]]]}
-KCanvasResource {id="overflowHiddenClip" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=[{cmd=MOVE x3=0.00 y3=0.00}, {cmd=LINE x3=4.00 y3=0.00}, {cmd=LINE x3=4.00 y3=4.00}, {cmd=LINE x3=0.00 y3=4.00}, {cmd=CLOSE_SUBPATH}]]]]}
+KCanvasResource {id="overflowHiddenClip1" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=M0.00,0.00L2.00,0.00L2.00,2.00L0.00,2.00]]]}
+KCanvasResource {id="overflowHiddenClip" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=M0.00,0.00L4.00,0.00L4.00,4.00L0.00,4.00]]]}
 KCanvasResource {id="marker1" [type=MARKER] [angle=0.00] [ref x=5.00 y=5.00]}
 KCanvasResource {id="marker2" [type=MARKER] [angle=0.00] [ref x=10.00 y=10.00]}
 KCanvasResource {id="marker3" [type=MARKER] [angle=0.00] [ref x=10.00 y=10.00]}