No review - updated results for earlier patch.

        - updated SVG test results where my recent fix affected bounding boxes

        I think the new results are more accurate bounding boxes and in
        any case there is no actual difference in rendered output.

        * svg/W3C-SVG-1.1/color-prof-01-f-expected.txt:
        * svg/W3C-SVG-1.1/filters-blend-01-b-expected.txt:
        * svg/W3C-SVG-1.1/filters-conv-01-f-expected.txt:
        * svg/W3C-SVG-1.1/filters-diffuse-01-f-expected.txt:
        * svg/W3C-SVG-1.1/filters-light-01-f-expected.txt:
        * svg/W3C-SVG-1.1/filters-specular-01-f-expected.txt:
        * svg/W3C-SVG-1.1/masking-path-04-b-expected.txt:
        * svg/W3C-SVG-1.1/render-groups-01-b-expected.txt:
        * svg/W3C-SVG-1.1/render-groups-03-t-expected.txt:
        * svg/W3C-SVG-1.1/struct-image-01-t-expected.txt:
        * svg/W3C-SVG-1.1/struct-image-03-t-expected.txt:
        * svg/W3C-SVG-1.1/struct-image-04-t-expected.txt:
        * svg/custom/foreign-object-skew-expected.txt:
        * svg/custom/image-with-transform-clip-filter-expected.txt:
        * svg/custom/text-image-opacity-expected.txt:

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 60fe026edcee161748be31099d648892e38748c9..7a3abcd97cf65477e83353bfb03ec43fd98c2bfd 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,28 @@
+2006-06-20  Maciej Stachowiak  <mjs@apple.com>
+
+        No review - updated results for earlier patch.
+        
+        - updated SVG test results where my recent fix affected bounding boxes
+        
+        I think the new results are more accurate bounding boxes and in
+        any case there is no actual difference in rendered output.
+
+        * svg/W3C-SVG-1.1/color-prof-01-f-expected.txt:
+        * svg/W3C-SVG-1.1/filters-blend-01-b-expected.txt:
+        * svg/W3C-SVG-1.1/filters-conv-01-f-expected.txt:
+        * svg/W3C-SVG-1.1/filters-diffuse-01-f-expected.txt:
+        * svg/W3C-SVG-1.1/filters-light-01-f-expected.txt:
+        * svg/W3C-SVG-1.1/filters-specular-01-f-expected.txt:
+        * svg/W3C-SVG-1.1/masking-path-04-b-expected.txt:
+        * svg/W3C-SVG-1.1/render-groups-01-b-expected.txt:
+        * svg/W3C-SVG-1.1/render-groups-03-t-expected.txt:
+        * svg/W3C-SVG-1.1/struct-image-01-t-expected.txt:
+        * svg/W3C-SVG-1.1/struct-image-03-t-expected.txt:
+        * svg/W3C-SVG-1.1/struct-image-04-t-expected.txt:
+        * svg/custom/foreign-object-skew-expected.txt:
+        * svg/custom/image-with-transform-clip-filter-expected.txt:
+        * svg/custom/text-image-opacity-expected.txt:
+
 2006-06-20  Adele Peterson  <adele@apple.com>
 
         Reviewed by Anders.

diff --git a/LayoutTests/svg/W3C-SVG-1.1/color-prof-01-f-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/color-prof-01-f-expected.txt
index 9e2c55334ce47588b5bb9eb63da9ba6acdd5be0c..08ed0ed9b2b94386da4ec60d20e6b3f9022f351e 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/color-prof-01-f-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/color-prof-01-f-expected.txt
@@ -1,10 +1,10 @@
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
-    KCanvasContainer {svg} at (0,0) size 479.50x359.50
-      KCanvasContainer {g} at (0,0) size 190x190
-        KCanvasContainer {g} at (0,0) size 190x190
+    KCanvasContainer {svg} at (0.50,0) size 479x359.50
+      KCanvasContainer {g} at (30,0) size 420x280
+        KCanvasContainer {g} at (30,0) size 190x190
           RenderImage {image} at (0,0) size 190x190
-        KCanvasContainer {g} at (0,0) size 190x190
+        KCanvasContainer {g} at (260,90) size 190x190
           RenderImage {image} at (0,0) size 190x190
         RenderSVGText {text} at (0,0) size 465x14
           RenderText {#text} at (0,0) size 208x14

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-blend-01-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/filters-blend-01-b-expected.txt
index f1920bb7eb86b193f3672fd2949a2da16508f607..7538e0169c4f709945e355a258ae825214124fe4 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/filters-blend-01-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/filters-blend-01-b-expected.txt
@@ -5,8 +5,8 @@ KCanvasResource {id="BlendDarken" [type=FILTER]  [bounding box=at (0,0) size 1x1
 KCanvasResource {id="BlendLighten" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0] [effects=[[type=FLOOD] [in="SourceGraphic"] [result="img2"] [subregion="at (0,0) size 160x120"] [color=#00FF00] [opacity=0.50], [type=BLEND] [in="SourceGraphic"] [subregion="at (0,0) size 160x120"] [in2="img2"] [blend mode=LIGHTEN]]]}
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
-    KCanvasContainer {svg} at (0,0) size 477.75x357.75
-      KCanvasContainer {g} at (0,0) size 450x294
+    KCanvasContainer {svg} at (2.25,2.25) size 475.50x355.50
+      KCanvasContainer {g} at (90,15) size 360x294
         RenderImage {image} at (0,0) size 100x98
         KCanvasItem {rect} at (90,30) size 360x30 [opacity=0.50] [fill={[type=SOLID] [color=#0000FF]}] [filter=#BlendNormal] [data="M30.00,10.00L150.00,10.00L150.00,20.00L30.00,20.00"]
         KCanvasItem {rect} at (90,69) size 360x30 [opacity=0.50] [fill={[type=SOLID] [color=#0000FF]}] [filter=#BlendMultiply] [data="M30.00,23.00L150.00,23.00L150.00,33.00L30.00,33.00"]

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-conv-01-f-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/filters-conv-01-f-expected.txt
index 0bbf64bd86c4c093ce6373c2696ba5ca896cc4fa..f77703934f84a09d7206c53d4807d76bab7c7107 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/filters-conv-01-f-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/filters-conv-01-f-expected.txt
@@ -7,38 +7,38 @@ KCanvasResource {id="convolve6" [type=FILTER]  [bounding box=at (0,0) size 1x1]
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
     KCanvasContainer {svg} at (0.50,0.50) size 479x359
-      KCanvasContainer {g} at (20,40) size 350x156
-        KCanvasContainer {g} at (20,40) size 350x156 [transform={m=((1.00,0.00)(0.00,1.00)) t=(20.00,40.00)}]
-          KCanvasContainer {g} at (20,40) size 350x156
+      KCanvasContainer {g} at (30,70) size 350x156
+        KCanvasContainer {g} at (30,70) size 350x156 [transform={m=((1.00,0.00)(0.00,1.00)) t=(20.00,40.00)}]
+          KCanvasContainer {g} at (30,70) size 350x156
             RenderSVGText {text} at (0,0) size 465x18
               RenderText {#text} at (0,0) size 66x18
                 text run at (0,0) width 66: "Blur (3x3)"
-            KCanvasContainer {g} at (20,40) size 50x63
+            KCanvasContainer {g} at (30,70) size 50x63
               RenderImage {image} at (0,0) size 50x63
             RenderSVGText {text} at (0,0) size 465x18
               RenderText {#text} at (0,0) size 136x18
                 text run at (0,0) width 136: "Edge Detection (3x3)"
-            KCanvasContainer {g} at (170,40) size 50x63 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,0.00)}]
+            KCanvasContainer {g} at (180,70) size 50x63 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,0.00)}]
               RenderImage {image} at (0,0) size 50x63
             RenderSVGText {text} at (0,0) size 465x18
               RenderText {#text} at (0,0) size 110x18
                 text run at (0,0) width 110: "Sharpening (3x3)"
-            KCanvasContainer {g} at (320,40) size 50x63 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,0.00)}]
+            KCanvasContainer {g} at (330,70) size 50x63 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,0.00)}]
               RenderImage {image} at (0,0) size 50x63
             RenderSVGText {text} at (0,0) size 465x18
               RenderText {#text} at (0,0) size 108x18
                 text run at (0,0) width 108: "Embossing (3x3)"
-            KCanvasContainer {g} at (20,133) size 50x63 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,93.00)}]
+            KCanvasContainer {g} at (30,163) size 50x63 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,93.00)}]
               RenderImage {image} at (0,0) size 50x63
             RenderSVGText {text} at (0,0) size 465x18
               RenderText {#text} at (0,0) size 134x18
                 text run at (0,0) width 134: "Horizontal blur (3x1)"
-            KCanvasContainer {g} at (170,133) size 50x63 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,93.00)}]
+            KCanvasContainer {g} at (180,163) size 50x63 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,93.00)}]
               RenderImage {image} at (0,0) size 50x63
             RenderSVGText {text} at (0,0) size 465x18
               RenderText {#text} at (0,0) size 117x18
                 text run at (0,0) width 117: "Vertical blur (1x3)"
-            KCanvasContainer {g} at (320,133) size 50x63 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,93.00)}]
+            KCanvasContainer {g} at (330,163) size 50x63 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,93.00)}]
               RenderImage {image} at (0,0) size 50x63
       RenderSVGText {text} at (0,0) size 465x46
         RenderText {#text} at (0,0) size 264x46

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-diffuse-01-f-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/filters-diffuse-01-f-expected.txt
index 3536bb29f3647bd46626b9d3ae88beb7461820ff..e42522811f75b8ea46337763262ad195510e4d17 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/filters-diffuse-01-f-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/filters-diffuse-01-f-expected.txt
@@ -9,26 +9,26 @@ KCanvasResource {id="lightingColorB" [type=FILTER]  [bounding box=at (0,0) size
 KCanvasResource {id="lightingColorC" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0] [effects=[[type=DIFFUSE-LIGHTING] [in="SourceGraphic"] [subregion="at (0,0) size 480x360"] [surface scale=10.00] [diffuse constant=1.00] [kernel unit length 0.00, 0.00]]]}
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
-    KCanvasContainer {svg} at (0,0.50) size 479.50x359
-      KCanvasContainer {g} at (0,50) size 50x170
+    KCanvasContainer {svg} at (0.50,0.50) size 479x359
+      KCanvasContainer {g} at (90,80) size 190x170
         RenderSVGText {text} at (0,0) size 465x14
           RenderText {#text} at (0,0) size 140x14
             text run at (0,0) width 140: "Filters: feDiffuseLighting"
-        KCanvasContainer {g} at (0,50) size 50x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,50.00)}]
+        KCanvasContainer {g} at (90,80) size 190x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,50.00)}]
           RenderSVGText {text} at (0,0) size 465x18
             RenderText {#text} at (0,0) size 291x18
               text run at (0,0) width 291: "Various values for surfaceScale: 1, 10 and -10"
           RenderImage {image} at (0,0) size 50x30
           RenderImage {image} at (0,0) size 50x30
           RenderImage {image} at (0,0) size 50x30
-        KCanvasContainer {g} at (0,120) size 50x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,120.00)}]
+        KCanvasContainer {g} at (90,150) size 190x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,120.00)}]
           RenderSVGText {text} at (0,0) size 465x18
             RenderText {#text} at (0,0) size 296x18
               text run at (0,0) width 296: "Various values for diffuseConstants: 0, 1 and 2"
           RenderImage {image} at (0,0) size 50x30
           RenderImage {image} at (0,0) size 50x30
           RenderImage {image} at (0,0) size 50x30
-        KCanvasContainer {g} at (0,190) size 50x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,190.00)}]
+        KCanvasContainer {g} at (90,220) size 190x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,190.00)}]
           RenderSVGText {text} at (0,0) size 465x18
             RenderText {#text} at (0,0) size 341x18
               text run at (0,0) width 341: "Various values for lighting color: red, yellow and blue"

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-light-01-f-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/filters-light-01-f-expected.txt
index 55aca88fff9a20af02c4423b699b19fae932c9f0..15942ea567b99904915186bca695e2480448473f 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/filters-light-01-f-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/filters-light-01-f-expected.txt
@@ -12,12 +12,12 @@ KCanvasResource {id="spotLightC" [type=FILTER]  [bounding box=at (0,0) size 1x1]
 KCanvasResource {id="spotLightD" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0] [effects=[[type=DIFFUSE-LIGHTING] [in="SourceGraphic"] [subregion="at (0,0) size 480x360"] [surface scale=10.00] [diffuse constant=1.00] [kernel unit length 0.00, 0.00]]]}
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
-    KCanvasContainer {svg} at (0,0.50) size 479.50x359
-      KCanvasContainer {g} at (0,40) size 405x235
+    KCanvasContainer {svg} at (0.50,0.50) size 479x359
+      KCanvasContainer {g} at (70,70) size 335x205
         RenderSVGText {text} at (0,0) size 465x14
           RenderText {#text} at (0,0) size 253x14
             text run at (0,0) width 253: "Filters: feDistantLight, fePointLight, feSpotLight"
-        KCanvasContainer {g} at (0,40) size 50x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,40.00)}]
+        KCanvasContainer {g} at (70,70) size 335x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,40.00)}]
           RenderSVGText {text} at (0,0) size 465x18
             RenderText {#text} at (0,0) size 353x18
               text run at (0,0) width 353: "Various values for feDistantLight azimuth and elevation"

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-specular-01-f-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/filters-specular-01-f-expected.txt
index 8b3791cca602cd6b0aee5e9a8490139b86492b19..523fa96da27f864f1eb7005378ea67cb59ea5799 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/filters-specular-01-f-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/filters-specular-01-f-expected.txt
@@ -12,12 +12,12 @@ KCanvasResource {id="lightingColorB" [type=FILTER]  [bounding box=at (0,0) size
 KCanvasResource {id="lightingColorC" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0] [effects=[[type=SPECULAR-LIGHTING] [in="SourceGraphic"] [subregion="at (0,0) size 480x360"] [surface scale=10.00] [specual constant=1.00] [specular exponent=1.00]]]}
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
-    KCanvasContainer {svg} at (0,0.50) size 479.50x359
-      KCanvasContainer {g} at (0,20) size 370x270
+    KCanvasContainer {svg} at (0.50,0.50) size 479x359
+      KCanvasContainer {g} at (90,50) size 280x240
         RenderSVGText {text} at (0,0) size 465x14
           RenderText {#text} at (0,0) size 142x14
             text run at (0,0) width 142: "Filters: feSpecularLighting"
-        KCanvasContainer {g} at (0,20) size 370x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,20.00)}]
+        KCanvasContainer {g} at (90,50) size 280x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,20.00)}]
           RenderSVGText {text} at (0,0) size 465x18
             RenderText {#text} at (0,0) size 291x18
               text run at (0,0) width 291: "Various values for surfaceScale: 1, 10 and -10"
@@ -28,7 +28,7 @@ layer at (0,0) size 480x360
           RenderImage {image} at (0,0) size 50x30
           RenderImage {image} at (0,0) size 50x30
           RenderImage {image} at (0,0) size 50x30
-        KCanvasContainer {g} at (0,90) size 370x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,90.00)}]
+        KCanvasContainer {g} at (90,120) size 280x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,90.00)}]
           RenderSVGText {text} at (0,0) size 465x18
             RenderText {#text} at (0,0) size 305x18
               text run at (0,0) width 305: "Various values for specularConstants: 0, 1 and 2"
@@ -39,7 +39,7 @@ layer at (0,0) size 480x360
           RenderImage {image} at (0,0) size 50x30
           RenderImage {image} at (0,0) size 50x30
           RenderImage {image} at (0,0) size 50x30
-        KCanvasContainer {g} at (0,160) size 370x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,160.00)}]
+        KCanvasContainer {g} at (90,190) size 280x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,160.00)}]
           RenderSVGText {text} at (0,0) size 465x18
             RenderText {#text} at (0,0) size 310x18
               text run at (0,0) width 310: "Various values for specularExponents: 1, 2 and 4"
@@ -50,7 +50,7 @@ layer at (0,0) size 480x360
           RenderImage {image} at (0,0) size 50x30
           RenderImage {image} at (0,0) size 50x30
           RenderImage {image} at (0,0) size 50x30
-        KCanvasContainer {g} at (0,230) size 370x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,230.00)}]
+        KCanvasContainer {g} at (90,260) size 280x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,230.00)}]
           RenderSVGText {text} at (0,0) size 465x18
             RenderText {#text} at (0,0) size 341x18
               text run at (0,0) width 341: "Various values for lighting color: red, yellow and blue"

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 c8ed96e13195943d0e8e310235740e1aa43787ef..7294635cbef07759ac49726689d8af483e826b06 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,14 +1,14 @@
 KCanvasResource {id="sample" [type=CLIPPER] [clip data=[]]}
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
-    KCanvasContainer {svg} at (0,0) size 479.50x359.50
-      KCanvasContainer {g} at (0,0) size 410x160
-        KCanvasContainer {g} at (0,0) size 410x140
+    KCanvasContainer {svg} at (0.50,0.50) size 479x359
+      KCanvasContainer {g} at (20,20) size 420x310
+        KCanvasContainer {g} at (30,20) size 410x140
           RenderImage {image} at (0,0) size 410x140
           RenderSVGText {text} at (0,0) size 465x122
             RenderText {#text} at (0,0) size 353x122
               text run at (0,0) width 353: "Clip Test"
-        KCanvasContainer {g} at (0,0) size 410x160
+        KCanvasContainer {g} at (20,170) size 410x160
           RenderImage {image} at (0,0) size 410x160
       RenderSVGText {text} at (0,0) size 465x46
         RenderText {#text} at (0,0) size 264x46

diff --git a/LayoutTests/svg/W3C-SVG-1.1/render-groups-01-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/render-groups-01-b-expected.txt
index d5bbd69cafd418f8000dfc28885be889b77fcab6..d3b808cd70d555e2e28ce2b01217a3e79362b0fc 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/render-groups-01-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/render-groups-01-b-expected.txt
@@ -1,8 +1,8 @@
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
-    KCanvasContainer {svg} at (0,0) size 479.50x359.50
-      KCanvasContainer {g} at (0,0) size 463.50x315
-        KCanvasContainer {g} at (0,0) size 463.50x315 [transform={m=((1.80,0.00)(0.00,1.80)) t=(0.00,0.00)}]
+    KCanvasContainer {svg} at (0.50,0.50) size 479x359
+      KCanvasContainer {g} at (35.10,17.10) size 428.40x297.90
+        KCanvasContainer {g} at (35.10,17.10) size 428.40x297.90 [transform={m=((1.80,0.00)(0.00,1.80)) t=(0.00,0.00)}]
           KCanvasItem {rect} at (36,18) size 414x279 [fill={[type=SOLID] [color=#C0C0C0]}] [data="M20.00,10.00L250.00,10.00L250.00,165.00L20.00,165.00"]
           KCanvasItem {line} at (58.50,18) size 27x297 [stroke={[type=SOLID] [color=#FFFFFF] [stroke width=15.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M40.00,10.00L40.00,175.00"]
           KCanvasItem {line} at (112.50,18) size 27x297 [stroke={[type=SOLID] [color=#FFFFFF] [stroke width=15.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M70.00,10.00L70.00,175.00"]
@@ -13,7 +13,7 @@ layer at (0,0) size 480x360
           KCanvasItem {line} at (382.50,18) size 27x297 [stroke={[type=SOLID] [color=#FFFFFF] [stroke width=15.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M220.00,10.00L220.00,175.00"]
           KCanvasItem {line} at (436.50,18) size 27x297 [stroke={[type=SOLID] [color=#FFFFFF] [stroke width=15.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M250.00,10.00L250.00,175.00"]
           KCanvasItem {rect} at (35.10,17.10) size 415.80x280.80 [stroke={[type=SOLID] [color=#000000]}] [data="M20.00,10.00L250.00,10.00L250.00,165.00L20.00,165.00"]
-          KCanvasContainer {g} at (0,0) size 360x225 [opacity=0.50]
+          KCanvasContainer {g} at (126,99) size 309.60x180 [opacity=0.50]
             RenderSVGText {text} at (0,0) size 465x138
               RenderText {#text} at (0,0) size 241x138
                 text run at (0,0) width 241: "SVG"

diff --git a/LayoutTests/svg/W3C-SVG-1.1/render-groups-03-t-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/render-groups-03-t-expected.txt
index be31cb5248123fd36a419f4edc707c824b5d5928..b3a6246a6e7788df82f667d3aa50a020b7f93759 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/render-groups-03-t-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/render-groups-03-t-expected.txt
@@ -1,8 +1,8 @@
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
-    KCanvasContainer {svg} at (0,0) size 479.50x359.50
-      KCanvasContainer {g} at (0,0) size 463.50x315
-        KCanvasContainer {g} at (0,0) size 463.50x315 [transform={m=((1.80,0.00)(0.00,1.80)) t=(0.00,0.00)}]
+    KCanvasContainer {svg} at (0.50,0.50) size 479x359
+      KCanvasContainer {g} at (35.10,17.10) size 428.40x297.90
+        KCanvasContainer {g} at (35.10,17.10) size 428.40x297.90 [transform={m=((1.80,0.00)(0.00,1.80)) t=(0.00,0.00)}]
           KCanvasItem {rect} at (36,18) size 414x279 [fill={[type=SOLID] [color=#C0C0C0]}] [data="M20.00,10.00L250.00,10.00L250.00,165.00L20.00,165.00"]
           KCanvasItem {line} at (58.50,18) size 27x297 [stroke={[type=SOLID] [color=#FFFFFF] [stroke width=15.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M40.00,10.00L40.00,175.00"]
           KCanvasItem {line} at (112.50,18) size 27x297 [stroke={[type=SOLID] [color=#FFFFFF] [stroke width=15.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M70.00,10.00L70.00,175.00"]

diff --git a/LayoutTests/svg/W3C-SVG-1.1/struct-image-01-t-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/struct-image-01-t-expected.txt
index 95492018b4dc9f438487b7e77fdd8e13723989ef..2f49ebe59ea7ee05cdaa0652d1550f2a288d21ac 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/struct-image-01-t-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/struct-image-01-t-expected.txt
@@ -1,7 +1,7 @@
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
-    KCanvasContainer {svg} at (0,0) size 479.50x359.50
-      KCanvasContainer {g} at (0,0) size 240x150
+    KCanvasContainer {svg} at (0.50,0) size 479.50x359.50
+      KCanvasContainer {g} at (240,0) size 240x300
         RenderImage {image} at (0,0) size 240x150
         RenderImage {image} at (0,0) size 240x150
       RenderSVGText {text} at (0,0) size 465x46

diff --git a/LayoutTests/svg/W3C-SVG-1.1/struct-image-03-t-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/struct-image-03-t-expected.txt
index 1be44d7e6da9edaaf2b66071f12f46c8fd334a10..7f626bf38bd534638ed094225c342be6e6b2964b 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/struct-image-03-t-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/struct-image-03-t-expected.txt
@@ -1,7 +1,7 @@
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
-    KCanvasContainer {svg} at (0,0) size 479.50x359.50
-      KCanvasContainer {g} at (0,0) size 457x237
+    KCanvasContainer {svg} at (0.50,0.50) size 479x359
+      KCanvasContainer {g} at (23,13) size 434x224
         KCanvasItem {rect} at (23,13) size 434x224 [fill={[type=SOLID] [color=#000000]}] [data="M23.00,13.00L457.00,13.00L457.00,237.00L23.00,237.00"]
         RenderImage {image} at (0,0) size 430x48
         RenderImage {image} at (0,0) size 430x48

diff --git a/LayoutTests/svg/W3C-SVG-1.1/struct-image-04-t-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/struct-image-04-t-expected.txt
index 6899fec073c7a88219d1ff008c639ea3f0a2025b..f10c638d856859ba6f7fb97238545501ce7d4773 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/struct-image-04-t-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/struct-image-04-t-expected.txt
@@ -1,7 +1,7 @@
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
-    KCanvasContainer {svg} at (0,0) size 479.50x359.50
-      KCanvasContainer {g} at (0,0) size 240x150
+    KCanvasContainer {svg} at (0.50,0) size 479.50x359.50
+      KCanvasContainer {g} at (240,0) size 240x300
         RenderImage {image} at (0,0) size 240x150
         RenderImage {image} at (0,0) size 240x150
       RenderSVGText {text} at (0,0) size 465x46

diff --git a/LayoutTests/svg/custom/foreign-object-skew-expected.txt b/LayoutTests/svg/custom/foreign-object-skew-expected.txt
index 3542df4bf8cb75787591842560d390f9b6247a7f..d01738f0a91d4a2f77626ffe9db6df5dfe8a7cb5 100644 (file)
--- a/LayoutTests/svg/custom/foreign-object-skew-expected.txt
+++ b/LayoutTests/svg/custom/foreign-object-skew-expected.txt
@@ -16,18 +16,3 @@ layer at (0,0) size 800x600
                 text run at (0,0) width 35: "Button"
           RenderText {#text} at (0,0) size 0x0
       KCanvasItem {rect} at (9.50,9.50) size 581x381 [stroke={[type=SOLID] [color=#008000]}] [data="M10.00,10.00L590.00,10.00L590.00,390.00L10.00,390.00"]
-layer at (0,0) size 580x380
-  RenderForeignObject {foreignObject} at (0,0) size 580x380
-    RenderBlock {xhtml:div} at (0,0) size 580x18
-      RenderText {#text} at (0,0) size 78x18
-        text run at (0,0) width 78: "This is a test"
-    RenderBlock (anonymous) at (0,18) size 580x40
-      RenderInline {xhtml:a} at (0,0) size 66x18 [color=#0000EE]
-        RenderText {#text} at (0,0) size 66x18
-          text run at (0,0) width 66: "and a link."
-      RenderBR {xhtml:br} at (66,0) size 0x18
-      RenderButton {xhtml:input} at (2,20) size 51x18 [bgcolor=#C0C0C0]
-        RenderBlock (anonymous) at (8,2) size 35x13
-          RenderText {#text} at (0,0) size 35x13
-            text run at (0,0) width 35: "Button"
-      RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.txt b/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.txt
index a7a5f694dcbefc2d1d5965646bcc3182cd4c6953..f10acba9a3759b4ece17189a81c83392c3e518cf 100644 (file)
--- a/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.txt
+++ b/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.txt
@@ -2,7 +2,7 @@ KCanvasResource {id="myclip" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path
 KCanvasResource {id="myfilter" [type=FILTER]  [bounding box=at (-0.10,-0.10) size 1.20x1.20] [effect bounding box mode=0] [effects=[[type=GAUSSIAN-BLUR]  [subregion="at (0,0) size 800x600"] [std dev. x=10.00 y=10.00]]]}
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-    KCanvasContainer {svg} at (0,-100) size 503x410
+    KCanvasContainer {svg} at (0,0) size 503x410
       RenderImage {image} at (0,0) size 503x410
       RenderSVGText {text} at (0,0) size 785x18
         RenderText {#text} at (0,0) size 542x18

diff --git a/LayoutTests/svg/custom/text-image-opacity-expected.txt b/LayoutTests/svg/custom/text-image-opacity-expected.txt
index 1e407ea77780dd3d734ed4e5813d52506c928c5f..86a970a705a103926f830cd0a57616dcdc3777dc 100644 (file)
--- a/LayoutTests/svg/custom/text-image-opacity-expected.txt
+++ b/LayoutTests/svg/custom/text-image-opacity-expected.txt
@@ -1,6 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-    KCanvasContainer {svg} at (0,0) size 100x100
+    KCanvasContainer {svg} at (0,55) size 100x100
       RenderSVGText {text} at (0,0) size 785x18
         RenderText {#text} at (0,0) size 29x18
           text run at (0,0) width 29: "Fail!"
@@ -9,15 +9,3 @@ layer at (0,0) size 800x600
           text run at (0,0) width 379: "Success! (should be half opacity as should the image below)"
       RenderImage {image} at (0,0) size 100x100
       RenderImage {image} at (0,0) size 100x100
-layer at (0,0) size 785x18
-  RenderSVGText {text} at (0,0) size 785x18
-    RenderText {#text} at (0,0) size 29x18
-      text run at (0,0) width 29: "Fail!"
-layer at (0,0) size 785x18
-  RenderSVGText {text} at (0,0) size 785x18
-    RenderText {#text} at (0,0) size 379x18
-      text run at (0,0) width 379: "Success! (should be half opacity as should the image below)"
-layer at (0,0) size 100x100
-  RenderImage {image} at (0,0) size 100x100
-layer at (0,0) size 100x100
-  RenderImage {image} at (0,0) size 100x100