2006-01-29 Eric Seidel <eseidel@apple.com>

        Reviewed by hyatt & darin.

        There are a few small, but intertwined fixes in this patch:

        Remaining fixes for SVGTetris:
        http://bugzilla.opendarwin.org/show_bug.cgi?id=6889

        Testing blocked by: http://bugzilla.opendarwin.org/show_bug.cgi?id=6905

        Fix for CDF support:
        http://bugzilla.opendarwin.org/show_bug.cgi?id=6025

        Updated test: svg/custom/simpleCDF.xml

        Fix for filter updating:
        http://bugzilla.opendarwin.org/show_bug.cgi?id=6849

        Testing blocked by: http://bugzilla.opendarwin.org/show_bug.cgi?id=6904

        Also, as a side effect of 6849, fixed double-apply of filters, improving:
        http://bugzilla.opendarwin.org/show_bug.cgi?id=6713

        Results updated for most tests, pixel results improved for filter tests.

        * kcanvas/KCanvasFilters.cpp:
        (KCanvasFilter::filterBBoxForItemBBox): moved into baseclass
        * kcanvas/KCanvasFilters.h:
        * kcanvas/RenderSVGImage.cpp:
        (RenderSVGImage::paint): use relativeBBox
        (RenderSVGImage::relativeBBox): added
        (RenderSVGImage::imageChanged): added
        (RenderSVGImage::getAbsoluteRepaintRect): fixed
        * kcanvas/RenderSVGImage.h:
        (KSVG::RenderSVGImage::imageChanged): added.
        * kcanvas/device/quartz/KCanvasFilterQuartz.h:
        * kcanvas/device/quartz/KCanvasFilterQuartz.mm:
        (KCanvasFilterQuartz::applyFilter): use new baseclass method
        (KCanvasFEFloodQuartz::getCIFilter): fixed.
        * kcanvas/device/quartz/KCanvasItemQuartz.h:
        * kcanvas/device/quartz/KCanvasItemQuartz.mm:
        (KCanvasItemQuartz::layout): update width/height
        (KCanvasItemQuartz::getAbsoluteRepaintRect): fixed.
        (KCanvasItemQuartz::requiresLayer): moved to .cpp
        (KCanvasItemQuartz::lineHeight): added.
        (KCanvasItemQuartz::baselinePosition): added.
        * kcanvas/device/quartz/KCanvasResourcesQuartz.h:
        * kcanvas/device/quartz/KCanvasResourcesQuartz.mm:
        (KCanvasContainerQuartz::canHaveChildren): moved to .cpp
        (KCanvasContainerQuartz::requiresLayer): moved to .cpp
        (KCanvasContainerQuartz::lineHeight): added.
        (KCanvasContainerQuartz::baselinePosition): added.
        (KCanvasContainerQuartz::paint): fixed.
        (KCanvasContainerQuartz::viewportTransform): fixed.
        (KCanvasContainerQuartz::getAbsoluteRepaintRect): fixed.
        (KCanvasContainerQuartz::absoluteTransform): fixed.
        * rendering/render_object.cpp:
        (WebCore::RenderObject::absoluteTransform): fixed apply order.

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index cedd79c86f65301b79d985fc07de6f2e1ac5cf8d..384770740b819140b3206a7fd6ab1ba42d4c9c27 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,83 @@
+2006-01-29  Eric Seidel  <eseidel@apple.com>
+
+        Reviewed by hyatt & darin.
+
+        Remaining fixes for SVGTetris:
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=6889
+        Fix for CDF support:
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=6025
+        Fix for filter updating:
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=6849
+        Also, as a side effect of 6849, fixed double-apply of filters, improving:
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=6713
+
+        Results updated for most tests, pixel results improved for filter tests.
+
+        * svg/W3C-SVG-1.1/color-prof-01-f-expected.txt:
+        * svg/W3C-SVG-1.1/coords-trans-01-b-expected.txt:
+        * svg/W3C-SVG-1.1/coords-trans-02-t-expected.txt:
+        * svg/W3C-SVG-1.1/coords-trans-03-t-expected.txt:
+        * svg/W3C-SVG-1.1/coords-trans-04-t-expected.txt:
+        * svg/W3C-SVG-1.1/coords-trans-05-t-expected.txt:
+        * svg/W3C-SVG-1.1/coords-trans-06-t-expected.txt:
+        * svg/W3C-SVG-1.1/coords-viewattr-01-b-expected.txt:
+        * svg/W3C-SVG-1.1/coords-viewattr-02-b-expected.checksum:
+        * svg/W3C-SVG-1.1/coords-viewattr-02-b-expected.png:
+        * svg/W3C-SVG-1.1/coords-viewattr-02-b-expected.txt:
+        * svg/W3C-SVG-1.1/filters-blend-01-b-expected.txt:
+        * svg/W3C-SVG-1.1/filters-color-01-b-expected.txt:
+        * svg/W3C-SVG-1.1/filters-composite-02-b-expected.txt:
+        * svg/W3C-SVG-1.1/filters-comptran-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-displace-01-f-expected.txt:
+        * svg/W3C-SVG-1.1/filters-gauss-01-b-expected.checksum:
+        * svg/W3C-SVG-1.1/filters-gauss-01-b-expected.png:
+        * svg/W3C-SVG-1.1/filters-gauss-01-b-expected.txt:
+        * svg/W3C-SVG-1.1/filters-image-01-b-expected.txt:
+        * svg/W3C-SVG-1.1/filters-light-01-f-expected.txt:
+        * svg/W3C-SVG-1.1/filters-morph-01-f-expected.txt:
+        * svg/W3C-SVG-1.1/filters-offset-01-b-expected.checksum:
+        * svg/W3C-SVG-1.1/filters-offset-01-b-expected.png:
+        * svg/W3C-SVG-1.1/filters-offset-01-b-expected.txt:
+        * svg/W3C-SVG-1.1/filters-specular-01-f-expected.txt:
+        * svg/W3C-SVG-1.1/filters-turb-01-f-expected.txt:
+        * svg/W3C-SVG-1.1/fonts-elem-01-t-expected.txt:
+        * svg/W3C-SVG-1.1/fonts-elem-02-t-expected.txt:
+        * svg/W3C-SVG-1.1/fonts-elem-03-b-expected.txt:
+        * svg/W3C-SVG-1.1/fonts-elem-04-b-expected.txt:
+        * svg/W3C-SVG-1.1/masking-path-04-b-expected.txt:
+        * svg/W3C-SVG-1.1/metadata-example-01-b-expected.txt:
+        * svg/W3C-SVG-1.1/painting-marker-01-f-expected.txt:
+        * svg/W3C-SVG-1.1/painting-marker-02-f-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-02-b-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/W3C-SVG-1.1/struct-image-05-b-expected.txt:
+        * svg/W3C-SVG-1.1/struct-symbol-01-b-expected.txt:
+        * svg/W3C-SVG-1.1/styling-css-02-b-expected.txt:
+        * svg/W3C-SVG-1.1/text-text-01-b-expected.txt:
+        * svg/custom/filter-source-alpha-expected.txt:
+        * svg/custom/image-with-transform-clip-filter-expected.checksum:
+        * svg/custom/image-with-transform-clip-filter-expected.png:
+        * svg/custom/image-with-transform-clip-filter-expected.txt:
+        * svg/custom/junk-data-expected.checksum:
+        * svg/custom/junk-data-expected.png:
+        * svg/custom/junk-data-expected.txt:
+        * svg/custom/missing-xlink-expected.checksum:
+        * svg/custom/missing-xlink-expected.png:
+        * svg/custom/missing-xlink-expected.txt:
+        * svg/custom/simpleCDF-expected.checksum:
+        * svg/custom/simpleCDF-expected.png:
+        * svg/custom/simpleCDF-expected.txt:
+        * svg/custom/text-filter-expected.checksum:
+        * svg/custom/text-filter-expected.png:
+        * svg/custom/text-filter-expected.txt:
+        * svg/custom/text-image-opacity-expected.txt:
+
 2006-01-29  Eric Seidel  <eseidel@apple.com>
 
         Reviewed by hyatt.

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 3a4ccdb2e872e3589e426411aa9c6854221c7859..8178cc4034afcae8877ae56edf1eadeb7866bb30 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
   RenderCanvas at (0,0) size 480x360
-    KCanvasContainer {svg} at (0.50,0.50) size 479x359
-      KCanvasContainer {g} at (0,0) size 0x0
-        KCanvasContainer {g} at (0,0) size 0x0
+    KCanvasContainer {svg} at (0,0) size 479.50x359.50
+      KCanvasContainer {g} at (0,0) size 190x190
+        KCanvasContainer {g} at (0,0) size 190x190
           RenderImage {image} at (0,0) size 190x190
-        KCanvasContainer {g} at (0,0) size 0x0
+        KCanvasContainer {g} at (0,0) 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/coords-trans-01-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/coords-trans-01-b-expected.txt
index e6000ce8e47089ce2cfa930454a86918f44fa84d..29b1a5c69b203f87511b100fafe2d72c8af2dab5 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/coords-trans-01-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/coords-trans-01-b-expected.txt
@@ -81,18 +81,18 @@ layer at (0,0) size 480x360
             KCanvasContainer {g} at (50,90) size 20x20 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,50.00)}]
               KCanvasItem {rect} at (50,90) size 20x2 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00L20.00,0.00L20.00,2.00L0.00,2.00"]
               KCanvasItem {rect} at (50,90) size 2x20 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L2.00,0.00L2.00,20.00L0.00,20.00"]
-            KCanvasContainer {g} at (190,50) size 20x20 [transform={m=((-0.00,-1.00)(1.00,-0.00)) t=(150.00,70.00)}]
-              KCanvasItem {rect} at (190,50) size 2x20 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00L20.00,0.00L20.00,2.00L0.00,2.00"]
-              KCanvasItem {rect} at (190,68) size 20x2 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L2.00,0.00L2.00,20.00L0.00,20.00"]
-            KCanvasContainer {g} at (290,90) size 40x20 [transform={m=((1.00,0.00)(1.00,1.00)) t=(250.00,50.00)}]
-              KCanvasItem {rect} at (290,90) size 22x2 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00L20.00,0.00L20.00,2.00L0.00,2.00"]
-              KCanvasItem {rect} at (290,90) size 22x20 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L2.00,0.00L2.00,20.00L0.00,20.00"]
+            KCanvasContainer {g} at (150,90) size 20x20 [transform={m=((-0.00,-1.00)(1.00,-0.00)) t=(150.00,70.00)}]
+              KCanvasItem {rect} at (150,90) size 2x20 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00L20.00,0.00L20.00,2.00L0.00,2.00"]
+              KCanvasItem {rect} at (150,108) size 20x2 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L2.00,0.00L2.00,20.00L0.00,20.00"]
+            KCanvasContainer {g} at (250,90) size 40x20 [transform={m=((1.00,0.00)(1.00,1.00)) t=(250.00,50.00)}]
+              KCanvasItem {rect} at (250,90) size 22x2 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00L20.00,0.00L20.00,2.00L0.00,2.00"]
+              KCanvasItem {rect} at (250,90) size 22x20 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L2.00,0.00L2.00,20.00L0.00,20.00"]
             KCanvasContainer {g} at (350,90) size 20x40 [transform={m=((1.00,1.00)(0.00,1.00)) t=(350.00,50.00)}]
               KCanvasItem {rect} at (350,90) size 20x22 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00L20.00,0.00L20.00,2.00L0.00,2.00"]
               KCanvasItem {rect} at (350,90) size 2x22 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L2.00,0.00L2.00,20.00L0.00,20.00"]
-            KCanvasContainer {g} at (210,200) size 40x40 [transform={m=((2.00,0.00)(0.00,2.00)) t=(210.00,120.00)}]
-              KCanvasItem {rect} at (210,200) size 40x2 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00L20.00,0.00L20.00,1.00L0.00,1.00"]
-              KCanvasItem {rect} at (210,200) size 2x40 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L1.00,0.00L1.00,20.00L0.00,20.00"]
+            KCanvasContainer {g} at (210,160) size 40x40 [transform={m=((2.00,0.00)(0.00,2.00)) t=(210.00,120.00)}]
+              KCanvasItem {rect} at (210,160) size 40x2 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00L20.00,0.00L20.00,1.00L0.00,1.00"]
+              KCanvasItem {rect} at (210,160) size 2x40 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L1.00,0.00L1.00,20.00L0.00,20.00"]
           KCanvasContainer {g} at (48,88) size 325x115
             RenderSVGText {text} at (0,0) size 465x18
               RenderText {TEXT} at (0,0) size 106x18
@@ -126,14 +126,14 @@ layer at (0,0) size 480x360
             KCanvasItem {rect} at (208,198) size 5x5 [fill={[type=SOLID] [color=#FF0000]}] [data="M208.00,158.00L213.00,158.00L213.00,163.00L208.00,163.00"]
         KCanvasContainer {g} at (48,238) size 265x45
           KCanvasContainer {g} at (50,240) size 260x40
-            KCanvasContainer {g} at (50,270) size 60x40 [transform={m=((3.00,0.00)(0.00,2.00)) t=(50.00,210.00)}]
-              KCanvasItem {rect} at (50,270) size 60x2 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00L20.00,0.00L20.00,1.00L0.00,1.00"]
-              KCanvasItem {rect} at (50,270) size 2.01x40 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L0.67,0.00L0.67,20.00L0.00,20.00"]
+            KCanvasContainer {g} at (50,240) size 60x40 [transform={m=((3.00,0.00)(0.00,2.00)) t=(50.00,210.00)}]
+              KCanvasItem {rect} at (50,240) size 60x2 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00L20.00,0.00L20.00,1.00L0.00,1.00"]
+              KCanvasItem {rect} at (50,240) size 2.01x40 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L0.67,0.00L0.67,20.00L0.00,20.00"]
             KCanvasContainer {g} at (250,240) size 60x40 [transform={m=((1.00,0.00)(0.00,1.00)) t=(200.00,0.00)}]
-              KCanvasContainer {g} at (650,270) size 60x40 [transform={m=((3.00,0.00)(0.00,2.00)) t=(0.00,0.00)}]
-                KCanvasContainer {g} at (616.67,165) size 60x40 [transform={m=((1.00,0.00)(0.00,1.00)) t=(16.67,105.00)}]
-                  KCanvasItem {rect} at (616.67,165) size 60x2 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00L20.00,0.00L20.00,1.00L0.00,1.00"]
-                  KCanvasItem {rect} at (616.67,165) size 2.01x40 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L0.67,0.00L0.67,20.00L0.00,20.00"]
+              KCanvasContainer {g} at (250,240) size 60x40 [transform={m=((3.00,0.00)(0.00,2.00)) t=(0.00,0.00)}]
+                KCanvasContainer {g} at (250,240) size 60x40 [transform={m=((1.00,0.00)(0.00,1.00)) t=(16.67,105.00)}]
+                  KCanvasItem {rect} at (250,240) size 60x2 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00L20.00,0.00L20.00,1.00L0.00,1.00"]
+                  KCanvasItem {rect} at (250,240) size 2.01x40 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L0.67,0.00L0.67,20.00L0.00,20.00"]
           KCanvasContainer {g} at (48,238) size 265x45
             RenderSVGText {text} at (0,0) size 465x18
               RenderText {TEXT} at (0,0) size 198x18

diff --git a/LayoutTests/svg/W3C-SVG-1.1/coords-trans-02-t-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/coords-trans-02-t-expected.txt
index 1ccba2262c79fff3b8a7ef84b3879b0b29c7a285..6b19d1a41ef5c070058d45e804c0128523359d34 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/coords-trans-02-t-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/coords-trans-02-t-expected.txt
@@ -3,26 +3,26 @@ layer at (0,0) size 480x360
     KCanvasContainer {svg} at (0.50,0.50) size 479x359
       KCanvasContainer {g} at (90,160) size 312.50x62.50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,30.00)}]
         KCanvasContainer {g} at (90,160) size 312.50x62.50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,10.00)}]
-          KCanvasContainer {g} at (95,225) size 300x50 [transform={m=((2.50,0.00)(0.00,2.50)) t=(-30.00,0.00)}]
-            KCanvasContainer {g} at (20,150) size 50x50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,50.00)}]
-              KCanvasItem {rect} at (20,150) size 50x5 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00L20.00,0.00L20.00,2.00L0.00,2.00"]
-              KCanvasItem {rect} at (20,150) size 5x50 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L2.00,0.00L2.00,20.00L0.00,20.00"]
-            KCanvasContainer {g} at (250,50.00) size 50x50 [transform={m=((-0.00,-1.00)(1.00,-0.00)) t=(150.00,70.00)}]
-              KCanvasItem {rect} at (250,50.00) size 5x50 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00L20.00,0.00L20.00,2.00L0.00,2.00"]
-              KCanvasItem {rect} at (250,95.00) size 50x5 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L2.00,0.00L2.00,20.00L0.00,20.00"]
-          KCanvasContainer {g} at (90,220) size 312.50x62.50 [transform={m=((2.50,0.00)(0.00,2.50)) t=(-30.00,0.00)}]
+          KCanvasContainer {g} at (95,165) size 300x50 [transform={m=((2.50,0.00)(0.00,2.50)) t=(-30.00,0.00)}]
+            KCanvasContainer {g} at (95,165) size 50x50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,50.00)}]
+              KCanvasItem {rect} at (95,165) size 50x5 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00L20.00,0.00L20.00,2.00L0.00,2.00"]
+              KCanvasItem {rect} at (95,165) size 5x50 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L2.00,0.00L2.00,20.00L0.00,20.00"]
+            KCanvasContainer {g} at (345,165) size 50x50 [transform={m=((-0.00,-1.00)(1.00,-0.00)) t=(150.00,70.00)}]
+              KCanvasItem {rect} at (345,165) size 5x50 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00L20.00,0.00L20.00,2.00L0.00,2.00"]
+              KCanvasItem {rect} at (345,210) size 50x5 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L2.00,0.00L2.00,20.00L0.00,20.00"]
+          KCanvasContainer {g} at (90,160) size 312.50x62.50 [transform={m=((2.50,0.00)(0.00,2.50)) t=(-30.00,0.00)}]
             RenderSVGText {text} at (0,0) size 465x18
               RenderText {TEXT} at (0,0) size 106x18
                 text run at (0,0) width 106: "translate (50, 50)"
-            KCanvasItem {rect} at (90,220) size 12.50x12.50 [fill={[type=SOLID] [color=#000000]}] [data="M48.00,48.00L53.00,48.00L53.00,53.00L48.00,53.00"]
-            KCanvasItem {rect} at (140,220) size 12.50x12.50 [fill={[type=SOLID] [color=#0000FF]}] [data="M68.00,48.00L73.00,48.00L73.00,53.00L68.00,53.00"]
-            KCanvasItem {rect} at (90,270) size 12.50x12.50 [fill={[type=SOLID] [color=#FF0000]}] [data="M48.00,68.00L53.00,68.00L53.00,73.00L48.00,73.00"]
+            KCanvasItem {rect} at (90,160) size 12.50x12.50 [fill={[type=SOLID] [color=#000000]}] [data="M48.00,48.00L53.00,48.00L53.00,53.00L48.00,53.00"]
+            KCanvasItem {rect} at (140,160) size 12.50x12.50 [fill={[type=SOLID] [color=#0000FF]}] [data="M68.00,48.00L73.00,48.00L73.00,53.00L68.00,53.00"]
+            KCanvasItem {rect} at (90,210) size 12.50x12.50 [fill={[type=SOLID] [color=#FF0000]}] [data="M48.00,68.00L53.00,68.00L53.00,73.00L48.00,73.00"]
             RenderSVGText {text} at (0,0) size 465x18
               RenderText {TEXT} at (0,0) size 66x18
                 text run at (0,0) width 66: "rotate(-90)"
-            KCanvasItem {rect} at (340,270) size 12.50x12.50 [fill={[type=SOLID] [color=#000000]}] [data="M148.00,68.00L153.00,68.00L153.00,73.00L148.00,73.00"]
-            KCanvasItem {rect} at (340,220) size 12.50x12.50 [fill={[type=SOLID] [color=#0000FF]}] [data="M148.00,48.00L153.00,48.00L153.00,53.00L148.00,53.00"]
-            KCanvasItem {rect} at (390,270) size 12.50x12.50 [fill={[type=SOLID] [color=#FF0000]}] [data="M168.00,68.00L173.00,68.00L173.00,73.00L168.00,73.00"]
+            KCanvasItem {rect} at (340,210) size 12.50x12.50 [fill={[type=SOLID] [color=#000000]}] [data="M148.00,68.00L153.00,68.00L153.00,73.00L148.00,73.00"]
+            KCanvasItem {rect} at (340,160) size 12.50x12.50 [fill={[type=SOLID] [color=#0000FF]}] [data="M148.00,48.00L153.00,48.00L153.00,53.00L148.00,53.00"]
+            KCanvasItem {rect} at (390,210) size 12.50x12.50 [fill={[type=SOLID] [color=#FF0000]}] [data="M168.00,68.00L173.00,68.00L173.00,73.00L168.00,73.00"]
       RenderSVGText {text} at (0,0) size 465x46
         RenderText {TEXT} at (0,0) size 264x46
           text run at (0,0) width 264: "$Revision: 1.1 $"

diff --git a/LayoutTests/svg/W3C-SVG-1.1/coords-trans-03-t-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/coords-trans-03-t-expected.txt
index 7fd47396f36fe43fd333f1c92b38422bad111392..2a32eac652af7f55fa05d97c4c81f81bd415fad5 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/coords-trans-03-t-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/coords-trans-03-t-expected.txt
@@ -3,26 +3,26 @@ layer at (0,0) size 480x360
     KCanvasContainer {svg} at (0.50,0.50) size 479x359
       KCanvasContainer {g} at (60,160) size 312.50x105 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,30.00)}]
         KCanvasContainer {g} at (60,160) size 312.50x105 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,10.00)}]
-          KCanvasContainer {g} at (65,225) size 300x100 [transform={m=((2.50,0.00)(0.00,2.50)) t=(-560.00,0.00)}]
-            KCanvasContainer {g} at (-210,150) size 100x50 [transform={m=((1.00,0.00)(1.00,1.00)) t=(250.00,50.00)}]
-              KCanvasItem {rect} at (-210,150) size 55x5 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00L20.00,0.00L20.00,2.00L0.00,2.00"]
-              KCanvasItem {rect} at (-210,150) size 55x50 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L2.00,0.00L2.00,20.00L0.00,20.00"]
-            KCanvasContainer {g} at (-210,-410) size 50x100 [transform={m=((1.00,1.00)(0.00,1.00)) t=(350.00,50.00)}]
-              KCanvasItem {rect} at (-210,-410) size 50x55 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00L20.00,0.00L20.00,2.00L0.00,2.00"]
-              KCanvasItem {rect} at (-210,-410) size 5x55 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L2.00,0.00L2.00,20.00L0.00,20.00"]
-          KCanvasContainer {g} at (60,220) size 312.50x62.50 [transform={m=((2.50,0.00)(0.00,2.50)) t=(-560.00,0.00)}]
+          KCanvasContainer {g} at (65,165) size 300x100 [transform={m=((2.50,0.00)(0.00,2.50)) t=(-560.00,0.00)}]
+            KCanvasContainer {g} at (65,165) size 100x50 [transform={m=((1.00,0.00)(1.00,1.00)) t=(250.00,50.00)}]
+              KCanvasItem {rect} at (65,165) size 55x5 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00L20.00,0.00L20.00,2.00L0.00,2.00"]
+              KCanvasItem {rect} at (65,165) size 55x50 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L2.00,0.00L2.00,20.00L0.00,20.00"]
+            KCanvasContainer {g} at (315,165) size 50x100 [transform={m=((1.00,1.00)(0.00,1.00)) t=(350.00,50.00)}]
+              KCanvasItem {rect} at (315,165) size 50x55 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00L20.00,0.00L20.00,2.00L0.00,2.00"]
+              KCanvasItem {rect} at (315,165) size 5x55 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L2.00,0.00L2.00,20.00L0.00,20.00"]
+          KCanvasContainer {g} at (60,160) size 312.50x62.50 [transform={m=((2.50,0.00)(0.00,2.50)) t=(-560.00,0.00)}]
             RenderSVGText {text} at (0,0) size 465x18
               RenderText {TEXT} at (0,0) size 75x18
                 text run at (0,0) width 75: "skew x (45)"
-            KCanvasItem {rect} at (60,220) size 12.50x12.50 [fill={[type=SOLID] [color=#000000]}] [data="M248.00,48.00L253.00,48.00L253.00,53.00L248.00,53.00"]
-            KCanvasItem {rect} at (110,220) size 12.50x12.50 [fill={[type=SOLID] [color=#0000FF]}] [data="M268.00,48.00L273.00,48.00L273.00,53.00L268.00,53.00"]
-            KCanvasItem {rect} at (110,270) size 12.50x12.50 [fill={[type=SOLID] [color=#FF0000]}] [data="M268.00,68.00L273.00,68.00L273.00,73.00L268.00,73.00"]
+            KCanvasItem {rect} at (60,160) size 12.50x12.50 [fill={[type=SOLID] [color=#000000]}] [data="M248.00,48.00L253.00,48.00L253.00,53.00L248.00,53.00"]
+            KCanvasItem {rect} at (110,160) size 12.50x12.50 [fill={[type=SOLID] [color=#0000FF]}] [data="M268.00,48.00L273.00,48.00L273.00,53.00L268.00,53.00"]
+            KCanvasItem {rect} at (110,210) size 12.50x12.50 [fill={[type=SOLID] [color=#FF0000]}] [data="M268.00,68.00L273.00,68.00L273.00,73.00L268.00,73.00"]
             RenderSVGText {text} at (0,0) size 465x18
               RenderText {TEXT} at (0,0) size 75x18
                 text run at (0,0) width 75: "skew y (45)"
-            KCanvasItem {rect} at (310,220) size 12.50x12.50 [fill={[type=SOLID] [color=#000000]}] [data="M348.00,48.00L353.00,48.00L353.00,53.00L348.00,53.00"]
-            KCanvasItem {rect} at (360,270) size 12.50x12.50 [fill={[type=SOLID] [color=#0000FF]}] [data="M368.00,68.00L373.00,68.00L373.00,73.00L368.00,73.00"]
-            KCanvasItem {rect} at (310,270) size 12.50x12.50 [fill={[type=SOLID] [color=#FF0000]}] [data="M348.00,68.00L353.00,68.00L353.00,73.00L348.00,73.00"]
+            KCanvasItem {rect} at (310,160) size 12.50x12.50 [fill={[type=SOLID] [color=#000000]}] [data="M348.00,48.00L353.00,48.00L353.00,53.00L348.00,53.00"]
+            KCanvasItem {rect} at (360,210) size 12.50x12.50 [fill={[type=SOLID] [color=#0000FF]}] [data="M368.00,68.00L373.00,68.00L373.00,73.00L368.00,73.00"]
+            KCanvasItem {rect} at (310,210) size 12.50x12.50 [fill={[type=SOLID] [color=#FF0000]}] [data="M348.00,68.00L353.00,68.00L353.00,73.00L348.00,73.00"]
       RenderSVGText {text} at (0,0) size 465x46
         RenderText {TEXT} at (0,0) size 264x46
           text run at (0,0) width 264: "$Revision: 1.1 $"

diff --git a/LayoutTests/svg/W3C-SVG-1.1/coords-trans-04-t-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/coords-trans-04-t-expected.txt
index 3c45a212a8d6c4048e3dcacbb24ce8ab845583d4..cc39a2f61417c5dc8bb39744d082c6d9bb65931b 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/coords-trans-04-t-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/coords-trans-04-t-expected.txt
@@ -3,17 +3,17 @@ layer at (0,0) size 480x360
     KCanvasContainer {svg} at (0.50,0.50) size 479x359
       KCanvasContainer {g} at (156,95) size 112.50x112.50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,30.00)}]
         KCanvasContainer {g} at (156,95) size 112.50x112.50
-          KCanvasContainer {g} at (160,145) size 100x100 [transform={m=((2.50,0.00)(0.00,2.50)) t=(60.00,45.00)}]
-            KCanvasContainer {g} at (160,250) size 100x100 [transform={m=((2.00,0.00)(0.00,2.00)) t=(40.00,10.00)}]
-              KCanvasItem {rect} at (160,250) size 100x5 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00L20.00,0.00L20.00,1.00L0.00,1.00"]
-              KCanvasItem {rect} at (160,250) size 5x100 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L1.00,0.00L1.00,20.00L0.00,20.00"]
-          KCanvasContainer {g} at (156,140) size 112.50x112.50 [transform={m=((2.50,0.00)(0.00,2.50)) t=(-364.00,-230.00)}]
+          KCanvasContainer {g} at (160,100) size 100x100 [transform={m=((2.50,0.00)(0.00,2.50)) t=(60.00,45.00)}]
+            KCanvasContainer {g} at (160,100) size 100x100 [transform={m=((2.00,0.00)(0.00,2.00)) t=(40.00,10.00)}]
+              KCanvasItem {rect} at (160,100) size 100x5 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00L20.00,0.00L20.00,1.00L0.00,1.00"]
+              KCanvasItem {rect} at (160,100) size 5x100 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L1.00,0.00L1.00,20.00L0.00,20.00"]
+          KCanvasContainer {g} at (156,95) size 112.50x112.50 [transform={m=((2.50,0.00)(0.00,2.50)) t=(-364.00,-230.00)}]
             RenderSVGText {text} at (0,0) size 465x18
               RenderText {TEXT} at (0,0) size 53x18
                 text run at (0,0) width 53: "scale (2)"
-            KCanvasItem {rect} at (156,140) size 12.50x12.50 [fill={[type=SOLID] [color=#000000]}] [data="M208.00,118.00L213.00,118.00L213.00,123.00L208.00,123.00"]
-            KCanvasItem {rect} at (256,140) size 12.50x12.50 [fill={[type=SOLID] [color=#0000FF]}] [data="M248.00,118.00L253.00,118.00L253.00,123.00L248.00,123.00"]
-            KCanvasItem {rect} at (156,240) size 12.50x12.50 [fill={[type=SOLID] [color=#FF0000]}] [data="M208.00,158.00L213.00,158.00L213.00,163.00L208.00,163.00"]
+            KCanvasItem {rect} at (156,95) size 12.50x12.50 [fill={[type=SOLID] [color=#000000]}] [data="M208.00,118.00L213.00,118.00L213.00,123.00L208.00,123.00"]
+            KCanvasItem {rect} at (256,95) size 12.50x12.50 [fill={[type=SOLID] [color=#0000FF]}] [data="M248.00,118.00L253.00,118.00L253.00,123.00L248.00,123.00"]
+            KCanvasItem {rect} at (156,195) size 12.50x12.50 [fill={[type=SOLID] [color=#FF0000]}] [data="M208.00,158.00L213.00,158.00L213.00,163.00L208.00,163.00"]
       RenderSVGText {text} at (0,0) size 465x46
         RenderText {TEXT} at (0,0) size 264x46
           text run at (0,0) width 264: "$Revision: 1.1 $"

diff --git a/LayoutTests/svg/W3C-SVG-1.1/coords-trans-05-t-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/coords-trans-05-t-expected.txt
index 9162590d9c135597d59969cb65a54c7ff3fb4ae3..712d171302bc4822efc4f82c5971e5494af17451 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/coords-trans-05-t-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/coords-trans-05-t-expected.txt
@@ -4,16 +4,16 @@ layer at (0,0) size 480x360
       KCanvasContainer {g} at (30,100) size 162.50x112.50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,30.00)}]
         KCanvasContainer {g} at (30,100) size 162.50x112.50
           KCanvasContainer {g} at (35,105) size 150x100 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-90.00,-450.00)}]
-            KCanvasContainer {g} at (-550,-1575) size 150x100 [transform={m=((7.50,0.00)(0.00,5.00)) t=(125.00,525.00)}]
-              KCanvasItem {rect} at (-550,-1575) size 150x5 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00L20.00,0.00L20.00,1.00L0.00,1.00"]
-              KCanvasItem {rect} at (-550,-1575) size 5.03x100 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L0.67,0.00L0.67,20.00L0.00,20.00"]
-          KCanvasContainer {g} at (30,145) size 162.50x112.50 [transform={m=((2.50,0.00)(0.00,2.50)) t=(-90.00,-450.00)}]
+            KCanvasContainer {g} at (35,105) size 150x100 [transform={m=((7.50,0.00)(0.00,5.00)) t=(125.00,525.00)}]
+              KCanvasItem {rect} at (35,105) size 150x5 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00L20.00,0.00L20.00,1.00L0.00,1.00"]
+              KCanvasItem {rect} at (35,105) size 5.03x100 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L0.67,0.00L0.67,20.00L0.00,20.00"]
+          KCanvasContainer {g} at (30,100) size 162.50x112.50 [transform={m=((2.50,0.00)(0.00,2.50)) t=(-90.00,-450.00)}]
             RenderSVGText {text} at (0,0) size 465x18
               RenderText {TEXT} at (0,0) size 180x18
                 text run at (0,0) width 180: "scale(25, 95) - translate(2, 2)"
-            KCanvasItem {rect} at (30,145) size 12.50x12.50 [fill={[type=SOLID] [color=#000000]}] [data="M48.00,208.00L53.00,208.00L53.00,213.00L48.00,213.00"]
-            KCanvasItem {rect} at (180,145) size 12.50x12.50 [fill={[type=SOLID] [color=#0000FF]}] [data="M108.00,208.00L113.00,208.00L113.00,213.00L108.00,213.00"]
-            KCanvasItem {rect} at (30,245) size 12.50x12.50 [fill={[type=SOLID] [color=#FF0000]}] [data="M48.00,248.00L53.00,248.00L53.00,253.00L48.00,253.00"]
+            KCanvasItem {rect} at (30,100) size 12.50x12.50 [fill={[type=SOLID] [color=#000000]}] [data="M48.00,208.00L53.00,208.00L53.00,213.00L48.00,213.00"]
+            KCanvasItem {rect} at (180,100) size 12.50x12.50 [fill={[type=SOLID] [color=#0000FF]}] [data="M108.00,208.00L113.00,208.00L113.00,213.00L108.00,213.00"]
+            KCanvasItem {rect} at (30,200) size 12.50x12.50 [fill={[type=SOLID] [color=#FF0000]}] [data="M48.00,248.00L53.00,248.00L53.00,253.00L48.00,253.00"]
       RenderSVGText {text} at (0,0) size 465x46
         RenderText {TEXT} at (0,0) size 264x46
           text run at (0,0) width 264: "$Revision: 1.1 $"

diff --git a/LayoutTests/svg/W3C-SVG-1.1/coords-trans-06-t-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/coords-trans-06-t-expected.txt
index 6548edca849354fcd95dd83dc7aa9329c48e10c6..1cca71c43cc8e280a3a53ce910f196530d211ab3 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/coords-trans-06-t-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/coords-trans-06-t-expected.txt
@@ -5,17 +5,17 @@ layer at (0,0) size 480x360
         KCanvasContainer {g} at (20,100) size 162.50x112.50
           KCanvasContainer {g} at (23,105) size 150x100
             KCanvasContainer {g} at (23,105) size 150x100 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-102.00,-450.00)}]
-              KCanvasContainer {g} at (-640,-1575) size 150x100 [transform={m=((7.50,0.00)(0.00,5.00)) t=(0.00,0.00)}]
-                KCanvasContainer {g} at (-748.33,-1995) size 150x100 [transform={m=((1.00,0.00)(0.00,1.00)) t=(16.67,105.00)}]
-                  KCanvasItem {rect} at (-748.33,-1995) size 150x5 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00L20.00,0.00L20.00,1.00L0.00,1.00"]
-                  KCanvasItem {rect} at (-748.33,-1995) size 5.03x100 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L0.67,0.00L0.67,20.00L0.00,20.00"]
-          KCanvasContainer {g} at (20,145) size 162.50x112.50 [transform={m=((2.50,0.00)(0.00,2.50)) t=(-600.00,-450.00)}]
+              KCanvasContainer {g} at (23,105) size 150x100 [transform={m=((7.50,0.00)(0.00,5.00)) t=(0.00,0.00)}]
+                KCanvasContainer {g} at (23,105) size 150x100 [transform={m=((1.00,0.00)(0.00,1.00)) t=(16.67,105.00)}]
+                  KCanvasItem {rect} at (23,105) size 150x5 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00L20.00,0.00L20.00,1.00L0.00,1.00"]
+                  KCanvasItem {rect} at (23,105) size 5.03x100 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L0.67,0.00L0.67,20.00L0.00,20.00"]
+          KCanvasContainer {g} at (20,100) size 162.50x112.50 [transform={m=((2.50,0.00)(0.00,2.50)) t=(-600.00,-450.00)}]
             RenderSVGText {text} at (0,0) size 465x18
               RenderText {TEXT} at (0,0) size 202x18
                 text run at (0,0) width 202: "scale(25, 95) then translate(2, 2)"
-            KCanvasItem {rect} at (20,145) size 12.50x12.50 [fill={[type=SOLID] [color=#000000]}] [data="M248.00,208.00L253.00,208.00L253.00,213.00L248.00,213.00"]
-            KCanvasItem {rect} at (170,145) size 12.50x12.50 [fill={[type=SOLID] [color=#0000FF]}] [data="M308.00,208.00L313.00,208.00L313.00,213.00L308.00,213.00"]
-            KCanvasItem {rect} at (20,245) size 12.50x12.50 [fill={[type=SOLID] [color=#FF0000]}] [data="M248.00,248.00L253.00,248.00L253.00,253.00L248.00,253.00"]
+            KCanvasItem {rect} at (20,100) size 12.50x12.50 [fill={[type=SOLID] [color=#000000]}] [data="M248.00,208.00L253.00,208.00L253.00,213.00L248.00,213.00"]
+            KCanvasItem {rect} at (170,100) size 12.50x12.50 [fill={[type=SOLID] [color=#0000FF]}] [data="M308.00,208.00L313.00,208.00L313.00,213.00L308.00,213.00"]
+            KCanvasItem {rect} at (20,200) size 12.50x12.50 [fill={[type=SOLID] [color=#FF0000]}] [data="M248.00,248.00L253.00,248.00L253.00,253.00L248.00,253.00"]
       RenderSVGText {text} at (0,0) size 465x46
         RenderText {TEXT} at (0,0) size 264x46
           text run at (0,0) width 264: "$Revision: 1.1 $"

diff --git a/LayoutTests/svg/W3C-SVG-1.1/coords-viewattr-01-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/coords-viewattr-01-b-expected.txt
index 2618c0c376713cbd2986e473a259efce36b32b84..f538e6e19ac6a43f34a78b6a3bb71fce4bd598f4 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/coords-viewattr-01-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/coords-viewattr-01-b-expected.txt
@@ -23,17 +23,17 @@ layer at (0,0) size 480x360
               RenderSVGText {text} at (0,0) size 465x10
                 RenderText {TEXT} at (0,0) size 26x10
                   text run at (0,0) width 26: "xMin*"
-              KCanvasContainer {svg} at (90,60) size 0x0
+              KCanvasContainer {svg} at (120,80) size 0x0
             KCanvasContainer {g} at (190,80) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(70.00,0.00)}]
               RenderSVGText {text} at (0,0) size 465x10
                 RenderText {TEXT} at (0,0) size 26x10
                   text run at (0,0) width 26: "xMid*"
-              KCanvasContainer {svg} at (156.25,60) size 0x0
+              KCanvasContainer {svg} at (203.75,80) size 0x0
             KCanvasContainer {g} at (120,130) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,50.00)}]
               RenderSVGText {text} at (0,0) size 465x10
                 RenderText {TEXT} at (0,0) size 27x10
                   text run at (0,0) width 27: "xMax*"
-              KCanvasContainer {svg} at (117.50,97.50) size 0x0
+              KCanvasContainer {svg} at (147.50,130) size 0x0
           KCanvasContainer {g} at (300,80) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,50.00)}]
             RenderSVGText {text} at (0,0) size 465x10
               RenderText {TEXT} at (0,0) size 124x10
@@ -61,17 +61,17 @@ layer at (0,0) size 480x360
               RenderSVGText {text} at (0,0) size 465x10
                 RenderText {TEXT} at (0,0) size 26x10
                   text run at (0,0) width 26: "xMin*"
-              KCanvasContainer {svg} at (180,322.50) size 0x0
+              KCanvasContainer {svg} at (120,215) size 0x0
             KCanvasContainer {g} at (170,215) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,0.00)}]
               RenderSVGText {text} at (0,0) size 465x10
                 RenderText {TEXT} at (0,0) size 26x10
                   text run at (0,0) width 26: "xMid*"
-              KCanvasContainer {svg} at (247.50,322.50) size 0x0
+              KCanvasContainer {svg} at (162.50,215) size 0x0
             KCanvasContainer {g} at (220,215) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,0.00)}]
               RenderSVGText {text} at (0,0) size 465x10
                 RenderText {TEXT} at (0,0) size 27x10
                   text run at (0,0) width 27: "xMax*"
-              KCanvasContainer {svg} at (315,322.50) size 0x0
+              KCanvasContainer {svg} at (205,215) size 0x0
           KCanvasContainer {g} at (300,215) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,185.00)}]
             RenderSVGText {text} at (0,0) size 465x10
               RenderText {TEXT} at (0,0) size 115x10
@@ -80,17 +80,17 @@ layer at (0,0) size 480x360
               RenderSVGText {text} at (0,0) size 465x10
                 RenderText {TEXT} at (0,0) size 27x10
                   text run at (0,0) width 27: "*YMin"
-              KCanvasContainer {svg} at (500,358.33) size 0x0
+              KCanvasContainer {svg} at (300,215) size 0x0
             KCanvasContainer {g} at (370,215) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(70.00,0.00)}]
               RenderSVGText {text} at (0,0) size 465x10
                 RenderText {TEXT} at (0,0) size 27x10
                   text run at (0,0) width 27: "*YMid"
-              KCanvasContainer {svg} at (616.67,340) size 0x0
+              KCanvasContainer {svg} at (370,196.67) size 0x0
             KCanvasContainer {g} at (300,265) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,50.00)}]
               RenderSVGText {text} at (0,0) size 465x10
                 RenderText {TEXT} at (0,0) size 28x10
                   text run at (0,0) width 28: "*YMax"
-              KCanvasContainer {svg} at (500,405) size 0x0
+              KCanvasContainer {svg} at (300,228.33) size 0x0
       RenderSVGText {text} at (0,0) size 465x46
         RenderText {TEXT} at (0,0) size 264x46
           text run at (0,0) width 264: "$Revision: 1.1 $"

diff --git a/LayoutTests/svg/W3C-SVG-1.1/coords-viewattr-02-b-expected.checksum b/LayoutTests/svg/W3C-SVG-1.1/coords-viewattr-02-b-expected.checksum
index a4a423bd0dc487fe408ee9971872b8fd822dc51f..4649eff01b2a9bfa67b601aac27ed7a507366ba8 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/coords-viewattr-02-b-expected.checksum
+++ b/LayoutTests/svg/W3C-SVG-1.1/coords-viewattr-02-b-expected.checksum
@@ -1 +1 @@
-32377a490808165b7bbc58a14fb0d7f8
\ No newline at end of file
+54229441b75d2b2335567c7f780810e7
\ No newline at end of file

diff --git a/LayoutTests/svg/W3C-SVG-1.1/coords-viewattr-02-b-expected.png b/LayoutTests/svg/W3C-SVG-1.1/coords-viewattr-02-b-expected.png
index e590eb37a07a76766c6e2ae79b2f62a8ec354bda..69e836d6ef35af5c56d848856f9662f2c250ffc4 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/coords-viewattr-02-b-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/coords-viewattr-02-b-expected.png differ

diff --git a/LayoutTests/svg/W3C-SVG-1.1/coords-viewattr-02-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/coords-viewattr-02-b-expected.txt
index b658b0452c149e1fea35a3e30de998a9757065e2..607a9038d2b4ae0d5cb043a34e7f75519b1b58a6 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/coords-viewattr-02-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/coords-viewattr-02-b-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 480x360
   RenderCanvas at (0,0) size 480x360
     KCanvasContainer {svg} at (0.50,0.50) size 479x359
-      KCanvasContainer {g} at (0,30) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,30.00)}]
-        KCanvasContainer {g} at (0,30) size 0x0
+      KCanvasContainer {g} at (20,70) size 410x225 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,30.00)}]
+        KCanvasContainer {g} at (20,70) size 410x225
           RenderSVGText {text} at (0,0) size 465x10
             RenderText {TEXT} at (0,0) size 45x10
               text run at (0,0) width 45: "Raster to fit"
-          KCanvasContainer {g} at (20,70) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(20.00,40.00)}]
+          KCanvasContainer {g} at (20,70) size 40x40 [transform={m=((1.00,0.00)(0.00,1.00)) t=(20.00,40.00)}]
             RenderImage {image} at (0,0) size 40x40
           RenderSVGText {text} at (0,0) size 465x10
             RenderText {TEXT} at (0,0) size 42x10
@@ -16,78 +16,78 @@ layer at (0,0) size 480x360
             RenderText {TEXT} at (0,0) size 42x10
               text run at (0,0) width 42: "Viewport 2"
           KCanvasContainer {g} at (20,220) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(20.00,190.00)}]
-          KCanvasContainer {g} at (120,80) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(120.00,50.00)}]
+          KCanvasContainer {g} at (120,80) size 120x80 [transform={m=((1.00,0.00)(0.00,1.00)) t=(120.00,50.00)}]
             RenderSVGText {text} at (0,0) size 465x10
               RenderText {TEXT} at (0,0) size 112x10
                 text run at (0,0) width 112: "---------- meet --------------------"
-            KCanvasContainer {g} at (120,80) size 0x0
+            KCanvasContainer {g} at (120,80) size 50x30
               RenderSVGText {text} at (0,0) size 465x10
                 RenderText {TEXT} at (0,0) size 26x10
                   text run at (0,0) width 26: "xMin*"
               RenderImage {image} at (0,0) size 50x30
-            KCanvasContainer {g} at (190,80) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(70.00,0.00)}]
+            KCanvasContainer {g} at (190,80) size 50x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(70.00,0.00)}]
               RenderSVGText {text} at (0,0) size 465x10
                 RenderText {TEXT} at (0,0) size 26x10
                   text run at (0,0) width 26: "xMid*"
               RenderImage {image} at (0,0) size 50x30
-            KCanvasContainer {g} at (120,130) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,50.00)}]
+            KCanvasContainer {g} at (120,130) size 50x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,50.00)}]
               RenderSVGText {text} at (0,0) size 465x10
                 RenderText {TEXT} at (0,0) size 27x10
                   text run at (0,0) width 27: "xMax*"
               RenderImage {image} at (0,0) size 50x30
-          KCanvasContainer {g} at (300,80) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,50.00)}]
+          KCanvasContainer {g} at (300,80) size 130x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,50.00)}]
             RenderSVGText {text} at (0,0) size 465x10
               RenderText {TEXT} at (0,0) size 124x10
                 text run at (0,0) width 124: "---------- meet ------------------------"
-            KCanvasContainer {g} at (300,80) size 0x0
+            KCanvasContainer {g} at (300,80) size 30x60
               RenderSVGText {text} at (0,0) size 465x10
                 RenderText {TEXT} at (0,0) size 27x10
                   text run at (0,0) width 27: "*YMin"
               RenderImage {image} at (0,0) size 30x60
-            KCanvasContainer {g} at (350,80) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,0.00)}]
+            KCanvasContainer {g} at (350,80) size 30x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,0.00)}]
               RenderSVGText {text} at (0,0) size 465x10
                 RenderText {TEXT} at (0,0) size 27x10
                   text run at (0,0) width 27: "*YMid"
               RenderImage {image} at (0,0) size 30x60
-            KCanvasContainer {g} at (400,80) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,0.00)}]
+            KCanvasContainer {g} at (400,80) size 30x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,0.00)}]
               RenderSVGText {text} at (0,0) size 465x10
                 RenderText {TEXT} at (0,0) size 28x10
                   text run at (0,0) width 28: "*YMax"
               RenderImage {image} at (0,0) size 30x60
-          KCanvasContainer {g} at (120,215) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(120.00,185.00)}]
+          KCanvasContainer {g} at (120,215) size 130x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(120.00,185.00)}]
             RenderSVGText {text} at (0,0) size 465x10
               RenderText {TEXT} at (0,0) size 127x10
                 text run at (0,0) width 127: "---------- slice -------------------------"
-            KCanvasContainer {g} at (120,215) size 0x0
+            KCanvasContainer {g} at (120,215) size 30x60
               RenderSVGText {text} at (0,0) size 465x10
                 RenderText {TEXT} at (0,0) size 26x10
                   text run at (0,0) width 26: "xMin*"
               RenderImage {image} at (0,0) size 30x60
-            KCanvasContainer {g} at (170,215) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,0.00)}]
+            KCanvasContainer {g} at (170,215) size 30x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,0.00)}]
               RenderSVGText {text} at (0,0) size 465x10
                 RenderText {TEXT} at (0,0) size 26x10
                   text run at (0,0) width 26: "xMid*"
               RenderImage {image} at (0,0) size 30x60
-            KCanvasContainer {g} at (220,215) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,0.00)}]
+            KCanvasContainer {g} at (220,215) size 30x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,0.00)}]
               RenderSVGText {text} at (0,0) size 465x10
                 RenderText {TEXT} at (0,0) size 27x10
                   text run at (0,0) width 27: "xMax*"
               RenderImage {image} at (0,0) size 30x60
-          KCanvasContainer {g} at (300,215) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,185.00)}]
+          KCanvasContainer {g} at (300,215) size 120x80 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,185.00)}]
             RenderSVGText {text} at (0,0) size 465x10
               RenderText {TEXT} at (0,0) size 115x10
                 text run at (0,0) width 115: "---------- slice ---------------------"
-            KCanvasContainer {g} at (300,215) size 0x0
+            KCanvasContainer {g} at (300,215) size 50x30
               RenderSVGText {text} at (0,0) size 465x10
                 RenderText {TEXT} at (0,0) size 27x10
                   text run at (0,0) width 27: "*YMin"
               RenderImage {image} at (0,0) size 50x30
-            KCanvasContainer {g} at (370,215) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(70.00,0.00)}]
+            KCanvasContainer {g} at (370,215) size 50x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(70.00,0.00)}]
               RenderSVGText {text} at (0,0) size 465x10
                 RenderText {TEXT} at (0,0) size 27x10
                   text run at (0,0) width 27: "*YMid"
               RenderImage {image} at (0,0) size 50x30
-            KCanvasContainer {g} at (300,265) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,50.00)}]
+            KCanvasContainer {g} at (300,265) size 50x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,50.00)}]
               RenderSVGText {text} at (0,0) size 465x10
                 RenderText {TEXT} at (0,0) size 28x10
                   text run at (0,0) width 28: "*YMax"

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 cb3f0bf932a12a801a4c5607e4f8e828f74c9b9b..705819fd3c1b22414ae20db26770eccaf8c60180 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
@@ -1,12 +1,12 @@
-KCanvasResource {id="BlendNormal" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=FLOOD] [in="BackgroundAlpha"] [result="img1"] [subregion="at (0,0) size 160x120"] [color=#00FF00] [opacity=0.50], [type=BLEND] [in="SourceGraphic"] [subregion="at (0,0) size 160x120"] [in2="img1"] [blend mode=NORMAL]]]}
-KCanvasResource {id="BlendMultiply" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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=MULTIPLY]]]}
-KCanvasResource {id="BlendScreen" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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=SCREEN]]]}
-KCanvasResource {id="BlendDarken" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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=DARKEN]]]}
-KCanvasResource {id="BlendLighten" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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]]]}
+KCanvasResource {id="BlendNormal" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0] [effects=[[type=FLOOD] [in="BackgroundAlpha"] [result="img1"] [subregion="at (0,0) size 160x120"] [color=#00FF00] [opacity=0.50], [type=BLEND] [in="SourceGraphic"] [subregion="at (0,0) size 160x120"] [in2="img1"] [blend mode=NORMAL]]]}
+KCanvasResource {id="BlendMultiply" [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=MULTIPLY]]]}
+KCanvasResource {id="BlendScreen" [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=SCREEN]]]}
+KCanvasResource {id="BlendDarken" [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=DARKEN]]]}
+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
   RenderCanvas at (0,0) size 480x360
-    KCanvasContainer {svg} at (2.25,2.25) size 475.50x355.50
-      KCanvasContainer {g} at (90,30) size 360x264
+    KCanvasContainer {svg} at (0,0) size 477.75x357.75
+      KCanvasContainer {g} at (0,0) size 450x294
         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-color-01-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/filters-color-01-b-expected.txt
index 456ece47d1810a371c95401fe6f57d91007c4bf7..961edda776064144758a8830c1b9bd8dbcc8560b 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/filters-color-01-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/filters-color-01-b-expected.txt
@@ -1,8 +1,8 @@
 KRenderingPaintServer {id="MyGradient" [type=LINEAR-GRADIENT] [stops=[(0.00,#DD00DD), (0.33,#22CC22), (0.67,#400000), (1.00,#A0A0FF)]] [bounding box mode=0] [start=(20,0)] [end=(760,0)]}
-KCanvasResource {id="Matrix" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=COLOR-MATRIX] [in="SourceGraphic"] [subregion="at (0,0) size 800x500"] [color matrix type=CMT_MATRIX] [values=[0.33, 0.33, 0.33, 0.00, 0.00, 0.33, 0.33, 0.33, 0.00, 0.00, 0.33, 0.33, 0.33, 0.00, 0.00, 0.33, 0.33, 0.33, 0.00, 0.00]]]]}
-KCanvasResource {id="Saturate40" [type=FILTER]  [bounding box=at (-5,-5) size 110x110] [effect bounding box mode=0] [effects=[[type=COLOR-MATRIX] [in="SourceGraphic"] [subregion="at (0,0) size 800x500"] [color matrix type=CMT_SATURATE] [values=[0.25]]]]}
-KCanvasResource {id="HueRotate90" [type=FILTER]  [bounding box=at (-5,-5) size 110x110] [effect bounding box mode=0] [effects=[[type=COLOR-MATRIX] [in="SourceGraphic"] [subregion="at (0,0) size 800x500"] [color matrix type=HUE-ROTATE] [values=[90.00]]]]}
-KCanvasResource {id="LuminanceToAlpha" [type=FILTER]  [bounding box=at (-5,-5) size 110x110] [effect bounding box mode=0] [effects=[[type=COLOR-MATRIX] [in="SourceGraphic"] [result="a"] [subregion="at (0,0) size 800x500"] [color matrix type=LUMINANCE-TO-ALPHA] [values=[]], [type=COMPOSITE] [in="SourceGraphic"] [subregion="at (0,0) size 800x500"] [in2="a"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00]]]}
+KCanvasResource {id="Matrix" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0] [effects=[[type=COLOR-MATRIX] [in="SourceGraphic"] [subregion="at (0,0) size 800x500"] [color matrix type=CMT_MATRIX] [values=[0.33, 0.33, 0.33, 0.00, 0.00, 0.33, 0.33, 0.33, 0.00, 0.00, 0.33, 0.33, 0.33, 0.00, 0.00, 0.33, 0.33, 0.33, 0.00, 0.00]]]]}
+KCanvasResource {id="Saturate40" [type=FILTER]  [bounding box=at (-0.05,-0.05) size 1.10x1.10] [effect bounding box mode=0] [effects=[[type=COLOR-MATRIX] [in="SourceGraphic"] [subregion="at (0,0) size 800x500"] [color matrix type=CMT_SATURATE] [values=[0.25]]]]}
+KCanvasResource {id="HueRotate90" [type=FILTER]  [bounding box=at (-0.05,-0.05) size 1.10x1.10] [effect bounding box mode=0] [effects=[[type=COLOR-MATRIX] [in="SourceGraphic"] [subregion="at (0,0) size 800x500"] [color matrix type=HUE-ROTATE] [values=[90.00]]]]}
+KCanvasResource {id="LuminanceToAlpha" [type=FILTER]  [bounding box=at (-0.05,-0.05) size 1.10x1.10] [effect bounding box mode=0] [effects=[[type=COLOR-MATRIX] [in="SourceGraphic"] [result="a"] [subregion="at (0,0) size 800x500"] [color matrix type=LUMINANCE-TO-ALPHA] [values=[]], [type=COMPOSITE] [in="SourceGraphic"] [subregion="at (0,0) size 800x500"] [in2="a"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00]]]}
 layer at (0,0) size 480x360
   RenderCanvas at (0,0) size 480x360
     KCanvasContainer {svg} at (0.50,0.50) size 799x499

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-composite-02-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/filters-composite-02-b-expected.txt
index 98c436c012b0154a80996d4e13e775a30b0cf758..b8583123fac4741f77d4034e746e51756867a4a4 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/filters-composite-02-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/filters-composite-02-b-expected.txt
@@ -1,21 +1,21 @@
-KCanvasResource {id="over" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="blue"] [subregion="at (0,0) size 480x360"], [type=IMAGE]  [result="red"] [subregion="at (0,0) size 480x360"], [type=COMPOSITE] [in="red"] [subregion="at (0,0) size 480x360"] [in2="blue"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00]]]}
-KCanvasResource {id="over50" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="blue"] [subregion="at (0,0) size 480x360"], [type=IMAGE]  [result="red"] [subregion="at (0,0) size 480x360"], [type=COMPOSITE] [in="red"] [subregion="at (0,0) size 480x360"] [in2="blue"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00]]]}
-KCanvasResource {id="in" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="blue"] [subregion="at (0,0) size 480x360"], [type=IMAGE]  [result="red"] [subregion="at (0,0) size 480x360"], [type=COMPOSITE] [in="red"] [subregion="at (0,0) size 480x360"] [in2="blue"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00]]]}
-KCanvasResource {id="in50" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="blue"] [subregion="at (0,0) size 480x360"], [type=IMAGE]  [result="red"] [subregion="at (0,0) size 480x360"], [type=COMPOSITE] [in="red"] [subregion="at (0,0) size 480x360"] [in2="blue"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00]]]}
-KCanvasResource {id="out" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="blue"] [subregion="at (0,0) size 480x360"], [type=IMAGE]  [result="red"] [subregion="at (0,0) size 480x360"], [type=COMPOSITE] [in="red"] [subregion="at (0,0) size 480x360"] [in2="blue"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00]]]}
-KCanvasResource {id="out50" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="blue"] [subregion="at (0,0) size 480x360"], [type=IMAGE]  [result="red"] [subregion="at (0,0) size 480x360"], [type=COMPOSITE] [in="red"] [subregion="at (0,0) size 480x360"] [in2="blue"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00]]]}
-KCanvasResource {id="atop" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="blue"] [subregion="at (0,0) size 480x360"], [type=IMAGE]  [result="red"] [subregion="at (0,0) size 480x360"], [type=COMPOSITE] [in="red"] [subregion="at (0,0) size 480x360"] [in2="blue"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00]]]}
-KCanvasResource {id="atop50" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="blue"] [subregion="at (0,0) size 480x360"], [type=IMAGE]  [result="red"] [subregion="at (0,0) size 480x360"], [type=COMPOSITE] [in="red"] [subregion="at (0,0) size 480x360"] [in2="blue"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00]]]}
-KCanvasResource {id="xor" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="blue"] [subregion="at (0,0) size 480x360"], [type=IMAGE]  [result="red"] [subregion="at (0,0) size 480x360"], [type=COMPOSITE] [in="red"] [subregion="at (0,0) size 480x360"] [in2="blue"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00]]]}
-KCanvasResource {id="xor50" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="blue"] [subregion="at (0,0) size 480x360"], [type=IMAGE]  [result="red"] [subregion="at (0,0) size 480x360"], [type=COMPOSITE] [in="red"] [subregion="at (0,0) size 480x360"] [in2="blue"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00]]]}
-KCanvasResource {id="arithmetic" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="blue"] [subregion="at (0,0) size 480x360"], [type=IMAGE]  [result="red"] [subregion="at (0,0) size 480x360"], [type=COMPOSITE] [in="red"] [subregion="at (0,0) size 480x360"] [in2="blue"] [k1=0.50 k2=0.50 k3=0.50 k4=0.50]]]}
-KCanvasResource {id="arithmetic50" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="blue"] [subregion="at (0,0) size 480x360"], [type=IMAGE]  [result="red"] [subregion="at (0,0) size 480x360"], [type=COMPOSITE] [in="red"] [subregion="at (0,0) size 480x360"] [in2="blue"] [k1=0.50 k2=0.50 k3=0.50 k4=0.50]]]}
+KCanvasResource {id="over" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="blue"] [subregion="at (0,0) size 480x360"], [type=IMAGE]  [result="red"] [subregion="at (0,0) size 480x360"], [type=COMPOSITE] [in="red"] [subregion="at (0,0) size 480x360"] [in2="blue"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00]]]}
+KCanvasResource {id="over50" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="blue"] [subregion="at (0,0) size 480x360"], [type=IMAGE]  [result="red"] [subregion="at (0,0) size 480x360"], [type=COMPOSITE] [in="red"] [subregion="at (0,0) size 480x360"] [in2="blue"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00]]]}
+KCanvasResource {id="in" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="blue"] [subregion="at (0,0) size 480x360"], [type=IMAGE]  [result="red"] [subregion="at (0,0) size 480x360"], [type=COMPOSITE] [in="red"] [subregion="at (0,0) size 480x360"] [in2="blue"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00]]]}
+KCanvasResource {id="in50" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="blue"] [subregion="at (0,0) size 480x360"], [type=IMAGE]  [result="red"] [subregion="at (0,0) size 480x360"], [type=COMPOSITE] [in="red"] [subregion="at (0,0) size 480x360"] [in2="blue"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00]]]}
+KCanvasResource {id="out" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="blue"] [subregion="at (0,0) size 480x360"], [type=IMAGE]  [result="red"] [subregion="at (0,0) size 480x360"], [type=COMPOSITE] [in="red"] [subregion="at (0,0) size 480x360"] [in2="blue"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00]]]}
+KCanvasResource {id="out50" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="blue"] [subregion="at (0,0) size 480x360"], [type=IMAGE]  [result="red"] [subregion="at (0,0) size 480x360"], [type=COMPOSITE] [in="red"] [subregion="at (0,0) size 480x360"] [in2="blue"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00]]]}
+KCanvasResource {id="atop" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="blue"] [subregion="at (0,0) size 480x360"], [type=IMAGE]  [result="red"] [subregion="at (0,0) size 480x360"], [type=COMPOSITE] [in="red"] [subregion="at (0,0) size 480x360"] [in2="blue"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00]]]}
+KCanvasResource {id="atop50" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="blue"] [subregion="at (0,0) size 480x360"], [type=IMAGE]  [result="red"] [subregion="at (0,0) size 480x360"], [type=COMPOSITE] [in="red"] [subregion="at (0,0) size 480x360"] [in2="blue"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00]]]}
+KCanvasResource {id="xor" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="blue"] [subregion="at (0,0) size 480x360"], [type=IMAGE]  [result="red"] [subregion="at (0,0) size 480x360"], [type=COMPOSITE] [in="red"] [subregion="at (0,0) size 480x360"] [in2="blue"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00]]]}
+KCanvasResource {id="xor50" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="blue"] [subregion="at (0,0) size 480x360"], [type=IMAGE]  [result="red"] [subregion="at (0,0) size 480x360"], [type=COMPOSITE] [in="red"] [subregion="at (0,0) size 480x360"] [in2="blue"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00]]]}
+KCanvasResource {id="arithmetic" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="blue"] [subregion="at (0,0) size 480x360"], [type=IMAGE]  [result="red"] [subregion="at (0,0) size 480x360"], [type=COMPOSITE] [in="red"] [subregion="at (0,0) size 480x360"] [in2="blue"] [k1=0.50 k2=0.50 k3=0.50 k4=0.50]]]}
+KCanvasResource {id="arithmetic50" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="blue"] [subregion="at (0,0) size 480x360"], [type=IMAGE]  [result="red"] [subregion="at (0,0) size 480x360"], [type=COMPOSITE] [in="red"] [subregion="at (0,0) size 480x360"] [in2="blue"] [k1=0.50 k2=0.50 k3=0.50 k4=0.50]]]}
 layer at (0,0) size 480x360
   RenderCanvas at (0,0) size 480x360
     KCanvasContainer {svg} at (0.50,0.50) size 479x359
       KCanvasContainer {g} at (20.20,10.20) size 439.60x289.60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(15.00,-60.00)}]
-        KCanvasContainer {g} at (11.20,46.20) size 439.60x289.60 [transform={m=((0.40,0.00)(0.00,0.40)) t=(5.00,70.00)}]
-          KCanvasItem {rect} at (11.20,46.20) size 439.60x289.60 [stroke={[type=SOLID] [color=#0000FF]}] [data="M1.00,1.00L1099.00,1.00L1099.00,724.00L1.00,724.00"]
+        KCanvasContainer {g} at (20.20,10.20) size 439.60x289.60 [transform={m=((0.40,0.00)(0.00,0.40)) t=(5.00,70.00)}]
+          KCanvasItem {rect} at (20.20,10.20) size 439.60x289.60 [stroke={[type=SOLID] [color=#0000FF]}] [data="M1.00,1.00L1099.00,1.00L1099.00,724.00L1.00,724.00"]
           RenderSVGText {text} at (0,0) size 465x146
             RenderText {TEXT} at (0,0) size 409x146
               text run at (0,0) width 409: "on first Row :"
@@ -24,51 +24,51 @@ layer at (0,0) size 480x360
             RenderText {TEXT} at (0,0) size 436x146
               text run at (0,0) width 436: "on second row"
               text run at (0,73) width 335: "opacity 0.5"
-          KCanvasContainer {g} at (26,276) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(15.00,230.00)}]
-            KCanvasItem {rect} at (26,276) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#over] [data="M0.00,0.00L150.00,0.00L150.00,150.00L0.00,150.00"]
+          KCanvasContainer {g} at (26,102) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(15.00,230.00)}]
+            KCanvasItem {rect} at (26,102) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#over] [data="M0.00,0.00L150.00,0.00L150.00,150.00L0.00,150.00"]
             RenderSVGText {text} at (0,0) size 465x73
               RenderText {TEXT} at (0,0) size 134x73
                 text run at (0,0) width 134: "over"
-          KCanvasContainer {g} at (26,476) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(15.00,430.00)}]
-            KCanvasItem {rect} at (26,476) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#over50] [data="M0.00,0.00L150.00,0.00L150.00,150.00L0.00,150.00"]
-          KCanvasContainer {g} at (206,276) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(195.00,230.00)}]
-            KCanvasItem {rect} at (206,276) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#in] [data="M0.00,0.00L150.00,0.00L150.00,150.00L0.00,150.00"]
+          KCanvasContainer {g} at (26,182) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(15.00,430.00)}]
+            KCanvasItem {rect} at (26,182) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#over50] [data="M0.00,0.00L150.00,0.00L150.00,150.00L0.00,150.00"]
+          KCanvasContainer {g} at (98,102) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(195.00,230.00)}]
+            KCanvasItem {rect} at (98,102) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#in] [data="M0.00,0.00L150.00,0.00L150.00,150.00L0.00,150.00"]
             RenderSVGText {text} at (0,0) size 465x73
               RenderText {TEXT} at (0,0) size 54x73
                 text run at (0,0) width 54: "in"
-          KCanvasContainer {g} at (206,476) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(195.00,430.00)}]
-            KCanvasItem {rect} at (206,476) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#in50] [data="M0.00,0.00L150.00,0.00L150.00,150.00L0.00,150.00"]
-          KCanvasContainer {g} at (386,276) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(375.00,230.00)}]
-            KCanvasItem {rect} at (386,276) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#out] [data="M0.00,0.00L150.00,0.00L150.00,150.00L0.00,150.00"]
+          KCanvasContainer {g} at (98,182) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(195.00,430.00)}]
+            KCanvasItem {rect} at (98,182) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#in50] [data="M0.00,0.00L150.00,0.00L150.00,150.00L0.00,150.00"]
+          KCanvasContainer {g} at (170,102) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(375.00,230.00)}]
+            KCanvasItem {rect} at (170,102) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#out] [data="M0.00,0.00L150.00,0.00L150.00,150.00L0.00,150.00"]
             RenderSVGText {text} at (0,0) size 465x73
               RenderText {TEXT} at (0,0) size 98x73
                 text run at (0,0) width 98: "out"
-          KCanvasContainer {g} at (386,476) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(375.00,430.00)}]
-            KCanvasItem {rect} at (386,476) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#out50] [data="M0.00,0.00L150.00,0.00L150.00,150.00L0.00,150.00"]
-          KCanvasContainer {g} at (566,276) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(555.00,230.00)}]
-            KCanvasItem {rect} at (566,276) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#atop] [data="M0.00,0.00L150.00,0.00L150.00,150.00L0.00,150.00"]
+          KCanvasContainer {g} at (170,182) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(375.00,430.00)}]
+            KCanvasItem {rect} at (170,182) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#out50] [data="M0.00,0.00L150.00,0.00L150.00,150.00L0.00,150.00"]
+          KCanvasContainer {g} at (242,102) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(555.00,230.00)}]
+            KCanvasItem {rect} at (242,102) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#atop] [data="M0.00,0.00L150.00,0.00L150.00,150.00L0.00,150.00"]
             RenderSVGText {text} at (0,0) size 465x73
               RenderText {TEXT} at (0,0) size 133x73
                 text run at (0,0) width 133: "atop"
-          KCanvasContainer {g} at (566,476) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(555.00,430.00)}]
-            KCanvasItem {rect} at (566,476) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#atop50] [data="M0.00,0.00L150.00,0.00L150.00,150.00L0.00,150.00"]
-          KCanvasContainer {g} at (746,276) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(735.00,230.00)}]
-            KCanvasItem {rect} at (746,276) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#xor] [data="M0.00,0.00L150.00,0.00L150.00,150.00L0.00,150.00"]
+          KCanvasContainer {g} at (242,182) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(555.00,430.00)}]
+            KCanvasItem {rect} at (242,182) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#atop50] [data="M0.00,0.00L150.00,0.00L150.00,150.00L0.00,150.00"]
+          KCanvasContainer {g} at (314,102) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(735.00,230.00)}]
+            KCanvasItem {rect} at (314,102) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#xor] [data="M0.00,0.00L150.00,0.00L150.00,150.00L0.00,150.00"]
             RenderSVGText {text} at (0,0) size 465x73
               RenderText {TEXT} at (0,0) size 98x73
                 text run at (0,0) width 98: "xor"
-          KCanvasContainer {g} at (746,476) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(735.00,430.00)}]
-            KCanvasItem {rect} at (746,476) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#xor50] [data="M0.00,0.00L150.00,0.00L150.00,150.00L0.00,150.00"]
-          KCanvasContainer {g} at (926,276) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(915.00,230.00)}]
-            KCanvasItem {rect} at (926,276) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#arithmetic] [data="M0.00,0.00L150.00,0.00L150.00,150.00L0.00,150.00"]
+          KCanvasContainer {g} at (314,182) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(735.00,430.00)}]
+            KCanvasItem {rect} at (314,182) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#xor50] [data="M0.00,0.00L150.00,0.00L150.00,150.00L0.00,150.00"]
+          KCanvasContainer {g} at (386,102) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(915.00,230.00)}]
+            KCanvasItem {rect} at (386,102) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#arithmetic] [data="M0.00,0.00L150.00,0.00L150.00,150.00L0.00,150.00"]
             RenderSVGText {text} at (0,0) size 465x73
               RenderText {TEXT} at (0,0) size 167x73
                 text run at (0,0) width 167: "arith-"
             RenderSVGText {text} at (0,0) size 465x73
               RenderText {TEXT} at (0,0) size 165x73
                 text run at (0,0) width 165: "metic"
-          KCanvasContainer {g} at (926,476) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(915.00,430.00)}]
-            KCanvasItem {rect} at (926,476) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#arithmetic50] [data="M0.00,0.00L150.00,0.00L150.00,150.00L0.00,150.00"]
+          KCanvasContainer {g} at (386,182) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(915.00,430.00)}]
+            KCanvasItem {rect} at (386,182) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#arithmetic50] [data="M0.00,0.00L150.00,0.00L150.00,150.00L0.00,150.00"]
       RenderSVGText {text} at (0,0) size 465x46
         RenderText {TEXT} at (0,0) size 264x46
           text run at (0,0) width 264: "$Revision: 1.1 $"

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-comptran-01-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/filters-comptran-01-b-expected.txt
index 4197b2f8cfee85741b5400e36d455543d31e606a..dd73ea6a000d21ba7576db4c47f2143a5df59d6c 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/filters-comptran-01-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/filters-comptran-01-b-expected.txt
@@ -1,8 +1,8 @@
 KRenderingPaintServer {id="MyGradient" [type=LINEAR-GRADIENT] [stops=[(0.00,#FF0000), (0.33,#00FF00), (0.67,#0000FF), (1.00,#000000)]] [bounding box mode=0] [start=(10,0)] [end=(590,0)]}
-KCanvasResource {id="Identity" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-KCanvasResource {id="Table" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-KCanvasResource {id="Linear" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-KCanvasResource {id="Gamma" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
+KCanvasResource {id="Identity" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0]}
+KCanvasResource {id="Table" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0]}
+KCanvasResource {id="Linear" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0]}
+KCanvasResource {id="Gamma" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0]}
 layer at (0,0) size 480x360
   RenderCanvas at (0,0) size 480x360
     KCanvasContainer {svg} at (0.50,0.50) size 629x419

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 45085b7165eee727b5637f6bde48c3032238a6f5..4efbd2800f9e4f8500d7e80deef2b917b5cf2d49 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
@@ -1,44 +1,44 @@
-KCanvasResource {id="convolve1" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-KCanvasResource {id="convolve2" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-KCanvasResource {id="convolve3" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-KCanvasResource {id="convolve4" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-KCanvasResource {id="convolve5" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-KCanvasResource {id="convolve6" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
+KCanvasResource {id="convolve1" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0]}
+KCanvasResource {id="convolve2" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0]}
+KCanvasResource {id="convolve3" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0]}
+KCanvasResource {id="convolve4" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0]}
+KCanvasResource {id="convolve5" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0]}
+KCanvasResource {id="convolve6" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0]}
 layer at (0,0) size 480x360
   RenderCanvas at (0,0) size 480x360
     KCanvasContainer {svg} at (0.50,0.50) size 479x359
-      KCanvasContainer {g} at (0,0) size 0x0
-        KCanvasContainer {g} at (20,40) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(20.00,40.00)}]
-          KCanvasContainer {g} at (20,40) size 0x0
+      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
             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 0x0
+            KCanvasContainer {g} at (20,40) 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 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,0.00)}]
+            KCanvasContainer {g} at (170,40) 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 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,0.00)}]
+            KCanvasContainer {g} at (320,40) 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 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,93.00)}]
+            KCanvasContainer {g} at (20,133) 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 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,93.00)}]
+            KCanvasContainer {g} at (170,133) 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 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,93.00)}]
+            KCanvasContainer {g} at (320,133) 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 e0c308cc29b06cae6ca236e1113109366dce6473..2d8e84958e6a1beafa8f8ab833cb615a1c621560 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
@@ -1,34 +1,34 @@
-KCanvasResource {id="surfaceScaleA" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=DIFFUSE-LIGHTING] [in="SourceGraphic"] [subregion="at (0,0) size 480x360"] [surface scale=1.00] [diffuse constant=1.00] [kernel unit length 0.00, 0.00]]]}
-KCanvasResource {id="surfaceScaleB" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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]]]}
-KCanvasResource {id="surfaceScaleC" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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]]]}
-KCanvasResource {id="diffuseConstantA" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=DIFFUSE-LIGHTING] [in="SourceGraphic"] [subregion="at (0,0) size 480x360"] [surface scale=10.00] [diffuse constant=0.00] [kernel unit length 0.00, 0.00]]]}
-KCanvasResource {id="diffuseConstantB" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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]]]}
-KCanvasResource {id="diffuseConstantC" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=DIFFUSE-LIGHTING] [in="SourceGraphic"] [subregion="at (0,0) size 480x360"] [surface scale=10.00] [diffuse constant=2.00] [kernel unit length 0.00, 0.00]]]}
-KCanvasResource {id="lightingColorA" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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]]]}
-KCanvasResource {id="lightingColorB" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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]]]}
-KCanvasResource {id="lightingColorC" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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]]]}
+KCanvasResource {id="surfaceScaleA" [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=1.00] [diffuse constant=1.00] [kernel unit length 0.00, 0.00]]]}
+KCanvasResource {id="surfaceScaleB" [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]]]}
+KCanvasResource {id="surfaceScaleC" [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]]]}
+KCanvasResource {id="diffuseConstantA" [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=0.00] [kernel unit length 0.00, 0.00]]]}
+KCanvasResource {id="diffuseConstantB" [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]]]}
+KCanvasResource {id="diffuseConstantC" [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=2.00] [kernel unit length 0.00, 0.00]]]}
+KCanvasResource {id="lightingColorA" [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]]]}
+KCanvasResource {id="lightingColorB" [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]]]}
+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
   RenderCanvas at (0,0) size 480x360
-    KCanvasContainer {svg} at (0.50,0.50) size 479x359
-      KCanvasContainer {g} at (0,0) size 0x0
+    KCanvasContainer {svg} at (0,0.50) size 479.50x359
+      KCanvasContainer {g} at (0,50) size 50x170
         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 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,50.00)}]
+        KCanvasContainer {g} at (0,50) size 50x30 [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 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,120.00)}]
+        KCanvasContainer {g} at (0,120) size 50x30 [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 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,190.00)}]
+        KCanvasContainer {g} at (0,190) size 50x30 [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-displace-01-f-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/filters-displace-01-f-expected.txt
index 7aa8bf52568812fa47dc62259cf6a6c71f91f550..f1963a050e2e306de029ba0e3db056c4ec02fb52 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/filters-displace-01-f-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/filters-displace-01-f-expected.txt
@@ -1,8 +1,8 @@
-KCanvasResource {id="DispMapChecker" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=IMAGE]  [subregion="at (0,0) size 480x360"]]]}
-KCanvasResource {id="RotateMap" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=IMAGE]  [subregion="at (0,0) size 480x360"]]]}
-KCanvasResource {id="SphereMap" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=IMAGE]  [subregion="at (0,0) size 480x360"]]]}
-KCanvasResource {id="RotateMapTest" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="Map"] [subregion="at (0,0) size 480x360"], [type=IMAGE]  [result="Texture"] [subregion="at (0,0) size 480x360"]]]}
-KCanvasResource {id="SphereMapTest" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="Map"] [subregion="at (0,0) size 480x360"], [type=IMAGE]  [result="Texture"] [subregion="at (0,0) size 480x360"]]]}
+KCanvasResource {id="DispMapChecker" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0] [effects=[[type=IMAGE]  [subregion="at (0,0) size 480x360"]]]}
+KCanvasResource {id="RotateMap" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0] [effects=[[type=IMAGE]  [subregion="at (0,0) size 480x360"]]]}
+KCanvasResource {id="SphereMap" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0] [effects=[[type=IMAGE]  [subregion="at (0,0) size 480x360"]]]}
+KCanvasResource {id="RotateMapTest" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="Map"] [subregion="at (0,0) size 480x360"], [type=IMAGE]  [result="Texture"] [subregion="at (0,0) size 480x360"]]]}
+KCanvasResource {id="SphereMapTest" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="Map"] [subregion="at (0,0) size 480x360"], [type=IMAGE]  [result="Texture"] [subregion="at (0,0) size 480x360"]]]}
 layer at (0,0) size 480x360
   RenderCanvas at (0,0) size 480x360
     KCanvasContainer {svg} at (0.50,0.50) size 479x359

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-gauss-01-b-expected.checksum b/LayoutTests/svg/W3C-SVG-1.1/filters-gauss-01-b-expected.checksum
index 1ef927a40c0455cbbfa22a0b7d1b860c1baf6bf9..175e14884b24a018361232725eef4721c1a01adc 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/filters-gauss-01-b-expected.checksum
+++ b/LayoutTests/svg/W3C-SVG-1.1/filters-gauss-01-b-expected.checksum
@@ -1 +1 @@
-a9cc8d23193b9a65c36d4422bf0493b1
\ No newline at end of file
+b26f24be3c454587ed3e37ccb6afd5bf
\ No newline at end of file

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-gauss-01-b-expected.png b/LayoutTests/svg/W3C-SVG-1.1/filters-gauss-01-b-expected.png
index 3c09be03780aaa49083044be66dd62c96ce43ccb..890b6027680ac8d30e655870aed146c1e6de4418 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/filters-gauss-01-b-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/filters-gauss-01-b-expected.png differ

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-gauss-01-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/filters-gauss-01-b-expected.txt
index a5b3e8b6e85d4d04894293bc94626b4fd2bb4a1c..2555150ab5580c752ddb2a968d0d1eb5201767b9 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/filters-gauss-01-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/filters-gauss-01-b-expected.txt
@@ -1,5 +1,5 @@
-KCanvasResource {id="blur" [type=FILTER]  [bounding box=at (-10,-10) size 120x120] [effect bounding box mode=0] [effects=[[type=GAUSSIAN-BLUR]  [subregion="at (0,0) size 480x360"] [std dev. x=10.00 y=10.00]]]}
-KCanvasResource {id="blurxy" [type=FILTER]  [bounding box=at (-10,-10) size 120x120] [effect bounding box mode=0] [effects=[[type=GAUSSIAN-BLUR]  [subregion="at (0,0) size 480x360"] [std dev. x=20.00 y=1.00]]]}
+KCanvasResource {id="blur" [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 480x360"] [std dev. x=10.00 y=10.00]]]}
+KCanvasResource {id="blurxy" [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 480x360"] [std dev. x=20.00 y=1.00]]]}
 layer at (0,0) size 480x360
   RenderCanvas at (0,0) size 480x360
     KCanvasContainer {svg} at (0,0) size 479.50x359.50

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-image-01-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/filters-image-01-b-expected.txt
index b4e47454566601eb84f5b25eb5bdd09ffb1dd235..49d69953b588a6ab2b990857d6fdc6faead51ded 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/filters-image-01-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/filters-image-01-b-expected.txt
@@ -1,4 +1,4 @@
-KCanvasResource {id="image" [type=FILTER]  [bounding box=at (-10,-10) size 120x120] [effect bounding box mode=0] [effects=[[type=IMAGE]  [subregion="at (145,50) size 190x190"]]]}
+KCanvasResource {id="image" [type=FILTER]  [bounding box=at (-0.10,-0.10) size 1.20x1.20] [effect bounding box mode=0] [effects=[[type=IMAGE]  [subregion="at (145,50) size 190x190"]]]}
 layer at (0,0) size 480x360
   RenderCanvas at (0,0) size 480x360
     KCanvasContainer {svg} at (0,0) size 480x360

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 e477e11ce33175fb2da3d954b0e4a3cc5bbb9ae8..ed5bf3061a5c343f4347c44c2690dfe6abd30a66 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
@@ -1,23 +1,23 @@
-KCanvasResource {id="distantLightA" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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]]]}
-KCanvasResource {id="distantLightB" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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]]]}
-KCanvasResource {id="distantLightC" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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]]]}
-KCanvasResource {id="distantLightD" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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]]]}
-KCanvasResource {id="pointLightA" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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]]]}
-KCanvasResource {id="pointLightB" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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]]]}
-KCanvasResource {id="pointLightC" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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]]]}
-KCanvasResource {id="pointLightD" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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]]]}
-KCanvasResource {id="spotLightA" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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]]]}
-KCanvasResource {id="spotLightB" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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]]]}
-KCanvasResource {id="spotLightC" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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]]]}
-KCanvasResource {id="spotLightD" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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]]]}
+KCanvasResource {id="distantLightA" [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]]]}
+KCanvasResource {id="distantLightB" [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]]]}
+KCanvasResource {id="distantLightC" [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]]]}
+KCanvasResource {id="distantLightD" [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]]]}
+KCanvasResource {id="pointLightA" [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]]]}
+KCanvasResource {id="pointLightB" [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]]]}
+KCanvasResource {id="pointLightC" [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]]]}
+KCanvasResource {id="pointLightD" [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]]]}
+KCanvasResource {id="spotLightA" [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]]]}
+KCanvasResource {id="spotLightB" [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]]]}
+KCanvasResource {id="spotLightC" [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]]]}
+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
   RenderCanvas at (0,0) size 480x360
-    KCanvasContainer {svg} at (0.50,0.50) size 479x359
-      KCanvasContainer {g} at (70,245) size 335x30
+    KCanvasContainer {svg} at (0,0.50) size 479.50x359
+      KCanvasContainer {g} at (0,40) size 405x235
         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 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,40.00)}]
+        KCanvasContainer {g} at (0,40) size 50x30 [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"
@@ -53,7 +53,7 @@ layer at (0,0) size 480x360
           RenderSVGText {text} at (0,0) size 465x18
             RenderText {TEXT} at (0,0) size 74x18
               text run at (0,0) width 74: "(50, 30, 10)"
-        KCanvasContainer {g} at (0,0) size 0x0
+        KCanvasContainer {g} at (70,150) size 335x30
           RenderImage {image} at (0,0) size 50x30
           RenderImage {image} at (0,0) size 50x30
           RenderImage {image} at (0,0) size 50x30

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-morph-01-f-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/filters-morph-01-f-expected.txt
index f65297407e632f16f37764a11e11bede84693136..269a60a23d0e18e321da23ce10add842413fac21 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/filters-morph-01-f-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/filters-morph-01-f-expected.txt
@@ -1,7 +1,7 @@
-KCanvasResource {id="erode1" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-KCanvasResource {id="erode2" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-KCanvasResource {id="dilate1" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-KCanvasResource {id="dilate2" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
+KCanvasResource {id="erode1" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0]}
+KCanvasResource {id="erode2" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0]}
+KCanvasResource {id="dilate1" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0]}
+KCanvasResource {id="dilate2" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0]}
 layer at (0,0) size 480x360
   RenderCanvas at (0,0) size 480x360
     KCanvasContainer {svg} at (0.50,0.50) size 479x359

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-offset-01-b-expected.checksum b/LayoutTests/svg/W3C-SVG-1.1/filters-offset-01-b-expected.checksum
index 28e76623fc2a19975d8ee079710cd301389474af..759fb22ac69514726528a9c8120c696dab49f530 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/filters-offset-01-b-expected.checksum
+++ b/LayoutTests/svg/W3C-SVG-1.1/filters-offset-01-b-expected.checksum
@@ -1 +1 @@
-6d770f9accddf45c7ff393635abd0e45
\ No newline at end of file
+0a96e2f81a7bd8201ba2eebf27be7aaa
\ No newline at end of file

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-offset-01-b-expected.png b/LayoutTests/svg/W3C-SVG-1.1/filters-offset-01-b-expected.png
index cf7823818aad5cea6371954dcb53f4b3f29dab2d..4d5fa903c841f2fde3cf32b277af8e3454dfdf1b 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/filters-offset-01-b-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/filters-offset-01-b-expected.png differ

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-offset-01-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/filters-offset-01-b-expected.txt
index 3d6f94829fb3d51ceb2f761145fba848c466acd0..c43323582b80cef602089c31a0b2494e826d983a 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/filters-offset-01-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/filters-offset-01-b-expected.txt
@@ -1,4 +1,4 @@
-KCanvasResource {id="FOMTest" [type=FILTER]  [bounding box=at (0,0) size 250x400] [effect bounding box mode=0] [effects=[[type=OFFSET]  [result="Off1"] [subregion="at (0,0) size 480x360"] [dx=40.00 dy=30.00], [type=FLOOD]  [result="F1"] [subregion="at (0,0) size 480x360"] [color=#408000] [opacity=0.80], [type=COMPOSITE]  [result="C1"] [subregion="at (0,0) size 480x360"] [in2="Off1"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00], [type=OFFSET] [in="SourceGraphic"] [result="Off2"] [subregion="at (0,0) size 480x360"] [dx=80.00 dy=60.00], [type=FLOOD]  [result="F2"] [subregion="at (0,0) size 480x360"] [color=#408000] [opacity=0.60], [type=COMPOSITE]  [result="C2"] [subregion="at (0,0) size 480x360"] [in2="Off2"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00], [type=OFFSET] [in="SourceGraphic"] [result="Off3"] [subregion="at (0,0) size 480x360"] [dx=120.00 dy=90.00], [type=FLOOD]  [result="F3"] [subregion="at (0,0) size 480x360"] [color=#408000] [opacity=0.40], [type=COMPOSITE]  [result="C3"] [subregion="at (0,0) size 480x360"] [in2="Off3"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00], [type=MERGE]  [subregion="at (0,0) size 480x360"][merge inputs=[C3, C2, C1, SourceGraphic]]]]}
+KCanvasResource {id="FOMTest" [type=FILTER]  [bounding box=at (0,0) size 2.50x4] [effect bounding box mode=0] [effects=[[type=OFFSET]  [result="Off1"] [subregion="at (0,0) size 480x360"] [dx=40.00 dy=30.00], [type=FLOOD]  [result="F1"] [subregion="at (0,0) size 480x360"] [color=#408000] [opacity=0.80], [type=COMPOSITE]  [result="C1"] [subregion="at (0,0) size 480x360"] [in2="Off1"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00], [type=OFFSET] [in="SourceGraphic"] [result="Off2"] [subregion="at (0,0) size 480x360"] [dx=80.00 dy=60.00], [type=FLOOD]  [result="F2"] [subregion="at (0,0) size 480x360"] [color=#408000] [opacity=0.60], [type=COMPOSITE]  [result="C2"] [subregion="at (0,0) size 480x360"] [in2="Off2"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00], [type=OFFSET] [in="SourceGraphic"] [result="Off3"] [subregion="at (0,0) size 480x360"] [dx=120.00 dy=90.00], [type=FLOOD]  [result="F3"] [subregion="at (0,0) size 480x360"] [color=#408000] [opacity=0.40], [type=COMPOSITE]  [result="C3"] [subregion="at (0,0) size 480x360"] [in2="Off3"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00], [type=MERGE]  [subregion="at (0,0) size 480x360"][merge inputs=[C3, C2, C1, SourceGraphic]]]]}
 layer at (0,0) size 480x360
   RenderCanvas at (0,0) size 480x360
     KCanvasContainer {svg} at (0.50,0.50) size 479x359

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 50d4dc2752f57bdee0ce1b8d09fe0451bc67edc3..a7ec40d126f5c9fc0d1caaca740a2ec3512b1a94 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
@@ -1,23 +1,23 @@
-KCanvasResource {id="surfaceScaleA" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=SPECULAR-LIGHTING] [in="SourceGraphic"] [subregion="at (0,0) size 480x360"] [surface scale=1.00] [specual constant=1.00] [specular exponent=1.00]]]}
-KCanvasResource {id="surfaceScaleB" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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]]]}
-KCanvasResource {id="surfaceScaleC" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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]]]}
-KCanvasResource {id="specularConstantA" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=SPECULAR-LIGHTING] [in="SourceGraphic"] [subregion="at (0,0) size 480x360"] [surface scale=10.00] [specual constant=0.00] [specular exponent=1.00]]]}
-KCanvasResource {id="specularConstantB" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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]]]}
-KCanvasResource {id="specularConstantC" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=SPECULAR-LIGHTING] [in="SourceGraphic"] [subregion="at (0,0) size 480x360"] [surface scale=10.00] [specual constant=2.00] [specular exponent=1.00]]]}
-KCanvasResource {id="specularExponentA" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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]]]}
-KCanvasResource {id="specularExponentB" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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=2.00]]]}
-KCanvasResource {id="specularExponentC" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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=4.00]]]}
-KCanvasResource {id="lightingColorA" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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]]]}
-KCanvasResource {id="lightingColorB" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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]]]}
-KCanvasResource {id="lightingColorC" [type=FILTER]  [bounding box=at (0,0) size 100x100] [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]]]}
+KCanvasResource {id="surfaceScaleA" [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=1.00] [specual constant=1.00] [specular exponent=1.00]]]}
+KCanvasResource {id="surfaceScaleB" [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]]]}
+KCanvasResource {id="surfaceScaleC" [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]]]}
+KCanvasResource {id="specularConstantA" [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=0.00] [specular exponent=1.00]]]}
+KCanvasResource {id="specularConstantB" [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]]]}
+KCanvasResource {id="specularConstantC" [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=2.00] [specular exponent=1.00]]]}
+KCanvasResource {id="specularExponentA" [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]]]}
+KCanvasResource {id="specularExponentB" [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=2.00]]]}
+KCanvasResource {id="specularExponentC" [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=4.00]]]}
+KCanvasResource {id="lightingColorA" [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]]]}
+KCanvasResource {id="lightingColorB" [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]]]}
+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
   RenderCanvas at (0,0) size 480x360
-    KCanvasContainer {svg} at (0.50,0.50) size 479x359
-      KCanvasContainer {g} at (90,50) size 280x240
+    KCanvasContainer {svg} at (0,0.50) size 479.50x359
+      KCanvasContainer {g} at (0,20) size 370x270
         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 (90,50) size 280x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,20.00)}]
+        KCanvasContainer {g} at (0,20) size 370x60 [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 (90,120) size 280x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,90.00)}]
+        KCanvasContainer {g} at (0,90) size 370x60 [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 (90,190) size 280x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,160.00)}]
+        KCanvasContainer {g} at (0,160) size 370x60 [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 (90,260) size 280x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,230.00)}]
+        KCanvasContainer {g} at (0,230) size 370x60 [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/filters-turb-01-f-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/filters-turb-01-f-expected.txt
index 2e1c82a17d34a1e7ad625cb89d4d50b932ec5538..b8a4b747bbef02d754b484c3d787cea4724cc94c 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/filters-turb-01-f-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/filters-turb-01-f-expected.txt
@@ -1,9 +1,9 @@
-KCanvasResource {id="Turb1" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-KCanvasResource {id="Turb2" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-KCanvasResource {id="Turb3" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-KCanvasResource {id="Turb4" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-KCanvasResource {id="Turb5" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-KCanvasResource {id="Turb6" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
+KCanvasResource {id="Turb1" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0]}
+KCanvasResource {id="Turb2" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0]}
+KCanvasResource {id="Turb3" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0]}
+KCanvasResource {id="Turb4" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0]}
+KCanvasResource {id="Turb5" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0]}
+KCanvasResource {id="Turb6" [type=FILTER]  [bounding box=at (0,0) size 1x1] [effect bounding box mode=0]}
 layer at (0,0) size 480x360
   RenderCanvas at (0,0) size 480x360
     KCanvasContainer {svg} at (0.50,0.50) size 479x359

diff --git a/LayoutTests/svg/W3C-SVG-1.1/fonts-elem-01-t-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/fonts-elem-01-t-expected.txt
index c3b1fa5544f7351c5dcaf81fcd7d96d32628425e..15d0410385ddb9f735b161b2c04a9d918c047abd 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/fonts-elem-01-t-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/fonts-elem-01-t-expected.txt
@@ -11,18 +11,18 @@ layer at (0,0) size 480x360
               text run at (0,0) width 105: "Placed Glyphs"
           KCanvasContainer {g} at (164.27,81.41) size 211.17x161.13 [transform={m=((1.00,0.00)(-0.00,-1.00)) t=(165.00,140.00)}]
             KCanvasItem {line} at (165,139.50) size 210x1 [stroke={[type=SOLID] [color=#888888]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00L210.00,0.00"]
-            KCanvasContainer {g} at (4.10,-54.49) size 211.17x161.13 [transform={m=((0.03,0.00)(0.00,0.03)) t=(0.00,0.00)}]
-              KCanvasItem {line} at (4.10,-54.49) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,-3500.00L0.00,2000.00"]
-              KCanvasItem {path} at (8.67,-39.20) size 35.77x44.18 [fill={[type=SOLID] [color=#000000]}] [data="M1250.00,-30.00C1188.67,-30.00,1135.33,48.67,1090.00,206.00C1072.67,266.00,1051.00,371.00,1025.00,521.00C957.00,511.67,868.00,495.00,758.00,471.00L492.00,416.00C458.67,328.67,401.67,201.00,321.00,33.00C299.67,-4.33,270.67,-23.00,234.00,-23.00C207.33,-23.00,183.67,-13.33,163.00,6.00C142.33,25.33,131.67,49.33,131.00,78.00C131.00,110.00,181.33,231.67,282.00,443.00C270.67,460.33,265.00,480.33,265.00,503.00C265.00,557.00,297.67,591.67,363.00,607.00C439.00,749.67,535.00,913.67,651.00,1099.00C809.00,1351.67,907.33,1478.00,946.00,1478.00C998.67,1478.00,1034.67,1441.33,1054.00,1368.00L1117.00,1032.00L1266.00,337.00L1323.00,179.00C1342.33,125.00,1352.00,89.00,1352.00,71.00C1352.00,42.33,1341.67,18.33,1321.00,-1.00C1300.33,-20.33,1276.67,-30.00,1250.00,-30.00M897.00,1113.00L611.00,652.00C691.67,672.67,814.00,697.67,978.00,727.00L897.00,1113.00"]
-              KCanvasItem {line} at (47.99,-54.49) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M1498.00,-3500.00L1498.00,2000.00"]
-              KCanvasItem {path} at (1502.72,-26.37) size 30.12x47.43 [transform={m=((1.00,0.00)(0.00,1.00)) t=(1498.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1011.00,892.00L665.00,144.00C579.67,-38.00,514.33,-190.33,469.00,-313.00L403.00,-507.00C385.67,-555.00,355.67,-579.00,313.00,-579.00C285.00,-579.00,261.00,-570.00,241.00,-552.00C221.00,-534.00,210.67,-511.00,210.00,-483.00C210.00,-416.33,282.00,-223.33,426.00,96.00L68.00,785.00L23.00,858.00C5.00,888.67,-4.00,914.33,-4.00,935.00C-4.00,962.33,6.33,986.33,27.00,1007.00C47.67,1027.67,71.33,1038.00,98.00,1038.00C128.67,1038.00,152.33,1026.33,169.00,1003.00C282.33,845.67,404.00,621.67,534.00,331.00L682.00,676.00C735.33,795.33,786.67,898.00,836.00,984.00C857.33,1021.33,885.33,1040.00,920.00,1040.00C947.33,1040.00,971.33,1030.33,992.00,1011.00C1012.67,991.67,1023.33,968.67,1024.00,942.00C1024.00,927.33,1019.67,910.67,1011.00,892.00"]
-              KCanvasItem {line} at (79.22,-54.49) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M2564.00,-3500.00L2564.00,2000.00"]
-              KCanvasItem {path} at (2572.23,-50.27) size 41.95x56.16 [transform={m=((1.00,0.00)(0.00,1.00)) t=(2564.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M802.00,-61.00C614.00,-61.00,454.67,-4.67,324.00,108.00C185.33,228.00,116.00,382.67,116.00,572.00C116.00,802.67,184.33,1012.33,321.00,1201.00C473.67,1410.33,664.00,1515.00,892.00,1515.00C1111.33,1515.00,1274.33,1465.67,1381.00,1367.00C1492.33,1264.33,1548.00,1102.33,1548.00,881.00C1548.00,650.33,1485.33,442.33,1360.00,257.00C1216.00,45.00,1030.00,-61.00,802.00,-61.00M892.00,1310.00C728.67,1310.00,590.33,1228.67,477.00,1066.00C372.33,916.67,320.00,752.00,320.00,572.00C320.00,443.33,367.67,338.67,463.00,258.00C554.33,182.00,667.33,144.00,802.00,144.00C964.00,144.00,1097.67,225.67,1203.00,389.00C1297.00,535.00,1344.00,699.00,1344.00,881.00C1344.00,1040.33,1308.33,1152.33,1237.00,1217.00C1169.00,1279.00,1054.00,1310.00,892.00,1310.00M682.00,1848.00C769.33,1848.00,813.00,1813.00,813.00,1743.00C813.00,1723.00,798.33,1703.67,769.00,1685.00C742.33,1668.33,717.33,1660.00,694.00,1660.00C612.00,1660.00,571.00,1694.33,571.00,1763.00C571.00,1782.33,583.33,1801.33,608.00,1820.00C632.67,1838.67,657.33,1848.00,682.00,1848.00M1221.00,1856.00C1243.67,1856.00,1266.67,1845.67,1290.00,1825.00C1313.33,1804.33,1325.00,1783.67,1325.00,1763.00C1325.00,1701.67,1277.33,1671.00,1182.00,1671.00C1154.67,1671.00,1130.33,1678.00,1109.00,1692.00C1085.00,1708.00,1073.00,1729.00,1073.00,1755.00C1073.00,1801.00,1088.00,1830.67,1118.00,1844.00C1134.67,1852.00,1169.00,1856.00,1221.00,1856.00"]
-              KCanvasItem {line} at (127.12,-54.49) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M4199.00,-3500.00L4199.00,2000.00"]
-              KCanvasItem {path} at (4207.06,-43.65) size 48.13x51.86 [transform={m=((1.00,0.00)(0.00,1.00)) t=(4199.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1306.00,412.00C1235.33,412.00,1174.33,422.33,1123.00,443.00C1071.67,463.67,1030.33,494.33,999.00,535.00C963.00,499.67,928.00,473.00,894.00,455.00C860.00,437.00,826.33,428.00,793.00,428.00C719.00,428.00,649.33,458.00,584.00,518.00C518.67,578.00,485.67,644.33,485.00,717.00C485.00,840.33,533.33,953.00,630.00,1055.00C726.67,1157.00,837.00,1208.00,961.00,1208.00C989.00,1208.00,1012.33,1197.67,1031.00,1177.00C1049.67,1156.33,1059.00,1131.33,1059.00,1102.00C1059.00,1062.00,1025.67,1032.33,959.00,1013.00C870.33,987.67,807.67,958.67,771.00,926.00C717.00,878.67,690.00,809.00,690.00,717.00C690.00,697.67,699.00,679.00,717.00,661.00C737.67,641.00,763.33,631.67,794.00,633.00C852.00,635.67,905.67,689.67,955.00,795.00C999.67,887.00,1039.33,933.00,1074.00,933.00C1102.00,933.00,1124.67,922.67,1142.00,902.00C1159.33,881.33,1168.00,856.00,1168.00,826.00C1168.00,812.67,1166.00,792.67,1162.00,766.00C1158.00,739.33,1155.67,719.33,1155.00,706.00C1155.00,662.67,1173.67,635.33,1211.00,624.00C1225.67,619.33,1257.33,617.00,1306.00,617.00C1397.33,617.00,1461.33,639.33,1498.00,684.00C1531.33,724.00,1548.00,790.33,1548.00,883.00C1548.00,1046.33,1482.33,1179.67,1351.00,1283.00C1231.00,1377.67,1087.67,1425.00,921.00,1425.00C727.00,1425.00,575.00,1351.67,465.00,1205.00C365.67,1074.33,316.00,910.00,316.00,712.00C316.00,529.33,374.33,375.33,491.00,250.00C612.33,119.33,768.33,54.00,959.00,54.00C1013.00,54.00,1074.00,64.33,1142.00,85.00L1317.00,150.00C1346.33,160.67,1365.33,166.00,1374.00,166.00C1401.33,166.00,1425.00,155.33,1445.00,134.00C1465.00,112.67,1475.00,87.33,1475.00,58.00C1475.00,-5.33,1404.00,-56.67,1262.00,-96.00C1154.67,-125.33,1054.33,-140.00,961.00,-140.00C867.00,-140.00,771.00,-122.00,673.00,-86.00C575.00,-50.00,490.67,-1.33,420.00,60.00C213.33,238.67,110.00,456.00,110.00,712.00C110.00,968.00,180.67,1182.00,322.00,1354.00C472.00,1538.00,671.67,1630.00,921.00,1630.00C1146.33,1630.00,1339.33,1562.33,1500.00,1427.00C1668.67,1283.67,1753.00,1102.33,1753.00,883.00C1753.00,733.00,1716.33,617.67,1643.00,537.00C1566.33,453.67,1454.00,412.00,1306.00,412.00"]
-              KCanvasItem {line} at (182.99,-54.49) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M6106.00,-3500.00L6106.00,2000.00"]
-              KCanvasItem {path} at (6113.91,-27.04) size 25.31x44.18 [transform={m=((1.00,0.00)(0.00,1.00)) t=(6106.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M770.00,-196.00C770.00,-278.67,750.00,-340.67,710.00,-382.00C670.00,-423.33,609.33,-444.33,528.00,-445.00C471.33,-445.00,417.67,-434.33,367.00,-413.00C303.00,-385.00,271.00,-346.67,271.00,-298.00C271.00,-262.00,293.67,-244.00,339.00,-244.00C363.00,-244.00,390.00,-252.00,420.00,-268.00C450.00,-284.00,482.33,-292.33,517.00,-293.00C549.67,-292.33,574.00,-284.33,590.00,-269.00C606.00,-253.67,614.00,-231.00,614.00,-201.00C614.00,-169.00,601.67,-140.33,577.00,-115.00C552.33,-89.67,514.33,-67.33,463.00,-48.00C357.00,-24.00,272.00,26.67,208.00,104.00C139.33,186.00,105.00,286.00,105.00,404.00C105.00,539.33,150.00,679.00,240.00,823.00C340.00,983.00,452.67,1063.00,578.00,1063.00C643.33,1063.00,716.33,1047.67,797.00,1017.00C899.00,977.67,950.00,929.67,950.00,873.00C950.00,847.67,941.67,825.33,925.00,806.00C908.33,786.67,887.67,776.67,863.00,776.00C843.67,776.00,827.00,781.67,813.00,793.00C799.00,804.33,785.00,816.00,771.00,828.00C731.67,859.33,667.33,875.00,578.00,875.00C510.00,875.00,442.67,814.33,376.00,693.00C315.33,581.67,285.00,485.33,285.00,404.00C285.00,316.00,315.00,246.67,375.00,196.00C431.00,148.67,503.00,125.00,591.00,125.00C631.00,125.00,673.67,135.67,719.00,157.00L835.00,219.00C855.00,229.67,869.33,235.00,878.00,235.00C902.67,235.00,924.00,225.33,942.00,206.00C960.00,186.67,969.00,164.00,969.00,138.00C969.00,69.33,883.67,10.00,713.00,-40.00C732.33,-65.33,746.67,-91.00,756.00,-117.00C765.33,-143.00,770.00,-169.33,770.00,-196.00"]
-              KCanvasItem {line} at (213.81,-54.49) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M7158.00,-3500.00L7158.00,2000.00"]
+            KCanvasContainer {g} at (164.27,81.41) size 211.17x161.13 [transform={m=((0.03,0.00)(0.00,0.03)) t=(0.00,0.00)}]
+              KCanvasItem {line} at (164.27,81.41) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,-3500.00L0.00,2000.00"]
+              KCanvasItem {path} at (168.84,96.70) size 35.77x44.18 [fill={[type=SOLID] [color=#000000]}] [data="M1250.00,-30.00C1188.67,-30.00,1135.33,48.67,1090.00,206.00C1072.67,266.00,1051.00,371.00,1025.00,521.00C957.00,511.67,868.00,495.00,758.00,471.00L492.00,416.00C458.67,328.67,401.67,201.00,321.00,33.00C299.67,-4.33,270.67,-23.00,234.00,-23.00C207.33,-23.00,183.67,-13.33,163.00,6.00C142.33,25.33,131.67,49.33,131.00,78.00C131.00,110.00,181.33,231.67,282.00,443.00C270.67,460.33,265.00,480.33,265.00,503.00C265.00,557.00,297.67,591.67,363.00,607.00C439.00,749.67,535.00,913.67,651.00,1099.00C809.00,1351.67,907.33,1478.00,946.00,1478.00C998.67,1478.00,1034.67,1441.33,1054.00,1368.00L1117.00,1032.00L1266.00,337.00L1323.00,179.00C1342.33,125.00,1352.00,89.00,1352.00,71.00C1352.00,42.33,1341.67,18.33,1321.00,-1.00C1300.33,-20.33,1276.67,-30.00,1250.00,-30.00M897.00,1113.00L611.00,652.00C691.67,672.67,814.00,697.67,978.00,727.00L897.00,1113.00"]
+              KCanvasItem {line} at (208.15,81.41) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M1498.00,-3500.00L1498.00,2000.00"]
+              KCanvasItem {path} at (208.77,109.53) size 30.12x47.43 [transform={m=((1.00,0.00)(0.00,1.00)) t=(1498.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1011.00,892.00L665.00,144.00C579.67,-38.00,514.33,-190.33,469.00,-313.00L403.00,-507.00C385.67,-555.00,355.67,-579.00,313.00,-579.00C285.00,-579.00,261.00,-570.00,241.00,-552.00C221.00,-534.00,210.67,-511.00,210.00,-483.00C210.00,-416.33,282.00,-223.33,426.00,96.00L68.00,785.00L23.00,858.00C5.00,888.67,-4.00,914.33,-4.00,935.00C-4.00,962.33,6.33,986.33,27.00,1007.00C47.67,1027.67,71.33,1038.00,98.00,1038.00C128.67,1038.00,152.33,1026.33,169.00,1003.00C282.33,845.67,404.00,621.67,534.00,331.00L682.00,676.00C735.33,795.33,786.67,898.00,836.00,984.00C857.33,1021.33,885.33,1040.00,920.00,1040.00C947.33,1040.00,971.33,1030.33,992.00,1011.00C1012.67,991.67,1023.33,968.67,1024.00,942.00C1024.00,927.33,1019.67,910.67,1011.00,892.00"]
+              KCanvasItem {line} at (239.38,81.41) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M2564.00,-3500.00L2564.00,2000.00"]
+              KCanvasItem {path} at (243.52,85.62) size 41.95x56.16 [transform={m=((1.00,0.00)(0.00,1.00)) t=(2564.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M802.00,-61.00C614.00,-61.00,454.67,-4.67,324.00,108.00C185.33,228.00,116.00,382.67,116.00,572.00C116.00,802.67,184.33,1012.33,321.00,1201.00C473.67,1410.33,664.00,1515.00,892.00,1515.00C1111.33,1515.00,1274.33,1465.67,1381.00,1367.00C1492.33,1264.33,1548.00,1102.33,1548.00,881.00C1548.00,650.33,1485.33,442.33,1360.00,257.00C1216.00,45.00,1030.00,-61.00,802.00,-61.00M892.00,1310.00C728.67,1310.00,590.33,1228.67,477.00,1066.00C372.33,916.67,320.00,752.00,320.00,572.00C320.00,443.33,367.67,338.67,463.00,258.00C554.33,182.00,667.33,144.00,802.00,144.00C964.00,144.00,1097.67,225.67,1203.00,389.00C1297.00,535.00,1344.00,699.00,1344.00,881.00C1344.00,1040.33,1308.33,1152.33,1237.00,1217.00C1169.00,1279.00,1054.00,1310.00,892.00,1310.00M682.00,1848.00C769.33,1848.00,813.00,1813.00,813.00,1743.00C813.00,1723.00,798.33,1703.67,769.00,1685.00C742.33,1668.33,717.33,1660.00,694.00,1660.00C612.00,1660.00,571.00,1694.33,571.00,1763.00C571.00,1782.33,583.33,1801.33,608.00,1820.00C632.67,1838.67,657.33,1848.00,682.00,1848.00M1221.00,1856.00C1243.67,1856.00,1266.67,1845.67,1290.00,1825.00C1313.33,1804.33,1325.00,1783.67,1325.00,1763.00C1325.00,1701.67,1277.33,1671.00,1182.00,1671.00C1154.67,1671.00,1130.33,1678.00,1109.00,1692.00C1085.00,1708.00,1073.00,1729.00,1073.00,1755.00C1073.00,1801.00,1088.00,1830.67,1118.00,1844.00C1134.67,1852.00,1169.00,1856.00,1221.00,1856.00"]
+              KCanvasItem {line} at (287.29,81.41) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M4199.00,-3500.00L4199.00,2000.00"]
+              KCanvasItem {path} at (291.24,92.25) size 48.13x51.86 [transform={m=((1.00,0.00)(0.00,1.00)) t=(4199.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1306.00,412.00C1235.33,412.00,1174.33,422.33,1123.00,443.00C1071.67,463.67,1030.33,494.33,999.00,535.00C963.00,499.67,928.00,473.00,894.00,455.00C860.00,437.00,826.33,428.00,793.00,428.00C719.00,428.00,649.33,458.00,584.00,518.00C518.67,578.00,485.67,644.33,485.00,717.00C485.00,840.33,533.33,953.00,630.00,1055.00C726.67,1157.00,837.00,1208.00,961.00,1208.00C989.00,1208.00,1012.33,1197.67,1031.00,1177.00C1049.67,1156.33,1059.00,1131.33,1059.00,1102.00C1059.00,1062.00,1025.67,1032.33,959.00,1013.00C870.33,987.67,807.67,958.67,771.00,926.00C717.00,878.67,690.00,809.00,690.00,717.00C690.00,697.67,699.00,679.00,717.00,661.00C737.67,641.00,763.33,631.67,794.00,633.00C852.00,635.67,905.67,689.67,955.00,795.00C999.67,887.00,1039.33,933.00,1074.00,933.00C1102.00,933.00,1124.67,922.67,1142.00,902.00C1159.33,881.33,1168.00,856.00,1168.00,826.00C1168.00,812.67,1166.00,792.67,1162.00,766.00C1158.00,739.33,1155.67,719.33,1155.00,706.00C1155.00,662.67,1173.67,635.33,1211.00,624.00C1225.67,619.33,1257.33,617.00,1306.00,617.00C1397.33,617.00,1461.33,639.33,1498.00,684.00C1531.33,724.00,1548.00,790.33,1548.00,883.00C1548.00,1046.33,1482.33,1179.67,1351.00,1283.00C1231.00,1377.67,1087.67,1425.00,921.00,1425.00C727.00,1425.00,575.00,1351.67,465.00,1205.00C365.67,1074.33,316.00,910.00,316.00,712.00C316.00,529.33,374.33,375.33,491.00,250.00C612.33,119.33,768.33,54.00,959.00,54.00C1013.00,54.00,1074.00,64.33,1142.00,85.00L1317.00,150.00C1346.33,160.67,1365.33,166.00,1374.00,166.00C1401.33,166.00,1425.00,155.33,1445.00,134.00C1465.00,112.67,1475.00,87.33,1475.00,58.00C1475.00,-5.33,1404.00,-56.67,1262.00,-96.00C1154.67,-125.33,1054.33,-140.00,961.00,-140.00C867.00,-140.00,771.00,-122.00,673.00,-86.00C575.00,-50.00,490.67,-1.33,420.00,60.00C213.33,238.67,110.00,456.00,110.00,712.00C110.00,968.00,180.67,1182.00,322.00,1354.00C472.00,1538.00,671.67,1630.00,921.00,1630.00C1146.33,1630.00,1339.33,1562.33,1500.00,1427.00C1668.67,1283.67,1753.00,1102.33,1753.00,883.00C1753.00,733.00,1716.33,617.67,1643.00,537.00C1566.33,453.67,1454.00,412.00,1306.00,412.00"]
+              KCanvasItem {line} at (343.15,81.41) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M6106.00,-3500.00L6106.00,2000.00"]
+              KCanvasItem {path} at (346.96,108.86) size 25.31x44.18 [transform={m=((1.00,0.00)(0.00,1.00)) t=(6106.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M770.00,-196.00C770.00,-278.67,750.00,-340.67,710.00,-382.00C670.00,-423.33,609.33,-444.33,528.00,-445.00C471.33,-445.00,417.67,-434.33,367.00,-413.00C303.00,-385.00,271.00,-346.67,271.00,-298.00C271.00,-262.00,293.67,-244.00,339.00,-244.00C363.00,-244.00,390.00,-252.00,420.00,-268.00C450.00,-284.00,482.33,-292.33,517.00,-293.00C549.67,-292.33,574.00,-284.33,590.00,-269.00C606.00,-253.67,614.00,-231.00,614.00,-201.00C614.00,-169.00,601.67,-140.33,577.00,-115.00C552.33,-89.67,514.33,-67.33,463.00,-48.00C357.00,-24.00,272.00,26.67,208.00,104.00C139.33,186.00,105.00,286.00,105.00,404.00C105.00,539.33,150.00,679.00,240.00,823.00C340.00,983.00,452.67,1063.00,578.00,1063.00C643.33,1063.00,716.33,1047.67,797.00,1017.00C899.00,977.67,950.00,929.67,950.00,873.00C950.00,847.67,941.67,825.33,925.00,806.00C908.33,786.67,887.67,776.67,863.00,776.00C843.67,776.00,827.00,781.67,813.00,793.00C799.00,804.33,785.00,816.00,771.00,828.00C731.67,859.33,667.33,875.00,578.00,875.00C510.00,875.00,442.67,814.33,376.00,693.00C315.33,581.67,285.00,485.33,285.00,404.00C285.00,316.00,315.00,246.67,375.00,196.00C431.00,148.67,503.00,125.00,591.00,125.00C631.00,125.00,673.67,135.67,719.00,157.00L835.00,219.00C855.00,229.67,869.33,235.00,878.00,235.00C902.67,235.00,924.00,225.33,942.00,206.00C960.00,186.67,969.00,164.00,969.00,138.00C969.00,69.33,883.67,10.00,713.00,-40.00C732.33,-65.33,746.67,-91.00,756.00,-117.00C765.33,-143.00,770.00,-169.33,770.00,-196.00"]
+              KCanvasItem {line} at (373.97,81.41) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M7158.00,-3500.00L7158.00,2000.00"]
         RenderSVGText {text} at (0,0) size 465x22
           RenderText {TEXT} at (0,0) size 74x22
             text run at (0,0) width 74: "SVG Font"

diff --git a/LayoutTests/svg/W3C-SVG-1.1/fonts-elem-02-t-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/fonts-elem-02-t-expected.txt
index 6e39224abf6636f7e34abed965e3b01818055201..0c55381cc4c75461dbb651b2c737ed6f44d7d74d 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/fonts-elem-02-t-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/fonts-elem-02-t-expected.txt
@@ -10,12 +10,12 @@ layer at (0,0) size 480x360
           RenderText {TEXT} at (0,0) size 130x22
             text run at (0,0) width 130: "SVG over Glyphs"
         KCanvasContainer {g} at (168.84,85.62) size 203.44x71.34 [transform={m=((1.00,0.00)(-0.00,-1.00)) t=(165.00,140.00)}]
-          KCanvasContainer {g} at (8.67,-50.27) size 203.44x71.34 [transform={m=((0.03,0.00)(0.00,0.03)) t=(0.00,0.00)}]
-            KCanvasItem {path} at (8.67,-39.20) size 35.77x44.18 [fill={[type=SOLID] [color=#FFFFFF]}] [data="M1250.00,-30.00C1188.67,-30.00,1135.33,48.67,1090.00,206.00C1072.67,266.00,1051.00,371.00,1025.00,521.00C957.00,511.67,868.00,495.00,758.00,471.00L492.00,416.00C458.67,328.67,401.67,201.00,321.00,33.00C299.67,-4.33,270.67,-23.00,234.00,-23.00C207.33,-23.00,183.67,-13.33,163.00,6.00C142.33,25.33,131.67,49.33,131.00,78.00C131.00,110.00,181.33,231.67,282.00,443.00C270.67,460.33,265.00,480.33,265.00,503.00C265.00,557.00,297.67,591.67,363.00,607.00C439.00,749.67,535.00,913.67,651.00,1099.00C809.00,1351.67,907.33,1478.00,946.00,1478.00C998.67,1478.00,1034.67,1441.33,1054.00,1368.00L1117.00,1032.00L1266.00,337.00L1323.00,179.00C1342.33,125.00,1352.00,89.00,1352.00,71.00C1352.00,42.33,1341.67,18.33,1321.00,-1.00C1300.33,-20.33,1276.67,-30.00,1250.00,-30.00M897.00,1113.00L611.00,652.00C691.67,672.67,814.00,697.67,978.00,727.00L897.00,1113.00"]
-            KCanvasItem {path} at (1502.72,-26.37) size 30.12x47.43 [transform={m=((1.00,0.00)(0.00,1.00)) t=(1498.00,0.00)}] [fill={[type=SOLID] [color=#FFFFFF]}] [data="M1011.00,892.00L665.00,144.00C579.67,-38.00,514.33,-190.33,469.00,-313.00L403.00,-507.00C385.67,-555.00,355.67,-579.00,313.00,-579.00C285.00,-579.00,261.00,-570.00,241.00,-552.00C221.00,-534.00,210.67,-511.00,210.00,-483.00C210.00,-416.33,282.00,-223.33,426.00,96.00L68.00,785.00L23.00,858.00C5.00,888.67,-4.00,914.33,-4.00,935.00C-4.00,962.33,6.33,986.33,27.00,1007.00C47.67,1027.67,71.33,1038.00,98.00,1038.00C128.67,1038.00,152.33,1026.33,169.00,1003.00C282.33,845.67,404.00,621.67,534.00,331.00L682.00,676.00C735.33,795.33,786.67,898.00,836.00,984.00C857.33,1021.33,885.33,1040.00,920.00,1040.00C947.33,1040.00,971.33,1030.33,992.00,1011.00C1012.67,991.67,1023.33,968.67,1024.00,942.00C1024.00,927.33,1019.67,910.67,1011.00,892.00"]
-            KCanvasItem {path} at (2572.23,-50.27) size 41.95x56.16 [transform={m=((1.00,0.00)(0.00,1.00)) t=(2564.00,0.00)}] [fill={[type=SOLID] [color=#FFFFFF]}] [data="M802.00,-61.00C614.00,-61.00,454.67,-4.67,324.00,108.00C185.33,228.00,116.00,382.67,116.00,572.00C116.00,802.67,184.33,1012.33,321.00,1201.00C473.67,1410.33,664.00,1515.00,892.00,1515.00C1111.33,1515.00,1274.33,1465.67,1381.00,1367.00C1492.33,1264.33,1548.00,1102.33,1548.00,881.00C1548.00,650.33,1485.33,442.33,1360.00,257.00C1216.00,45.00,1030.00,-61.00,802.00,-61.00M892.00,1310.00C728.67,1310.00,590.33,1228.67,477.00,1066.00C372.33,916.67,320.00,752.00,320.00,572.00C320.00,443.33,367.67,338.67,463.00,258.00C554.33,182.00,667.33,144.00,802.00,144.00C964.00,144.00,1097.67,225.67,1203.00,389.00C1297.00,535.00,1344.00,699.00,1344.00,881.00C1344.00,1040.33,1308.33,1152.33,1237.00,1217.00C1169.00,1279.00,1054.00,1310.00,892.00,1310.00M682.00,1848.00C769.33,1848.00,813.00,1813.00,813.00,1743.00C813.00,1723.00,798.33,1703.67,769.00,1685.00C742.33,1668.33,717.33,1660.00,694.00,1660.00C612.00,1660.00,571.00,1694.33,571.00,1763.00C571.00,1782.33,583.33,1801.33,608.00,1820.00C632.67,1838.67,657.33,1848.00,682.00,1848.00M1221.00,1856.00C1243.67,1856.00,1266.67,1845.67,1290.00,1825.00C1313.33,1804.33,1325.00,1783.67,1325.00,1763.00C1325.00,1701.67,1277.33,1671.00,1182.00,1671.00C1154.67,1671.00,1130.33,1678.00,1109.00,1692.00C1085.00,1708.00,1073.00,1729.00,1073.00,1755.00C1073.00,1801.00,1088.00,1830.67,1118.00,1844.00C1134.67,1852.00,1169.00,1856.00,1221.00,1856.00"]
-            KCanvasItem {path} at (4207.06,-43.65) size 48.13x51.86 [transform={m=((1.00,0.00)(0.00,1.00)) t=(4199.00,0.00)}] [fill={[type=SOLID] [color=#FFFFFF]}] [data="M1306.00,412.00C1235.33,412.00,1174.33,422.33,1123.00,443.00C1071.67,463.67,1030.33,494.33,999.00,535.00C963.00,499.67,928.00,473.00,894.00,455.00C860.00,437.00,826.33,428.00,793.00,428.00C719.00,428.00,649.33,458.00,584.00,518.00C518.67,578.00,485.67,644.33,485.00,717.00C485.00,840.33,533.33,953.00,630.00,1055.00C726.67,1157.00,837.00,1208.00,961.00,1208.00C989.00,1208.00,1012.33,1197.67,1031.00,1177.00C1049.67,1156.33,1059.00,1131.33,1059.00,1102.00C1059.00,1062.00,1025.67,1032.33,959.00,1013.00C870.33,987.67,807.67,958.67,771.00,926.00C717.00,878.67,690.00,809.00,690.00,717.00C690.00,697.67,699.00,679.00,717.00,661.00C737.67,641.00,763.33,631.67,794.00,633.00C852.00,635.67,905.67,689.67,955.00,795.00C999.67,887.00,1039.33,933.00,1074.00,933.00C1102.00,933.00,1124.67,922.67,1142.00,902.00C1159.33,881.33,1168.00,856.00,1168.00,826.00C1168.00,812.67,1166.00,792.67,1162.00,766.00C1158.00,739.33,1155.67,719.33,1155.00,706.00C1155.00,662.67,1173.67,635.33,1211.00,624.00C1225.67,619.33,1257.33,617.00,1306.00,617.00C1397.33,617.00,1461.33,639.33,1498.00,684.00C1531.33,724.00,1548.00,790.33,1548.00,883.00C1548.00,1046.33,1482.33,1179.67,1351.00,1283.00C1231.00,1377.67,1087.67,1425.00,921.00,1425.00C727.00,1425.00,575.00,1351.67,465.00,1205.00C365.67,1074.33,316.00,910.00,316.00,712.00C316.00,529.33,374.33,375.33,491.00,250.00C612.33,119.33,768.33,54.00,959.00,54.00C1013.00,54.00,1074.00,64.33,1142.00,85.00L1317.00,150.00C1346.33,160.67,1365.33,166.00,1374.00,166.00C1401.33,166.00,1425.00,155.33,1445.00,134.00C1465.00,112.67,1475.00,87.33,1475.00,58.00C1475.00,-5.33,1404.00,-56.67,1262.00,-96.00C1154.67,-125.33,1054.33,-140.00,961.00,-140.00C867.00,-140.00,771.00,-122.00,673.00,-86.00C575.00,-50.00,490.67,-1.33,420.00,60.00C213.33,238.67,110.00,456.00,110.00,712.00C110.00,968.00,180.67,1182.00,322.00,1354.00C472.00,1538.00,671.67,1630.00,921.00,1630.00C1146.33,1630.00,1339.33,1562.33,1500.00,1427.00C1668.67,1283.67,1753.00,1102.33,1753.00,883.00C1753.00,733.00,1716.33,617.67,1643.00,537.00C1566.33,453.67,1454.00,412.00,1306.00,412.00"]
-            KCanvasItem {path} at (6113.91,-27.04) size 25.31x44.18 [transform={m=((1.00,0.00)(0.00,1.00)) t=(6106.00,0.00)}] [fill={[type=SOLID] [color=#FFFFFF]}] [data="M770.00,-196.00C770.00,-278.67,750.00,-340.67,710.00,-382.00C670.00,-423.33,609.33,-444.33,528.00,-445.00C471.33,-445.00,417.67,-434.33,367.00,-413.00C303.00,-385.00,271.00,-346.67,271.00,-298.00C271.00,-262.00,293.67,-244.00,339.00,-244.00C363.00,-244.00,390.00,-252.00,420.00,-268.00C450.00,-284.00,482.33,-292.33,517.00,-293.00C549.67,-292.33,574.00,-284.33,590.00,-269.00C606.00,-253.67,614.00,-231.00,614.00,-201.00C614.00,-169.00,601.67,-140.33,577.00,-115.00C552.33,-89.67,514.33,-67.33,463.00,-48.00C357.00,-24.00,272.00,26.67,208.00,104.00C139.33,186.00,105.00,286.00,105.00,404.00C105.00,539.33,150.00,679.00,240.00,823.00C340.00,983.00,452.67,1063.00,578.00,1063.00C643.33,1063.00,716.33,1047.67,797.00,1017.00C899.00,977.67,950.00,929.67,950.00,873.00C950.00,847.67,941.67,825.33,925.00,806.00C908.33,786.67,887.67,776.67,863.00,776.00C843.67,776.00,827.00,781.67,813.00,793.00C799.00,804.33,785.00,816.00,771.00,828.00C731.67,859.33,667.33,875.00,578.00,875.00C510.00,875.00,442.67,814.33,376.00,693.00C315.33,581.67,285.00,485.33,285.00,404.00C285.00,316.00,315.00,246.67,375.00,196.00C431.00,148.67,503.00,125.00,591.00,125.00C631.00,125.00,673.67,135.67,719.00,157.00L835.00,219.00C855.00,229.67,869.33,235.00,878.00,235.00C902.67,235.00,924.00,225.33,942.00,206.00C960.00,186.67,969.00,164.00,969.00,138.00C969.00,69.33,883.67,10.00,713.00,-40.00C732.33,-65.33,746.67,-91.00,756.00,-117.00C765.33,-143.00,770.00,-169.33,770.00,-196.00"]
+          KCanvasContainer {g} at (168.84,85.62) size 203.44x71.34 [transform={m=((0.03,0.00)(0.00,0.03)) t=(0.00,0.00)}]
+            KCanvasItem {path} at (168.84,96.70) size 35.77x44.18 [fill={[type=SOLID] [color=#FFFFFF]}] [data="M1250.00,-30.00C1188.67,-30.00,1135.33,48.67,1090.00,206.00C1072.67,266.00,1051.00,371.00,1025.00,521.00C957.00,511.67,868.00,495.00,758.00,471.00L492.00,416.00C458.67,328.67,401.67,201.00,321.00,33.00C299.67,-4.33,270.67,-23.00,234.00,-23.00C207.33,-23.00,183.67,-13.33,163.00,6.00C142.33,25.33,131.67,49.33,131.00,78.00C131.00,110.00,181.33,231.67,282.00,443.00C270.67,460.33,265.00,480.33,265.00,503.00C265.00,557.00,297.67,591.67,363.00,607.00C439.00,749.67,535.00,913.67,651.00,1099.00C809.00,1351.67,907.33,1478.00,946.00,1478.00C998.67,1478.00,1034.67,1441.33,1054.00,1368.00L1117.00,1032.00L1266.00,337.00L1323.00,179.00C1342.33,125.00,1352.00,89.00,1352.00,71.00C1352.00,42.33,1341.67,18.33,1321.00,-1.00C1300.33,-20.33,1276.67,-30.00,1250.00,-30.00M897.00,1113.00L611.00,652.00C691.67,672.67,814.00,697.67,978.00,727.00L897.00,1113.00"]
+            KCanvasItem {path} at (208.77,109.53) size 30.12x47.43 [transform={m=((1.00,0.00)(0.00,1.00)) t=(1498.00,0.00)}] [fill={[type=SOLID] [color=#FFFFFF]}] [data="M1011.00,892.00L665.00,144.00C579.67,-38.00,514.33,-190.33,469.00,-313.00L403.00,-507.00C385.67,-555.00,355.67,-579.00,313.00,-579.00C285.00,-579.00,261.00,-570.00,241.00,-552.00C221.00,-534.00,210.67,-511.00,210.00,-483.00C210.00,-416.33,282.00,-223.33,426.00,96.00L68.00,785.00L23.00,858.00C5.00,888.67,-4.00,914.33,-4.00,935.00C-4.00,962.33,6.33,986.33,27.00,1007.00C47.67,1027.67,71.33,1038.00,98.00,1038.00C128.67,1038.00,152.33,1026.33,169.00,1003.00C282.33,845.67,404.00,621.67,534.00,331.00L682.00,676.00C735.33,795.33,786.67,898.00,836.00,984.00C857.33,1021.33,885.33,1040.00,920.00,1040.00C947.33,1040.00,971.33,1030.33,992.00,1011.00C1012.67,991.67,1023.33,968.67,1024.00,942.00C1024.00,927.33,1019.67,910.67,1011.00,892.00"]
+            KCanvasItem {path} at (243.52,85.62) size 41.95x56.16 [transform={m=((1.00,0.00)(0.00,1.00)) t=(2564.00,0.00)}] [fill={[type=SOLID] [color=#FFFFFF]}] [data="M802.00,-61.00C614.00,-61.00,454.67,-4.67,324.00,108.00C185.33,228.00,116.00,382.67,116.00,572.00C116.00,802.67,184.33,1012.33,321.00,1201.00C473.67,1410.33,664.00,1515.00,892.00,1515.00C1111.33,1515.00,1274.33,1465.67,1381.00,1367.00C1492.33,1264.33,1548.00,1102.33,1548.00,881.00C1548.00,650.33,1485.33,442.33,1360.00,257.00C1216.00,45.00,1030.00,-61.00,802.00,-61.00M892.00,1310.00C728.67,1310.00,590.33,1228.67,477.00,1066.00C372.33,916.67,320.00,752.00,320.00,572.00C320.00,443.33,367.67,338.67,463.00,258.00C554.33,182.00,667.33,144.00,802.00,144.00C964.00,144.00,1097.67,225.67,1203.00,389.00C1297.00,535.00,1344.00,699.00,1344.00,881.00C1344.00,1040.33,1308.33,1152.33,1237.00,1217.00C1169.00,1279.00,1054.00,1310.00,892.00,1310.00M682.00,1848.00C769.33,1848.00,813.00,1813.00,813.00,1743.00C813.00,1723.00,798.33,1703.67,769.00,1685.00C742.33,1668.33,717.33,1660.00,694.00,1660.00C612.00,1660.00,571.00,1694.33,571.00,1763.00C571.00,1782.33,583.33,1801.33,608.00,1820.00C632.67,1838.67,657.33,1848.00,682.00,1848.00M1221.00,1856.00C1243.67,1856.00,1266.67,1845.67,1290.00,1825.00C1313.33,1804.33,1325.00,1783.67,1325.00,1763.00C1325.00,1701.67,1277.33,1671.00,1182.00,1671.00C1154.67,1671.00,1130.33,1678.00,1109.00,1692.00C1085.00,1708.00,1073.00,1729.00,1073.00,1755.00C1073.00,1801.00,1088.00,1830.67,1118.00,1844.00C1134.67,1852.00,1169.00,1856.00,1221.00,1856.00"]
+            KCanvasItem {path} at (291.24,92.25) size 48.13x51.86 [transform={m=((1.00,0.00)(0.00,1.00)) t=(4199.00,0.00)}] [fill={[type=SOLID] [color=#FFFFFF]}] [data="M1306.00,412.00C1235.33,412.00,1174.33,422.33,1123.00,443.00C1071.67,463.67,1030.33,494.33,999.00,535.00C963.00,499.67,928.00,473.00,894.00,455.00C860.00,437.00,826.33,428.00,793.00,428.00C719.00,428.00,649.33,458.00,584.00,518.00C518.67,578.00,485.67,644.33,485.00,717.00C485.00,840.33,533.33,953.00,630.00,1055.00C726.67,1157.00,837.00,1208.00,961.00,1208.00C989.00,1208.00,1012.33,1197.67,1031.00,1177.00C1049.67,1156.33,1059.00,1131.33,1059.00,1102.00C1059.00,1062.00,1025.67,1032.33,959.00,1013.00C870.33,987.67,807.67,958.67,771.00,926.00C717.00,878.67,690.00,809.00,690.00,717.00C690.00,697.67,699.00,679.00,717.00,661.00C737.67,641.00,763.33,631.67,794.00,633.00C852.00,635.67,905.67,689.67,955.00,795.00C999.67,887.00,1039.33,933.00,1074.00,933.00C1102.00,933.00,1124.67,922.67,1142.00,902.00C1159.33,881.33,1168.00,856.00,1168.00,826.00C1168.00,812.67,1166.00,792.67,1162.00,766.00C1158.00,739.33,1155.67,719.33,1155.00,706.00C1155.00,662.67,1173.67,635.33,1211.00,624.00C1225.67,619.33,1257.33,617.00,1306.00,617.00C1397.33,617.00,1461.33,639.33,1498.00,684.00C1531.33,724.00,1548.00,790.33,1548.00,883.00C1548.00,1046.33,1482.33,1179.67,1351.00,1283.00C1231.00,1377.67,1087.67,1425.00,921.00,1425.00C727.00,1425.00,575.00,1351.67,465.00,1205.00C365.67,1074.33,316.00,910.00,316.00,712.00C316.00,529.33,374.33,375.33,491.00,250.00C612.33,119.33,768.33,54.00,959.00,54.00C1013.00,54.00,1074.00,64.33,1142.00,85.00L1317.00,150.00C1346.33,160.67,1365.33,166.00,1374.00,166.00C1401.33,166.00,1425.00,155.33,1445.00,134.00C1465.00,112.67,1475.00,87.33,1475.00,58.00C1475.00,-5.33,1404.00,-56.67,1262.00,-96.00C1154.67,-125.33,1054.33,-140.00,961.00,-140.00C867.00,-140.00,771.00,-122.00,673.00,-86.00C575.00,-50.00,490.67,-1.33,420.00,60.00C213.33,238.67,110.00,456.00,110.00,712.00C110.00,968.00,180.67,1182.00,322.00,1354.00C472.00,1538.00,671.67,1630.00,921.00,1630.00C1146.33,1630.00,1339.33,1562.33,1500.00,1427.00C1668.67,1283.67,1753.00,1102.33,1753.00,883.00C1753.00,733.00,1716.33,617.67,1643.00,537.00C1566.33,453.67,1454.00,412.00,1306.00,412.00"]
+            KCanvasItem {path} at (346.96,108.86) size 25.31x44.18 [transform={m=((1.00,0.00)(0.00,1.00)) t=(6106.00,0.00)}] [fill={[type=SOLID] [color=#FFFFFF]}] [data="M770.00,-196.00C770.00,-278.67,750.00,-340.67,710.00,-382.00C670.00,-423.33,609.33,-444.33,528.00,-445.00C471.33,-445.00,417.67,-434.33,367.00,-413.00C303.00,-385.00,271.00,-346.67,271.00,-298.00C271.00,-262.00,293.67,-244.00,339.00,-244.00C363.00,-244.00,390.00,-252.00,420.00,-268.00C450.00,-284.00,482.33,-292.33,517.00,-293.00C549.67,-292.33,574.00,-284.33,590.00,-269.00C606.00,-253.67,614.00,-231.00,614.00,-201.00C614.00,-169.00,601.67,-140.33,577.00,-115.00C552.33,-89.67,514.33,-67.33,463.00,-48.00C357.00,-24.00,272.00,26.67,208.00,104.00C139.33,186.00,105.00,286.00,105.00,404.00C105.00,539.33,150.00,679.00,240.00,823.00C340.00,983.00,452.67,1063.00,578.00,1063.00C643.33,1063.00,716.33,1047.67,797.00,1017.00C899.00,977.67,950.00,929.67,950.00,873.00C950.00,847.67,941.67,825.33,925.00,806.00C908.33,786.67,887.67,776.67,863.00,776.00C843.67,776.00,827.00,781.67,813.00,793.00C799.00,804.33,785.00,816.00,771.00,828.00C731.67,859.33,667.33,875.00,578.00,875.00C510.00,875.00,442.67,814.33,376.00,693.00C315.33,581.67,285.00,485.33,285.00,404.00C285.00,316.00,315.00,246.67,375.00,196.00C431.00,148.67,503.00,125.00,591.00,125.00C631.00,125.00,673.67,135.67,719.00,157.00L835.00,219.00C855.00,229.67,869.33,235.00,878.00,235.00C902.67,235.00,924.00,225.33,942.00,206.00C960.00,186.67,969.00,164.00,969.00,138.00C969.00,69.33,883.67,10.00,713.00,-40.00C732.33,-65.33,746.67,-91.00,756.00,-117.00C765.33,-143.00,770.00,-169.33,770.00,-196.00"]
         KCanvasContainer {g} at (165,140) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(165.00,140.00)}]
           RenderSVGText {text} at (0,0) size 465x69
             RenderText {TEXT} at (0,0) size 208x69
@@ -28,12 +28,12 @@ layer at (0,0) size 480x360
             RenderText {TEXT} at (0,0) size 208x69
               text run at (0,0) width 208: "Ay\x{D6}@\x{E7}"
         KCanvasContainer {g} at (168.84,155.62) size 203.44x71.34 [transform={m=((1.00,0.00)(-0.00,-1.00)) t=(165.00,210.00)}]
-          KCanvasContainer {g} at (8.67,-48.22) size 203.44x71.34 [transform={m=((0.03,0.00)(0.00,0.03)) t=(0.00,0.00)}]
-            KCanvasItem {path} at (8.67,-37.15) size 35.77x44.18 [fill={[type=SOLID] [color=#000000]}] [data="M1250.00,-30.00C1188.67,-30.00,1135.33,48.67,1090.00,206.00C1072.67,266.00,1051.00,371.00,1025.00,521.00C957.00,511.67,868.00,495.00,758.00,471.00L492.00,416.00C458.67,328.67,401.67,201.00,321.00,33.00C299.67,-4.33,270.67,-23.00,234.00,-23.00C207.33,-23.00,183.67,-13.33,163.00,6.00C142.33,25.33,131.67,49.33,131.00,78.00C131.00,110.00,181.33,231.67,282.00,443.00C270.67,460.33,265.00,480.33,265.00,503.00C265.00,557.00,297.67,591.67,363.00,607.00C439.00,749.67,535.00,913.67,651.00,1099.00C809.00,1351.67,907.33,1478.00,946.00,1478.00C998.67,1478.00,1034.67,1441.33,1054.00,1368.00L1117.00,1032.00L1266.00,337.00L1323.00,179.00C1342.33,125.00,1352.00,89.00,1352.00,71.00C1352.00,42.33,1341.67,18.33,1321.00,-1.00C1300.33,-20.33,1276.67,-30.00,1250.00,-30.00M897.00,1113.00L611.00,652.00C691.67,672.67,814.00,697.67,978.00,727.00L897.00,1113.00"]
-            KCanvasItem {path} at (1502.72,-24.32) size 30.12x47.43 [transform={m=((1.00,0.00)(0.00,1.00)) t=(1498.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1011.00,892.00L665.00,144.00C579.67,-38.00,514.33,-190.33,469.00,-313.00L403.00,-507.00C385.67,-555.00,355.67,-579.00,313.00,-579.00C285.00,-579.00,261.00,-570.00,241.00,-552.00C221.00,-534.00,210.67,-511.00,210.00,-483.00C210.00,-416.33,282.00,-223.33,426.00,96.00L68.00,785.00L23.00,858.00C5.00,888.67,-4.00,914.33,-4.00,935.00C-4.00,962.33,6.33,986.33,27.00,1007.00C47.67,1027.67,71.33,1038.00,98.00,1038.00C128.67,1038.00,152.33,1026.33,169.00,1003.00C282.33,845.67,404.00,621.67,534.00,331.00L682.00,676.00C735.33,795.33,786.67,898.00,836.00,984.00C857.33,1021.33,885.33,1040.00,920.00,1040.00C947.33,1040.00,971.33,1030.33,992.00,1011.00C1012.67,991.67,1023.33,968.67,1024.00,942.00C1024.00,927.33,1019.67,910.67,1011.00,892.00"]
-            KCanvasItem {path} at (2572.23,-48.22) size 41.95x56.16 [transform={m=((1.00,0.00)(0.00,1.00)) t=(2564.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M802.00,-61.00C614.00,-61.00,454.67,-4.67,324.00,108.00C185.33,228.00,116.00,382.67,116.00,572.00C116.00,802.67,184.33,1012.33,321.00,1201.00C473.67,1410.33,664.00,1515.00,892.00,1515.00C1111.33,1515.00,1274.33,1465.67,1381.00,1367.00C1492.33,1264.33,1548.00,1102.33,1548.00,881.00C1548.00,650.33,1485.33,442.33,1360.00,257.00C1216.00,45.00,1030.00,-61.00,802.00,-61.00M892.00,1310.00C728.67,1310.00,590.33,1228.67,477.00,1066.00C372.33,916.67,320.00,752.00,320.00,572.00C320.00,443.33,367.67,338.67,463.00,258.00C554.33,182.00,667.33,144.00,802.00,144.00C964.00,144.00,1097.67,225.67,1203.00,389.00C1297.00,535.00,1344.00,699.00,1344.00,881.00C1344.00,1040.33,1308.33,1152.33,1237.00,1217.00C1169.00,1279.00,1054.00,1310.00,892.00,1310.00M682.00,1848.00C769.33,1848.00,813.00,1813.00,813.00,1743.00C813.00,1723.00,798.33,1703.67,769.00,1685.00C742.33,1668.33,717.33,1660.00,694.00,1660.00C612.00,1660.00,571.00,1694.33,571.00,1763.00C571.00,1782.33,583.33,1801.33,608.00,1820.00C632.67,1838.67,657.33,1848.00,682.00,1848.00M1221.00,1856.00C1243.67,1856.00,1266.67,1845.67,1290.00,1825.00C1313.33,1804.33,1325.00,1783.67,1325.00,1763.00C1325.00,1701.67,1277.33,1671.00,1182.00,1671.00C1154.67,1671.00,1130.33,1678.00,1109.00,1692.00C1085.00,1708.00,1073.00,1729.00,1073.00,1755.00C1073.00,1801.00,1088.00,1830.67,1118.00,1844.00C1134.67,1852.00,1169.00,1856.00,1221.00,1856.00"]
-            KCanvasItem {path} at (4207.06,-41.60) size 48.13x51.86 [transform={m=((1.00,0.00)(0.00,1.00)) t=(4199.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1306.00,412.00C1235.33,412.00,1174.33,422.33,1123.00,443.00C1071.67,463.67,1030.33,494.33,999.00,535.00C963.00,499.67,928.00,473.00,894.00,455.00C860.00,437.00,826.33,428.00,793.00,428.00C719.00,428.00,649.33,458.00,584.00,518.00C518.67,578.00,485.67,644.33,485.00,717.00C485.00,840.33,533.33,953.00,630.00,1055.00C726.67,1157.00,837.00,1208.00,961.00,1208.00C989.00,1208.00,1012.33,1197.67,1031.00,1177.00C1049.67,1156.33,1059.00,1131.33,1059.00,1102.00C1059.00,1062.00,1025.67,1032.33,959.00,1013.00C870.33,987.67,807.67,958.67,771.00,926.00C717.00,878.67,690.00,809.00,690.00,717.00C690.00,697.67,699.00,679.00,717.00,661.00C737.67,641.00,763.33,631.67,794.00,633.00C852.00,635.67,905.67,689.67,955.00,795.00C999.67,887.00,1039.33,933.00,1074.00,933.00C1102.00,933.00,1124.67,922.67,1142.00,902.00C1159.33,881.33,1168.00,856.00,1168.00,826.00C1168.00,812.67,1166.00,792.67,1162.00,766.00C1158.00,739.33,1155.67,719.33,1155.00,706.00C1155.00,662.67,1173.67,635.33,1211.00,624.00C1225.67,619.33,1257.33,617.00,1306.00,617.00C1397.33,617.00,1461.33,639.33,1498.00,684.00C1531.33,724.00,1548.00,790.33,1548.00,883.00C1548.00,1046.33,1482.33,1179.67,1351.00,1283.00C1231.00,1377.67,1087.67,1425.00,921.00,1425.00C727.00,1425.00,575.00,1351.67,465.00,1205.00C365.67,1074.33,316.00,910.00,316.00,712.00C316.00,529.33,374.33,375.33,491.00,250.00C612.33,119.33,768.33,54.00,959.00,54.00C1013.00,54.00,1074.00,64.33,1142.00,85.00L1317.00,150.00C1346.33,160.67,1365.33,166.00,1374.00,166.00C1401.33,166.00,1425.00,155.33,1445.00,134.00C1465.00,112.67,1475.00,87.33,1475.00,58.00C1475.00,-5.33,1404.00,-56.67,1262.00,-96.00C1154.67,-125.33,1054.33,-140.00,961.00,-140.00C867.00,-140.00,771.00,-122.00,673.00,-86.00C575.00,-50.00,490.67,-1.33,420.00,60.00C213.33,238.67,110.00,456.00,110.00,712.00C110.00,968.00,180.67,1182.00,322.00,1354.00C472.00,1538.00,671.67,1630.00,921.00,1630.00C1146.33,1630.00,1339.33,1562.33,1500.00,1427.00C1668.67,1283.67,1753.00,1102.33,1753.00,883.00C1753.00,733.00,1716.33,617.67,1643.00,537.00C1566.33,453.67,1454.00,412.00,1306.00,412.00"]
-            KCanvasItem {path} at (6113.91,-24.99) size 25.31x44.18 [transform={m=((1.00,0.00)(0.00,1.00)) t=(6106.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M770.00,-196.00C770.00,-278.67,750.00,-340.67,710.00,-382.00C670.00,-423.33,609.33,-444.33,528.00,-445.00C471.33,-445.00,417.67,-434.33,367.00,-413.00C303.00,-385.00,271.00,-346.67,271.00,-298.00C271.00,-262.00,293.67,-244.00,339.00,-244.00C363.00,-244.00,390.00,-252.00,420.00,-268.00C450.00,-284.00,482.33,-292.33,517.00,-293.00C549.67,-292.33,574.00,-284.33,590.00,-269.00C606.00,-253.67,614.00,-231.00,614.00,-201.00C614.00,-169.00,601.67,-140.33,577.00,-115.00C552.33,-89.67,514.33,-67.33,463.00,-48.00C357.00,-24.00,272.00,26.67,208.00,104.00C139.33,186.00,105.00,286.00,105.00,404.00C105.00,539.33,150.00,679.00,240.00,823.00C340.00,983.00,452.67,1063.00,578.00,1063.00C643.33,1063.00,716.33,1047.67,797.00,1017.00C899.00,977.67,950.00,929.67,950.00,873.00C950.00,847.67,941.67,825.33,925.00,806.00C908.33,786.67,887.67,776.67,863.00,776.00C843.67,776.00,827.00,781.67,813.00,793.00C799.00,804.33,785.00,816.00,771.00,828.00C731.67,859.33,667.33,875.00,578.00,875.00C510.00,875.00,442.67,814.33,376.00,693.00C315.33,581.67,285.00,485.33,285.00,404.00C285.00,316.00,315.00,246.67,375.00,196.00C431.00,148.67,503.00,125.00,591.00,125.00C631.00,125.00,673.67,135.67,719.00,157.00L835.00,219.00C855.00,229.67,869.33,235.00,878.00,235.00C902.67,235.00,924.00,225.33,942.00,206.00C960.00,186.67,969.00,164.00,969.00,138.00C969.00,69.33,883.67,10.00,713.00,-40.00C732.33,-65.33,746.67,-91.00,756.00,-117.00C765.33,-143.00,770.00,-169.33,770.00,-196.00"]
+          KCanvasContainer {g} at (168.84,155.62) size 203.44x71.34 [transform={m=((0.03,0.00)(0.00,0.03)) t=(0.00,0.00)}]
+            KCanvasItem {path} at (168.84,166.70) size 35.77x44.18 [fill={[type=SOLID] [color=#000000]}] [data="M1250.00,-30.00C1188.67,-30.00,1135.33,48.67,1090.00,206.00C1072.67,266.00,1051.00,371.00,1025.00,521.00C957.00,511.67,868.00,495.00,758.00,471.00L492.00,416.00C458.67,328.67,401.67,201.00,321.00,33.00C299.67,-4.33,270.67,-23.00,234.00,-23.00C207.33,-23.00,183.67,-13.33,163.00,6.00C142.33,25.33,131.67,49.33,131.00,78.00C131.00,110.00,181.33,231.67,282.00,443.00C270.67,460.33,265.00,480.33,265.00,503.00C265.00,557.00,297.67,591.67,363.00,607.00C439.00,749.67,535.00,913.67,651.00,1099.00C809.00,1351.67,907.33,1478.00,946.00,1478.00C998.67,1478.00,1034.67,1441.33,1054.00,1368.00L1117.00,1032.00L1266.00,337.00L1323.00,179.00C1342.33,125.00,1352.00,89.00,1352.00,71.00C1352.00,42.33,1341.67,18.33,1321.00,-1.00C1300.33,-20.33,1276.67,-30.00,1250.00,-30.00M897.00,1113.00L611.00,652.00C691.67,672.67,814.00,697.67,978.00,727.00L897.00,1113.00"]
+            KCanvasItem {path} at (208.77,179.53) size 30.12x47.43 [transform={m=((1.00,0.00)(0.00,1.00)) t=(1498.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1011.00,892.00L665.00,144.00C579.67,-38.00,514.33,-190.33,469.00,-313.00L403.00,-507.00C385.67,-555.00,355.67,-579.00,313.00,-579.00C285.00,-579.00,261.00,-570.00,241.00,-552.00C221.00,-534.00,210.67,-511.00,210.00,-483.00C210.00,-416.33,282.00,-223.33,426.00,96.00L68.00,785.00L23.00,858.00C5.00,888.67,-4.00,914.33,-4.00,935.00C-4.00,962.33,6.33,986.33,27.00,1007.00C47.67,1027.67,71.33,1038.00,98.00,1038.00C128.67,1038.00,152.33,1026.33,169.00,1003.00C282.33,845.67,404.00,621.67,534.00,331.00L682.00,676.00C735.33,795.33,786.67,898.00,836.00,984.00C857.33,1021.33,885.33,1040.00,920.00,1040.00C947.33,1040.00,971.33,1030.33,992.00,1011.00C1012.67,991.67,1023.33,968.67,1024.00,942.00C1024.00,927.33,1019.67,910.67,1011.00,892.00"]
+            KCanvasItem {path} at (243.52,155.62) size 41.95x56.16 [transform={m=((1.00,0.00)(0.00,1.00)) t=(2564.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M802.00,-61.00C614.00,-61.00,454.67,-4.67,324.00,108.00C185.33,228.00,116.00,382.67,116.00,572.00C116.00,802.67,184.33,1012.33,321.00,1201.00C473.67,1410.33,664.00,1515.00,892.00,1515.00C1111.33,1515.00,1274.33,1465.67,1381.00,1367.00C1492.33,1264.33,1548.00,1102.33,1548.00,881.00C1548.00,650.33,1485.33,442.33,1360.00,257.00C1216.00,45.00,1030.00,-61.00,802.00,-61.00M892.00,1310.00C728.67,1310.00,590.33,1228.67,477.00,1066.00C372.33,916.67,320.00,752.00,320.00,572.00C320.00,443.33,367.67,338.67,463.00,258.00C554.33,182.00,667.33,144.00,802.00,144.00C964.00,144.00,1097.67,225.67,1203.00,389.00C1297.00,535.00,1344.00,699.00,1344.00,881.00C1344.00,1040.33,1308.33,1152.33,1237.00,1217.00C1169.00,1279.00,1054.00,1310.00,892.00,1310.00M682.00,1848.00C769.33,1848.00,813.00,1813.00,813.00,1743.00C813.00,1723.00,798.33,1703.67,769.00,1685.00C742.33,1668.33,717.33,1660.00,694.00,1660.00C612.00,1660.00,571.00,1694.33,571.00,1763.00C571.00,1782.33,583.33,1801.33,608.00,1820.00C632.67,1838.67,657.33,1848.00,682.00,1848.00M1221.00,1856.00C1243.67,1856.00,1266.67,1845.67,1290.00,1825.00C1313.33,1804.33,1325.00,1783.67,1325.00,1763.00C1325.00,1701.67,1277.33,1671.00,1182.00,1671.00C1154.67,1671.00,1130.33,1678.00,1109.00,1692.00C1085.00,1708.00,1073.00,1729.00,1073.00,1755.00C1073.00,1801.00,1088.00,1830.67,1118.00,1844.00C1134.67,1852.00,1169.00,1856.00,1221.00,1856.00"]
+            KCanvasItem {path} at (291.24,162.25) size 48.13x51.86 [transform={m=((1.00,0.00)(0.00,1.00)) t=(4199.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1306.00,412.00C1235.33,412.00,1174.33,422.33,1123.00,443.00C1071.67,463.67,1030.33,494.33,999.00,535.00C963.00,499.67,928.00,473.00,894.00,455.00C860.00,437.00,826.33,428.00,793.00,428.00C719.00,428.00,649.33,458.00,584.00,518.00C518.67,578.00,485.67,644.33,485.00,717.00C485.00,840.33,533.33,953.00,630.00,1055.00C726.67,1157.00,837.00,1208.00,961.00,1208.00C989.00,1208.00,1012.33,1197.67,1031.00,1177.00C1049.67,1156.33,1059.00,1131.33,1059.00,1102.00C1059.00,1062.00,1025.67,1032.33,959.00,1013.00C870.33,987.67,807.67,958.67,771.00,926.00C717.00,878.67,690.00,809.00,690.00,717.00C690.00,697.67,699.00,679.00,717.00,661.00C737.67,641.00,763.33,631.67,794.00,633.00C852.00,635.67,905.67,689.67,955.00,795.00C999.67,887.00,1039.33,933.00,1074.00,933.00C1102.00,933.00,1124.67,922.67,1142.00,902.00C1159.33,881.33,1168.00,856.00,1168.00,826.00C1168.00,812.67,1166.00,792.67,1162.00,766.00C1158.00,739.33,1155.67,719.33,1155.00,706.00C1155.00,662.67,1173.67,635.33,1211.00,624.00C1225.67,619.33,1257.33,617.00,1306.00,617.00C1397.33,617.00,1461.33,639.33,1498.00,684.00C1531.33,724.00,1548.00,790.33,1548.00,883.00C1548.00,1046.33,1482.33,1179.67,1351.00,1283.00C1231.00,1377.67,1087.67,1425.00,921.00,1425.00C727.00,1425.00,575.00,1351.67,465.00,1205.00C365.67,1074.33,316.00,910.00,316.00,712.00C316.00,529.33,374.33,375.33,491.00,250.00C612.33,119.33,768.33,54.00,959.00,54.00C1013.00,54.00,1074.00,64.33,1142.00,85.00L1317.00,150.00C1346.33,160.67,1365.33,166.00,1374.00,166.00C1401.33,166.00,1425.00,155.33,1445.00,134.00C1465.00,112.67,1475.00,87.33,1475.00,58.00C1475.00,-5.33,1404.00,-56.67,1262.00,-96.00C1154.67,-125.33,1054.33,-140.00,961.00,-140.00C867.00,-140.00,771.00,-122.00,673.00,-86.00C575.00,-50.00,490.67,-1.33,420.00,60.00C213.33,238.67,110.00,456.00,110.00,712.00C110.00,968.00,180.67,1182.00,322.00,1354.00C472.00,1538.00,671.67,1630.00,921.00,1630.00C1146.33,1630.00,1339.33,1562.33,1500.00,1427.00C1668.67,1283.67,1753.00,1102.33,1753.00,883.00C1753.00,733.00,1716.33,617.67,1643.00,537.00C1566.33,453.67,1454.00,412.00,1306.00,412.00"]
+            KCanvasItem {path} at (346.96,178.86) size 25.31x44.18 [transform={m=((1.00,0.00)(0.00,1.00)) t=(6106.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M770.00,-196.00C770.00,-278.67,750.00,-340.67,710.00,-382.00C670.00,-423.33,609.33,-444.33,528.00,-445.00C471.33,-445.00,417.67,-434.33,367.00,-413.00C303.00,-385.00,271.00,-346.67,271.00,-298.00C271.00,-262.00,293.67,-244.00,339.00,-244.00C363.00,-244.00,390.00,-252.00,420.00,-268.00C450.00,-284.00,482.33,-292.33,517.00,-293.00C549.67,-292.33,574.00,-284.33,590.00,-269.00C606.00,-253.67,614.00,-231.00,614.00,-201.00C614.00,-169.00,601.67,-140.33,577.00,-115.00C552.33,-89.67,514.33,-67.33,463.00,-48.00C357.00,-24.00,272.00,26.67,208.00,104.00C139.33,186.00,105.00,286.00,105.00,404.00C105.00,539.33,150.00,679.00,240.00,823.00C340.00,983.00,452.67,1063.00,578.00,1063.00C643.33,1063.00,716.33,1047.67,797.00,1017.00C899.00,977.67,950.00,929.67,950.00,873.00C950.00,847.67,941.67,825.33,925.00,806.00C908.33,786.67,887.67,776.67,863.00,776.00C843.67,776.00,827.00,781.67,813.00,793.00C799.00,804.33,785.00,816.00,771.00,828.00C731.67,859.33,667.33,875.00,578.00,875.00C510.00,875.00,442.67,814.33,376.00,693.00C315.33,581.67,285.00,485.33,285.00,404.00C285.00,316.00,315.00,246.67,375.00,196.00C431.00,148.67,503.00,125.00,591.00,125.00C631.00,125.00,673.67,135.67,719.00,157.00L835.00,219.00C855.00,229.67,869.33,235.00,878.00,235.00C902.67,235.00,924.00,225.33,942.00,206.00C960.00,186.67,969.00,164.00,969.00,138.00C969.00,69.33,883.67,10.00,713.00,-40.00C732.33,-65.33,746.67,-91.00,756.00,-117.00C765.33,-143.00,770.00,-169.33,770.00,-196.00"]
       RenderSVGText {text} at (0,0) size 465x46
         RenderText {TEXT} at (0,0) size 264x46
           text run at (0,0) width 264: "$Revision: 1.1 $"

diff --git a/LayoutTests/svg/W3C-SVG-1.1/fonts-elem-03-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/fonts-elem-03-b-expected.txt
index 31dae6c860af4ab1bb3bb92a298852b59915fc43..9991f11a091685bef62355b804c67a2d1a22a6ea 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/fonts-elem-03-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/fonts-elem-03-b-expected.txt
@@ -11,18 +11,18 @@ layer at (0,0) size 480x360
               text run at (0,0) width 105: "Placed Glyphs"
           KCanvasContainer {g} at (164.27,81.41) size 211.17x161.13 [transform={m=((1.00,0.00)(-0.00,-1.00)) t=(165.00,140.00)}]
             KCanvasItem {line} at (165,139.50) size 210x1 [stroke={[type=SOLID] [color=#888888]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00L210.00,0.00"]
-            KCanvasContainer {g} at (4.10,-54.49) size 211.17x161.13 [transform={m=((0.03,0.00)(0.00,0.03)) t=(0.00,0.00)}]
-              KCanvasItem {line} at (4.10,-54.49) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,-3500.00L0.00,2000.00"]
-              KCanvasItem {path} at (8.67,-39.20) size 35.77x44.18 [fill={[type=SOLID] [color=#000000]}] [data="M1250.00,-30.00C1188.67,-30.00,1135.33,48.67,1090.00,206.00C1072.67,266.00,1051.00,371.00,1025.00,521.00C957.00,511.67,868.00,495.00,758.00,471.00L492.00,416.00C458.67,328.67,401.67,201.00,321.00,33.00C299.67,-4.33,270.67,-23.00,234.00,-23.00C207.33,-23.00,183.67,-13.33,163.00,6.00C142.33,25.33,131.67,49.33,131.00,78.00C131.00,110.00,181.33,231.67,282.00,443.00C270.67,460.33,265.00,480.33,265.00,503.00C265.00,557.00,297.67,591.67,363.00,607.00C439.00,749.67,535.00,913.67,651.00,1099.00C809.00,1351.67,907.33,1478.00,946.00,1478.00C998.67,1478.00,1034.67,1441.33,1054.00,1368.00L1117.00,1032.00L1266.00,337.00L1323.00,179.00C1342.33,125.00,1352.00,89.00,1352.00,71.00C1352.00,42.33,1341.67,18.33,1321.00,-1.00C1300.33,-20.33,1276.67,-30.00,1250.00,-30.00M897.00,1113.00L611.00,652.00C691.67,672.67,814.00,697.67,978.00,727.00L897.00,1113.00"]
-              KCanvasItem {line} at (47.99,-54.49) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M1498.00,-3500.00L1498.00,2000.00"]
-              KCanvasItem {path} at (1502.72,-26.37) size 30.12x47.43 [transform={m=((1.00,0.00)(0.00,1.00)) t=(1498.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1011.00,892.00L665.00,144.00C579.67,-38.00,514.33,-190.33,469.00,-313.00L403.00,-507.00C385.67,-555.00,355.67,-579.00,313.00,-579.00C285.00,-579.00,261.00,-570.00,241.00,-552.00C221.00,-534.00,210.67,-511.00,210.00,-483.00C210.00,-416.33,282.00,-223.33,426.00,96.00L68.00,785.00L23.00,858.00C5.00,888.67,-4.00,914.33,-4.00,935.00C-4.00,962.33,6.33,986.33,27.00,1007.00C47.67,1027.67,71.33,1038.00,98.00,1038.00C128.67,1038.00,152.33,1026.33,169.00,1003.00C282.33,845.67,404.00,621.67,534.00,331.00L682.00,676.00C735.33,795.33,786.67,898.00,836.00,984.00C857.33,1021.33,885.33,1040.00,920.00,1040.00C947.33,1040.00,971.33,1030.33,992.00,1011.00C1012.67,991.67,1023.33,968.67,1024.00,942.00C1024.00,927.33,1019.67,910.67,1011.00,892.00"]
-              KCanvasItem {line} at (79.22,-54.49) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M2564.00,-3500.00L2564.00,2000.00"]
-              KCanvasItem {path} at (2572.23,-50.27) size 41.95x56.16 [transform={m=((1.00,0.00)(0.00,1.00)) t=(2564.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M802.00,-61.00C614.00,-61.00,454.67,-4.67,324.00,108.00C185.33,228.00,116.00,382.67,116.00,572.00C116.00,802.67,184.33,1012.33,321.00,1201.00C473.67,1410.33,664.00,1515.00,892.00,1515.00C1111.33,1515.00,1274.33,1465.67,1381.00,1367.00C1492.33,1264.33,1548.00,1102.33,1548.00,881.00C1548.00,650.33,1485.33,442.33,1360.00,257.00C1216.00,45.00,1030.00,-61.00,802.00,-61.00M892.00,1310.00C728.67,1310.00,590.33,1228.67,477.00,1066.00C372.33,916.67,320.00,752.00,320.00,572.00C320.00,443.33,367.67,338.67,463.00,258.00C554.33,182.00,667.33,144.00,802.00,144.00C964.00,144.00,1097.67,225.67,1203.00,389.00C1297.00,535.00,1344.00,699.00,1344.00,881.00C1344.00,1040.33,1308.33,1152.33,1237.00,1217.00C1169.00,1279.00,1054.00,1310.00,892.00,1310.00M682.00,1848.00C769.33,1848.00,813.00,1813.00,813.00,1743.00C813.00,1723.00,798.33,1703.67,769.00,1685.00C742.33,1668.33,717.33,1660.00,694.00,1660.00C612.00,1660.00,571.00,1694.33,571.00,1763.00C571.00,1782.33,583.33,1801.33,608.00,1820.00C632.67,1838.67,657.33,1848.00,682.00,1848.00M1221.00,1856.00C1243.67,1856.00,1266.67,1845.67,1290.00,1825.00C1313.33,1804.33,1325.00,1783.67,1325.00,1763.00C1325.00,1701.67,1277.33,1671.00,1182.00,1671.00C1154.67,1671.00,1130.33,1678.00,1109.00,1692.00C1085.00,1708.00,1073.00,1729.00,1073.00,1755.00C1073.00,1801.00,1088.00,1830.67,1118.00,1844.00C1134.67,1852.00,1169.00,1856.00,1221.00,1856.00"]
-              KCanvasItem {line} at (127.12,-54.49) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M4199.00,-3500.00L4199.00,2000.00"]
-              KCanvasItem {path} at (4207.06,-43.65) size 48.13x51.86 [transform={m=((1.00,0.00)(0.00,1.00)) t=(4199.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1306.00,412.00C1235.33,412.00,1174.33,422.33,1123.00,443.00C1071.67,463.67,1030.33,494.33,999.00,535.00C963.00,499.67,928.00,473.00,894.00,455.00C860.00,437.00,826.33,428.00,793.00,428.00C719.00,428.00,649.33,458.00,584.00,518.00C518.67,578.00,485.67,644.33,485.00,717.00C485.00,840.33,533.33,953.00,630.00,1055.00C726.67,1157.00,837.00,1208.00,961.00,1208.00C989.00,1208.00,1012.33,1197.67,1031.00,1177.00C1049.67,1156.33,1059.00,1131.33,1059.00,1102.00C1059.00,1062.00,1025.67,1032.33,959.00,1013.00C870.33,987.67,807.67,958.67,771.00,926.00C717.00,878.67,690.00,809.00,690.00,717.00C690.00,697.67,699.00,679.00,717.00,661.00C737.67,641.00,763.33,631.67,794.00,633.00C852.00,635.67,905.67,689.67,955.00,795.00C999.67,887.00,1039.33,933.00,1074.00,933.00C1102.00,933.00,1124.67,922.67,1142.00,902.00C1159.33,881.33,1168.00,856.00,1168.00,826.00C1168.00,812.67,1166.00,792.67,1162.00,766.00C1158.00,739.33,1155.67,719.33,1155.00,706.00C1155.00,662.67,1173.67,635.33,1211.00,624.00C1225.67,619.33,1257.33,617.00,1306.00,617.00C1397.33,617.00,1461.33,639.33,1498.00,684.00C1531.33,724.00,1548.00,790.33,1548.00,883.00C1548.00,1046.33,1482.33,1179.67,1351.00,1283.00C1231.00,1377.67,1087.67,1425.00,921.00,1425.00C727.00,1425.00,575.00,1351.67,465.00,1205.00C365.67,1074.33,316.00,910.00,316.00,712.00C316.00,529.33,374.33,375.33,491.00,250.00C612.33,119.33,768.33,54.00,959.00,54.00C1013.00,54.00,1074.00,64.33,1142.00,85.00L1317.00,150.00C1346.33,160.67,1365.33,166.00,1374.00,166.00C1401.33,166.00,1425.00,155.33,1445.00,134.00C1465.00,112.67,1475.00,87.33,1475.00,58.00C1475.00,-5.33,1404.00,-56.67,1262.00,-96.00C1154.67,-125.33,1054.33,-140.00,961.00,-140.00C867.00,-140.00,771.00,-122.00,673.00,-86.00C575.00,-50.00,490.67,-1.33,420.00,60.00C213.33,238.67,110.00,456.00,110.00,712.00C110.00,968.00,180.67,1182.00,322.00,1354.00C472.00,1538.00,671.67,1630.00,921.00,1630.00C1146.33,1630.00,1339.33,1562.33,1500.00,1427.00C1668.67,1283.67,1753.00,1102.33,1753.00,883.00C1753.00,733.00,1716.33,617.67,1643.00,537.00C1566.33,453.67,1454.00,412.00,1306.00,412.00"]
-              KCanvasItem {line} at (182.99,-54.49) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M6106.00,-3500.00L6106.00,2000.00"]
-              KCanvasItem {path} at (6113.91,-27.04) size 25.31x44.18 [transform={m=((1.00,0.00)(0.00,1.00)) t=(6106.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M770.00,-196.00C770.00,-278.67,750.00,-340.67,710.00,-382.00C670.00,-423.33,609.33,-444.33,528.00,-445.00C471.33,-445.00,417.67,-434.33,367.00,-413.00C303.00,-385.00,271.00,-346.67,271.00,-298.00C271.00,-262.00,293.67,-244.00,339.00,-244.00C363.00,-244.00,390.00,-252.00,420.00,-268.00C450.00,-284.00,482.33,-292.33,517.00,-293.00C549.67,-292.33,574.00,-284.33,590.00,-269.00C606.00,-253.67,614.00,-231.00,614.00,-201.00C614.00,-169.00,601.67,-140.33,577.00,-115.00C552.33,-89.67,514.33,-67.33,463.00,-48.00C357.00,-24.00,272.00,26.67,208.00,104.00C139.33,186.00,105.00,286.00,105.00,404.00C105.00,539.33,150.00,679.00,240.00,823.00C340.00,983.00,452.67,1063.00,578.00,1063.00C643.33,1063.00,716.33,1047.67,797.00,1017.00C899.00,977.67,950.00,929.67,950.00,873.00C950.00,847.67,941.67,825.33,925.00,806.00C908.33,786.67,887.67,776.67,863.00,776.00C843.67,776.00,827.00,781.67,813.00,793.00C799.00,804.33,785.00,816.00,771.00,828.00C731.67,859.33,667.33,875.00,578.00,875.00C510.00,875.00,442.67,814.33,376.00,693.00C315.33,581.67,285.00,485.33,285.00,404.00C285.00,316.00,315.00,246.67,375.00,196.00C431.00,148.67,503.00,125.00,591.00,125.00C631.00,125.00,673.67,135.67,719.00,157.00L835.00,219.00C855.00,229.67,869.33,235.00,878.00,235.00C902.67,235.00,924.00,225.33,942.00,206.00C960.00,186.67,969.00,164.00,969.00,138.00C969.00,69.33,883.67,10.00,713.00,-40.00C732.33,-65.33,746.67,-91.00,756.00,-117.00C765.33,-143.00,770.00,-169.33,770.00,-196.00"]
-              KCanvasItem {line} at (213.81,-54.49) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M7158.00,-3500.00L7158.00,2000.00"]
+            KCanvasContainer {g} at (164.27,81.41) size 211.17x161.13 [transform={m=((0.03,0.00)(0.00,0.03)) t=(0.00,0.00)}]
+              KCanvasItem {line} at (164.27,81.41) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,-3500.00L0.00,2000.00"]
+              KCanvasItem {path} at (168.84,96.70) size 35.77x44.18 [fill={[type=SOLID] [color=#000000]}] [data="M1250.00,-30.00C1188.67,-30.00,1135.33,48.67,1090.00,206.00C1072.67,266.00,1051.00,371.00,1025.00,521.00C957.00,511.67,868.00,495.00,758.00,471.00L492.00,416.00C458.67,328.67,401.67,201.00,321.00,33.00C299.67,-4.33,270.67,-23.00,234.00,-23.00C207.33,-23.00,183.67,-13.33,163.00,6.00C142.33,25.33,131.67,49.33,131.00,78.00C131.00,110.00,181.33,231.67,282.00,443.00C270.67,460.33,265.00,480.33,265.00,503.00C265.00,557.00,297.67,591.67,363.00,607.00C439.00,749.67,535.00,913.67,651.00,1099.00C809.00,1351.67,907.33,1478.00,946.00,1478.00C998.67,1478.00,1034.67,1441.33,1054.00,1368.00L1117.00,1032.00L1266.00,337.00L1323.00,179.00C1342.33,125.00,1352.00,89.00,1352.00,71.00C1352.00,42.33,1341.67,18.33,1321.00,-1.00C1300.33,-20.33,1276.67,-30.00,1250.00,-30.00M897.00,1113.00L611.00,652.00C691.67,672.67,814.00,697.67,978.00,727.00L897.00,1113.00"]
+              KCanvasItem {line} at (208.15,81.41) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M1498.00,-3500.00L1498.00,2000.00"]
+              KCanvasItem {path} at (208.77,109.53) size 30.12x47.43 [transform={m=((1.00,0.00)(0.00,1.00)) t=(1498.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1011.00,892.00L665.00,144.00C579.67,-38.00,514.33,-190.33,469.00,-313.00L403.00,-507.00C385.67,-555.00,355.67,-579.00,313.00,-579.00C285.00,-579.00,261.00,-570.00,241.00,-552.00C221.00,-534.00,210.67,-511.00,210.00,-483.00C210.00,-416.33,282.00,-223.33,426.00,96.00L68.00,785.00L23.00,858.00C5.00,888.67,-4.00,914.33,-4.00,935.00C-4.00,962.33,6.33,986.33,27.00,1007.00C47.67,1027.67,71.33,1038.00,98.00,1038.00C128.67,1038.00,152.33,1026.33,169.00,1003.00C282.33,845.67,404.00,621.67,534.00,331.00L682.00,676.00C735.33,795.33,786.67,898.00,836.00,984.00C857.33,1021.33,885.33,1040.00,920.00,1040.00C947.33,1040.00,971.33,1030.33,992.00,1011.00C1012.67,991.67,1023.33,968.67,1024.00,942.00C1024.00,927.33,1019.67,910.67,1011.00,892.00"]
+              KCanvasItem {line} at (239.38,81.41) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M2564.00,-3500.00L2564.00,2000.00"]
+              KCanvasItem {path} at (243.52,85.62) size 41.95x56.16 [transform={m=((1.00,0.00)(0.00,1.00)) t=(2564.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M802.00,-61.00C614.00,-61.00,454.67,-4.67,324.00,108.00C185.33,228.00,116.00,382.67,116.00,572.00C116.00,802.67,184.33,1012.33,321.00,1201.00C473.67,1410.33,664.00,1515.00,892.00,1515.00C1111.33,1515.00,1274.33,1465.67,1381.00,1367.00C1492.33,1264.33,1548.00,1102.33,1548.00,881.00C1548.00,650.33,1485.33,442.33,1360.00,257.00C1216.00,45.00,1030.00,-61.00,802.00,-61.00M892.00,1310.00C728.67,1310.00,590.33,1228.67,477.00,1066.00C372.33,916.67,320.00,752.00,320.00,572.00C320.00,443.33,367.67,338.67,463.00,258.00C554.33,182.00,667.33,144.00,802.00,144.00C964.00,144.00,1097.67,225.67,1203.00,389.00C1297.00,535.00,1344.00,699.00,1344.00,881.00C1344.00,1040.33,1308.33,1152.33,1237.00,1217.00C1169.00,1279.00,1054.00,1310.00,892.00,1310.00M682.00,1848.00C769.33,1848.00,813.00,1813.00,813.00,1743.00C813.00,1723.00,798.33,1703.67,769.00,1685.00C742.33,1668.33,717.33,1660.00,694.00,1660.00C612.00,1660.00,571.00,1694.33,571.00,1763.00C571.00,1782.33,583.33,1801.33,608.00,1820.00C632.67,1838.67,657.33,1848.00,682.00,1848.00M1221.00,1856.00C1243.67,1856.00,1266.67,1845.67,1290.00,1825.00C1313.33,1804.33,1325.00,1783.67,1325.00,1763.00C1325.00,1701.67,1277.33,1671.00,1182.00,1671.00C1154.67,1671.00,1130.33,1678.00,1109.00,1692.00C1085.00,1708.00,1073.00,1729.00,1073.00,1755.00C1073.00,1801.00,1088.00,1830.67,1118.00,1844.00C1134.67,1852.00,1169.00,1856.00,1221.00,1856.00"]
+              KCanvasItem {line} at (287.29,81.41) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M4199.00,-3500.00L4199.00,2000.00"]
+              KCanvasItem {path} at (291.24,92.25) size 48.13x51.86 [transform={m=((1.00,0.00)(0.00,1.00)) t=(4199.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1306.00,412.00C1235.33,412.00,1174.33,422.33,1123.00,443.00C1071.67,463.67,1030.33,494.33,999.00,535.00C963.00,499.67,928.00,473.00,894.00,455.00C860.00,437.00,826.33,428.00,793.00,428.00C719.00,428.00,649.33,458.00,584.00,518.00C518.67,578.00,485.67,644.33,485.00,717.00C485.00,840.33,533.33,953.00,630.00,1055.00C726.67,1157.00,837.00,1208.00,961.00,1208.00C989.00,1208.00,1012.33,1197.67,1031.00,1177.00C1049.67,1156.33,1059.00,1131.33,1059.00,1102.00C1059.00,1062.00,1025.67,1032.33,959.00,1013.00C870.33,987.67,807.67,958.67,771.00,926.00C717.00,878.67,690.00,809.00,690.00,717.00C690.00,697.67,699.00,679.00,717.00,661.00C737.67,641.00,763.33,631.67,794.00,633.00C852.00,635.67,905.67,689.67,955.00,795.00C999.67,887.00,1039.33,933.00,1074.00,933.00C1102.00,933.00,1124.67,922.67,1142.00,902.00C1159.33,881.33,1168.00,856.00,1168.00,826.00C1168.00,812.67,1166.00,792.67,1162.00,766.00C1158.00,739.33,1155.67,719.33,1155.00,706.00C1155.00,662.67,1173.67,635.33,1211.00,624.00C1225.67,619.33,1257.33,617.00,1306.00,617.00C1397.33,617.00,1461.33,639.33,1498.00,684.00C1531.33,724.00,1548.00,790.33,1548.00,883.00C1548.00,1046.33,1482.33,1179.67,1351.00,1283.00C1231.00,1377.67,1087.67,1425.00,921.00,1425.00C727.00,1425.00,575.00,1351.67,465.00,1205.00C365.67,1074.33,316.00,910.00,316.00,712.00C316.00,529.33,374.33,375.33,491.00,250.00C612.33,119.33,768.33,54.00,959.00,54.00C1013.00,54.00,1074.00,64.33,1142.00,85.00L1317.00,150.00C1346.33,160.67,1365.33,166.00,1374.00,166.00C1401.33,166.00,1425.00,155.33,1445.00,134.00C1465.00,112.67,1475.00,87.33,1475.00,58.00C1475.00,-5.33,1404.00,-56.67,1262.00,-96.00C1154.67,-125.33,1054.33,-140.00,961.00,-140.00C867.00,-140.00,771.00,-122.00,673.00,-86.00C575.00,-50.00,490.67,-1.33,420.00,60.00C213.33,238.67,110.00,456.00,110.00,712.00C110.00,968.00,180.67,1182.00,322.00,1354.00C472.00,1538.00,671.67,1630.00,921.00,1630.00C1146.33,1630.00,1339.33,1562.33,1500.00,1427.00C1668.67,1283.67,1753.00,1102.33,1753.00,883.00C1753.00,733.00,1716.33,617.67,1643.00,537.00C1566.33,453.67,1454.00,412.00,1306.00,412.00"]
+              KCanvasItem {line} at (343.15,81.41) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M6106.00,-3500.00L6106.00,2000.00"]
+              KCanvasItem {path} at (346.96,108.86) size 25.31x44.18 [transform={m=((1.00,0.00)(0.00,1.00)) t=(6106.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M770.00,-196.00C770.00,-278.67,750.00,-340.67,710.00,-382.00C670.00,-423.33,609.33,-444.33,528.00,-445.00C471.33,-445.00,417.67,-434.33,367.00,-413.00C303.00,-385.00,271.00,-346.67,271.00,-298.00C271.00,-262.00,293.67,-244.00,339.00,-244.00C363.00,-244.00,390.00,-252.00,420.00,-268.00C450.00,-284.00,482.33,-292.33,517.00,-293.00C549.67,-292.33,574.00,-284.33,590.00,-269.00C606.00,-253.67,614.00,-231.00,614.00,-201.00C614.00,-169.00,601.67,-140.33,577.00,-115.00C552.33,-89.67,514.33,-67.33,463.00,-48.00C357.00,-24.00,272.00,26.67,208.00,104.00C139.33,186.00,105.00,286.00,105.00,404.00C105.00,539.33,150.00,679.00,240.00,823.00C340.00,983.00,452.67,1063.00,578.00,1063.00C643.33,1063.00,716.33,1047.67,797.00,1017.00C899.00,977.67,950.00,929.67,950.00,873.00C950.00,847.67,941.67,825.33,925.00,806.00C908.33,786.67,887.67,776.67,863.00,776.00C843.67,776.00,827.00,781.67,813.00,793.00C799.00,804.33,785.00,816.00,771.00,828.00C731.67,859.33,667.33,875.00,578.00,875.00C510.00,875.00,442.67,814.33,376.00,693.00C315.33,581.67,285.00,485.33,285.00,404.00C285.00,316.00,315.00,246.67,375.00,196.00C431.00,148.67,503.00,125.00,591.00,125.00C631.00,125.00,673.67,135.67,719.00,157.00L835.00,219.00C855.00,229.67,869.33,235.00,878.00,235.00C902.67,235.00,924.00,225.33,942.00,206.00C960.00,186.67,969.00,164.00,969.00,138.00C969.00,69.33,883.67,10.00,713.00,-40.00C732.33,-65.33,746.67,-91.00,756.00,-117.00C765.33,-143.00,770.00,-169.33,770.00,-196.00"]
+              KCanvasItem {line} at (373.97,81.41) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M7158.00,-3500.00L7158.00,2000.00"]
         RenderSVGText {text} at (0,0) size 465x22
           RenderText {TEXT} at (0,0) size 74x22
             text run at (0,0) width 74: "SVG Font"

diff --git a/LayoutTests/svg/W3C-SVG-1.1/fonts-elem-04-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/fonts-elem-04-b-expected.txt
index f66d996e234ed700362b299db13555dc56e88ffb..ec6347fd53ccb0795da34ece0323be020735c0dd 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/fonts-elem-04-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/fonts-elem-04-b-expected.txt
@@ -11,18 +11,18 @@ layer at (0,0) size 480x360
               text run at (0,0) width 105: "Placed Glyphs"
           KCanvasContainer {g} at (164.27,81.41) size 211.17x161.13 [transform={m=((1.00,0.00)(-0.00,-1.00)) t=(165.00,140.00)}]
             KCanvasItem {line} at (165,139.50) size 210x1 [stroke={[type=SOLID] [color=#888888]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00L210.00,0.00"]
-            KCanvasContainer {g} at (4.10,-54.49) size 211.17x161.13 [transform={m=((0.03,0.00)(0.00,0.03)) t=(0.00,0.00)}]
-              KCanvasItem {line} at (4.10,-54.49) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,-3500.00L0.00,2000.00"]
-              KCanvasItem {path} at (8.67,-39.20) size 35.77x44.18 [fill={[type=SOLID] [color=#000000]}] [data="M1250.00,-30.00C1188.67,-30.00,1135.33,48.67,1090.00,206.00C1072.67,266.00,1051.00,371.00,1025.00,521.00C957.00,511.67,868.00,495.00,758.00,471.00L492.00,416.00C458.67,328.67,401.67,201.00,321.00,33.00C299.67,-4.33,270.67,-23.00,234.00,-23.00C207.33,-23.00,183.67,-13.33,163.00,6.00C142.33,25.33,131.67,49.33,131.00,78.00C131.00,110.00,181.33,231.67,282.00,443.00C270.67,460.33,265.00,480.33,265.00,503.00C265.00,557.00,297.67,591.67,363.00,607.00C439.00,749.67,535.00,913.67,651.00,1099.00C809.00,1351.67,907.33,1478.00,946.00,1478.00C998.67,1478.00,1034.67,1441.33,1054.00,1368.00L1117.00,1032.00L1266.00,337.00L1323.00,179.00C1342.33,125.00,1352.00,89.00,1352.00,71.00C1352.00,42.33,1341.67,18.33,1321.00,-1.00C1300.33,-20.33,1276.67,-30.00,1250.00,-30.00M897.00,1113.00L611.00,652.00C691.67,672.67,814.00,697.67,978.00,727.00L897.00,1113.00"]
-              KCanvasItem {line} at (47.99,-54.49) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M1498.00,-3500.00L1498.00,2000.00"]
-              KCanvasItem {path} at (1502.72,-26.37) size 30.12x47.43 [transform={m=((1.00,0.00)(0.00,1.00)) t=(1498.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1011.00,892.00L665.00,144.00C579.67,-38.00,514.33,-190.33,469.00,-313.00L403.00,-507.00C385.67,-555.00,355.67,-579.00,313.00,-579.00C285.00,-579.00,261.00,-570.00,241.00,-552.00C221.00,-534.00,210.67,-511.00,210.00,-483.00C210.00,-416.33,282.00,-223.33,426.00,96.00L68.00,785.00L23.00,858.00C5.00,888.67,-4.00,914.33,-4.00,935.00C-4.00,962.33,6.33,986.33,27.00,1007.00C47.67,1027.67,71.33,1038.00,98.00,1038.00C128.67,1038.00,152.33,1026.33,169.00,1003.00C282.33,845.67,404.00,621.67,534.00,331.00L682.00,676.00C735.33,795.33,786.67,898.00,836.00,984.00C857.33,1021.33,885.33,1040.00,920.00,1040.00C947.33,1040.00,971.33,1030.33,992.00,1011.00C1012.67,991.67,1023.33,968.67,1024.00,942.00C1024.00,927.33,1019.67,910.67,1011.00,892.00"]
-              KCanvasItem {line} at (79.22,-54.49) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M2564.00,-3500.00L2564.00,2000.00"]
-              KCanvasItem {path} at (2572.23,-50.27) size 41.95x56.16 [transform={m=((1.00,0.00)(0.00,1.00)) t=(2564.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M802.00,-61.00C614.00,-61.00,454.67,-4.67,324.00,108.00C185.33,228.00,116.00,382.67,116.00,572.00C116.00,802.67,184.33,1012.33,321.00,1201.00C473.67,1410.33,664.00,1515.00,892.00,1515.00C1111.33,1515.00,1274.33,1465.67,1381.00,1367.00C1492.33,1264.33,1548.00,1102.33,1548.00,881.00C1548.00,650.33,1485.33,442.33,1360.00,257.00C1216.00,45.00,1030.00,-61.00,802.00,-61.00M892.00,1310.00C728.67,1310.00,590.33,1228.67,477.00,1066.00C372.33,916.67,320.00,752.00,320.00,572.00C320.00,443.33,367.67,338.67,463.00,258.00C554.33,182.00,667.33,144.00,802.00,144.00C964.00,144.00,1097.67,225.67,1203.00,389.00C1297.00,535.00,1344.00,699.00,1344.00,881.00C1344.00,1040.33,1308.33,1152.33,1237.00,1217.00C1169.00,1279.00,1054.00,1310.00,892.00,1310.00M682.00,1848.00C769.33,1848.00,813.00,1813.00,813.00,1743.00C813.00,1723.00,798.33,1703.67,769.00,1685.00C742.33,1668.33,717.33,1660.00,694.00,1660.00C612.00,1660.00,571.00,1694.33,571.00,1763.00C571.00,1782.33,583.33,1801.33,608.00,1820.00C632.67,1838.67,657.33,1848.00,682.00,1848.00M1221.00,1856.00C1243.67,1856.00,1266.67,1845.67,1290.00,1825.00C1313.33,1804.33,1325.00,1783.67,1325.00,1763.00C1325.00,1701.67,1277.33,1671.00,1182.00,1671.00C1154.67,1671.00,1130.33,1678.00,1109.00,1692.00C1085.00,1708.00,1073.00,1729.00,1073.00,1755.00C1073.00,1801.00,1088.00,1830.67,1118.00,1844.00C1134.67,1852.00,1169.00,1856.00,1221.00,1856.00"]
-              KCanvasItem {line} at (127.12,-54.49) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M4199.00,-3500.00L4199.00,2000.00"]
-              KCanvasItem {path} at (4207.06,-43.65) size 48.13x51.86 [transform={m=((1.00,0.00)(0.00,1.00)) t=(4199.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1306.00,412.00C1235.33,412.00,1174.33,422.33,1123.00,443.00C1071.67,463.67,1030.33,494.33,999.00,535.00C963.00,499.67,928.00,473.00,894.00,455.00C860.00,437.00,826.33,428.00,793.00,428.00C719.00,428.00,649.33,458.00,584.00,518.00C518.67,578.00,485.67,644.33,485.00,717.00C485.00,840.33,533.33,953.00,630.00,1055.00C726.67,1157.00,837.00,1208.00,961.00,1208.00C989.00,1208.00,1012.33,1197.67,1031.00,1177.00C1049.67,1156.33,1059.00,1131.33,1059.00,1102.00C1059.00,1062.00,1025.67,1032.33,959.00,1013.00C870.33,987.67,807.67,958.67,771.00,926.00C717.00,878.67,690.00,809.00,690.00,717.00C690.00,697.67,699.00,679.00,717.00,661.00C737.67,641.00,763.33,631.67,794.00,633.00C852.00,635.67,905.67,689.67,955.00,795.00C999.67,887.00,1039.33,933.00,1074.00,933.00C1102.00,933.00,1124.67,922.67,1142.00,902.00C1159.33,881.33,1168.00,856.00,1168.00,826.00C1168.00,812.67,1166.00,792.67,1162.00,766.00C1158.00,739.33,1155.67,719.33,1155.00,706.00C1155.00,662.67,1173.67,635.33,1211.00,624.00C1225.67,619.33,1257.33,617.00,1306.00,617.00C1397.33,617.00,1461.33,639.33,1498.00,684.00C1531.33,724.00,1548.00,790.33,1548.00,883.00C1548.00,1046.33,1482.33,1179.67,1351.00,1283.00C1231.00,1377.67,1087.67,1425.00,921.00,1425.00C727.00,1425.00,575.00,1351.67,465.00,1205.00C365.67,1074.33,316.00,910.00,316.00,712.00C316.00,529.33,374.33,375.33,491.00,250.00C612.33,119.33,768.33,54.00,959.00,54.00C1013.00,54.00,1074.00,64.33,1142.00,85.00L1317.00,150.00C1346.33,160.67,1365.33,166.00,1374.00,166.00C1401.33,166.00,1425.00,155.33,1445.00,134.00C1465.00,112.67,1475.00,87.33,1475.00,58.00C1475.00,-5.33,1404.00,-56.67,1262.00,-96.00C1154.67,-125.33,1054.33,-140.00,961.00,-140.00C867.00,-140.00,771.00,-122.00,673.00,-86.00C575.00,-50.00,490.67,-1.33,420.00,60.00C213.33,238.67,110.00,456.00,110.00,712.00C110.00,968.00,180.67,1182.00,322.00,1354.00C472.00,1538.00,671.67,1630.00,921.00,1630.00C1146.33,1630.00,1339.33,1562.33,1500.00,1427.00C1668.67,1283.67,1753.00,1102.33,1753.00,883.00C1753.00,733.00,1716.33,617.67,1643.00,537.00C1566.33,453.67,1454.00,412.00,1306.00,412.00"]
-              KCanvasItem {line} at (182.99,-54.49) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M6106.00,-3500.00L6106.00,2000.00"]
-              KCanvasItem {path} at (6113.91,-27.04) size 25.31x44.18 [transform={m=((1.00,0.00)(0.00,1.00)) t=(6106.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M770.00,-196.00C770.00,-278.67,750.00,-340.67,710.00,-382.00C670.00,-423.33,609.33,-444.33,528.00,-445.00C471.33,-445.00,417.67,-434.33,367.00,-413.00C303.00,-385.00,271.00,-346.67,271.00,-298.00C271.00,-262.00,293.67,-244.00,339.00,-244.00C363.00,-244.00,390.00,-252.00,420.00,-268.00C450.00,-284.00,482.33,-292.33,517.00,-293.00C549.67,-292.33,574.00,-284.33,590.00,-269.00C606.00,-253.67,614.00,-231.00,614.00,-201.00C614.00,-169.00,601.67,-140.33,577.00,-115.00C552.33,-89.67,514.33,-67.33,463.00,-48.00C357.00,-24.00,272.00,26.67,208.00,104.00C139.33,186.00,105.00,286.00,105.00,404.00C105.00,539.33,150.00,679.00,240.00,823.00C340.00,983.00,452.67,1063.00,578.00,1063.00C643.33,1063.00,716.33,1047.67,797.00,1017.00C899.00,977.67,950.00,929.67,950.00,873.00C950.00,847.67,941.67,825.33,925.00,806.00C908.33,786.67,887.67,776.67,863.00,776.00C843.67,776.00,827.00,781.67,813.00,793.00C799.00,804.33,785.00,816.00,771.00,828.00C731.67,859.33,667.33,875.00,578.00,875.00C510.00,875.00,442.67,814.33,376.00,693.00C315.33,581.67,285.00,485.33,285.00,404.00C285.00,316.00,315.00,246.67,375.00,196.00C431.00,148.67,503.00,125.00,591.00,125.00C631.00,125.00,673.67,135.67,719.00,157.00L835.00,219.00C855.00,229.67,869.33,235.00,878.00,235.00C902.67,235.00,924.00,225.33,942.00,206.00C960.00,186.67,969.00,164.00,969.00,138.00C969.00,69.33,883.67,10.00,713.00,-40.00C732.33,-65.33,746.67,-91.00,756.00,-117.00C765.33,-143.00,770.00,-169.33,770.00,-196.00"]
-              KCanvasItem {line} at (213.81,-54.49) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M7158.00,-3500.00L7158.00,2000.00"]
+            KCanvasContainer {g} at (164.27,81.41) size 211.17x161.13 [transform={m=((0.03,0.00)(0.00,0.03)) t=(0.00,0.00)}]
+              KCanvasItem {line} at (164.27,81.41) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,-3500.00L0.00,2000.00"]
+              KCanvasItem {path} at (168.84,96.70) size 35.77x44.18 [fill={[type=SOLID] [color=#000000]}] [data="M1250.00,-30.00C1188.67,-30.00,1135.33,48.67,1090.00,206.00C1072.67,266.00,1051.00,371.00,1025.00,521.00C957.00,511.67,868.00,495.00,758.00,471.00L492.00,416.00C458.67,328.67,401.67,201.00,321.00,33.00C299.67,-4.33,270.67,-23.00,234.00,-23.00C207.33,-23.00,183.67,-13.33,163.00,6.00C142.33,25.33,131.67,49.33,131.00,78.00C131.00,110.00,181.33,231.67,282.00,443.00C270.67,460.33,265.00,480.33,265.00,503.00C265.00,557.00,297.67,591.67,363.00,607.00C439.00,749.67,535.00,913.67,651.00,1099.00C809.00,1351.67,907.33,1478.00,946.00,1478.00C998.67,1478.00,1034.67,1441.33,1054.00,1368.00L1117.00,1032.00L1266.00,337.00L1323.00,179.00C1342.33,125.00,1352.00,89.00,1352.00,71.00C1352.00,42.33,1341.67,18.33,1321.00,-1.00C1300.33,-20.33,1276.67,-30.00,1250.00,-30.00M897.00,1113.00L611.00,652.00C691.67,672.67,814.00,697.67,978.00,727.00L897.00,1113.00"]
+              KCanvasItem {line} at (208.15,81.41) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M1498.00,-3500.00L1498.00,2000.00"]
+              KCanvasItem {path} at (208.77,109.53) size 30.12x47.43 [transform={m=((1.00,0.00)(0.00,1.00)) t=(1498.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1011.00,892.00L665.00,144.00C579.67,-38.00,514.33,-190.33,469.00,-313.00L403.00,-507.00C385.67,-555.00,355.67,-579.00,313.00,-579.00C285.00,-579.00,261.00,-570.00,241.00,-552.00C221.00,-534.00,210.67,-511.00,210.00,-483.00C210.00,-416.33,282.00,-223.33,426.00,96.00L68.00,785.00L23.00,858.00C5.00,888.67,-4.00,914.33,-4.00,935.00C-4.00,962.33,6.33,986.33,27.00,1007.00C47.67,1027.67,71.33,1038.00,98.00,1038.00C128.67,1038.00,152.33,1026.33,169.00,1003.00C282.33,845.67,404.00,621.67,534.00,331.00L682.00,676.00C735.33,795.33,786.67,898.00,836.00,984.00C857.33,1021.33,885.33,1040.00,920.00,1040.00C947.33,1040.00,971.33,1030.33,992.00,1011.00C1012.67,991.67,1023.33,968.67,1024.00,942.00C1024.00,927.33,1019.67,910.67,1011.00,892.00"]
+              KCanvasItem {line} at (239.38,81.41) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M2564.00,-3500.00L2564.00,2000.00"]
+              KCanvasItem {path} at (243.52,85.62) size 41.95x56.16 [transform={m=((1.00,0.00)(0.00,1.00)) t=(2564.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M802.00,-61.00C614.00,-61.00,454.67,-4.67,324.00,108.00C185.33,228.00,116.00,382.67,116.00,572.00C116.00,802.67,184.33,1012.33,321.00,1201.00C473.67,1410.33,664.00,1515.00,892.00,1515.00C1111.33,1515.00,1274.33,1465.67,1381.00,1367.00C1492.33,1264.33,1548.00,1102.33,1548.00,881.00C1548.00,650.33,1485.33,442.33,1360.00,257.00C1216.00,45.00,1030.00,-61.00,802.00,-61.00M892.00,1310.00C728.67,1310.00,590.33,1228.67,477.00,1066.00C372.33,916.67,320.00,752.00,320.00,572.00C320.00,443.33,367.67,338.67,463.00,258.00C554.33,182.00,667.33,144.00,802.00,144.00C964.00,144.00,1097.67,225.67,1203.00,389.00C1297.00,535.00,1344.00,699.00,1344.00,881.00C1344.00,1040.33,1308.33,1152.33,1237.00,1217.00C1169.00,1279.00,1054.00,1310.00,892.00,1310.00M682.00,1848.00C769.33,1848.00,813.00,1813.00,813.00,1743.00C813.00,1723.00,798.33,1703.67,769.00,1685.00C742.33,1668.33,717.33,1660.00,694.00,1660.00C612.00,1660.00,571.00,1694.33,571.00,1763.00C571.00,1782.33,583.33,1801.33,608.00,1820.00C632.67,1838.67,657.33,1848.00,682.00,1848.00M1221.00,1856.00C1243.67,1856.00,1266.67,1845.67,1290.00,1825.00C1313.33,1804.33,1325.00,1783.67,1325.00,1763.00C1325.00,1701.67,1277.33,1671.00,1182.00,1671.00C1154.67,1671.00,1130.33,1678.00,1109.00,1692.00C1085.00,1708.00,1073.00,1729.00,1073.00,1755.00C1073.00,1801.00,1088.00,1830.67,1118.00,1844.00C1134.67,1852.00,1169.00,1856.00,1221.00,1856.00"]
+              KCanvasItem {line} at (287.29,81.41) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M4199.00,-3500.00L4199.00,2000.00"]
+              KCanvasItem {path} at (291.24,92.25) size 48.13x51.86 [transform={m=((1.00,0.00)(0.00,1.00)) t=(4199.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1306.00,412.00C1235.33,412.00,1174.33,422.33,1123.00,443.00C1071.67,463.67,1030.33,494.33,999.00,535.00C963.00,499.67,928.00,473.00,894.00,455.00C860.00,437.00,826.33,428.00,793.00,428.00C719.00,428.00,649.33,458.00,584.00,518.00C518.67,578.00,485.67,644.33,485.00,717.00C485.00,840.33,533.33,953.00,630.00,1055.00C726.67,1157.00,837.00,1208.00,961.00,1208.00C989.00,1208.00,1012.33,1197.67,1031.00,1177.00C1049.67,1156.33,1059.00,1131.33,1059.00,1102.00C1059.00,1062.00,1025.67,1032.33,959.00,1013.00C870.33,987.67,807.67,958.67,771.00,926.00C717.00,878.67,690.00,809.00,690.00,717.00C690.00,697.67,699.00,679.00,717.00,661.00C737.67,641.00,763.33,631.67,794.00,633.00C852.00,635.67,905.67,689.67,955.00,795.00C999.67,887.00,1039.33,933.00,1074.00,933.00C1102.00,933.00,1124.67,922.67,1142.00,902.00C1159.33,881.33,1168.00,856.00,1168.00,826.00C1168.00,812.67,1166.00,792.67,1162.00,766.00C1158.00,739.33,1155.67,719.33,1155.00,706.00C1155.00,662.67,1173.67,635.33,1211.00,624.00C1225.67,619.33,1257.33,617.00,1306.00,617.00C1397.33,617.00,1461.33,639.33,1498.00,684.00C1531.33,724.00,1548.00,790.33,1548.00,883.00C1548.00,1046.33,1482.33,1179.67,1351.00,1283.00C1231.00,1377.67,1087.67,1425.00,921.00,1425.00C727.00,1425.00,575.00,1351.67,465.00,1205.00C365.67,1074.33,316.00,910.00,316.00,712.00C316.00,529.33,374.33,375.33,491.00,250.00C612.33,119.33,768.33,54.00,959.00,54.00C1013.00,54.00,1074.00,64.33,1142.00,85.00L1317.00,150.00C1346.33,160.67,1365.33,166.00,1374.00,166.00C1401.33,166.00,1425.00,155.33,1445.00,134.00C1465.00,112.67,1475.00,87.33,1475.00,58.00C1475.00,-5.33,1404.00,-56.67,1262.00,-96.00C1154.67,-125.33,1054.33,-140.00,961.00,-140.00C867.00,-140.00,771.00,-122.00,673.00,-86.00C575.00,-50.00,490.67,-1.33,420.00,60.00C213.33,238.67,110.00,456.00,110.00,712.00C110.00,968.00,180.67,1182.00,322.00,1354.00C472.00,1538.00,671.67,1630.00,921.00,1630.00C1146.33,1630.00,1339.33,1562.33,1500.00,1427.00C1668.67,1283.67,1753.00,1102.33,1753.00,883.00C1753.00,733.00,1716.33,617.67,1643.00,537.00C1566.33,453.67,1454.00,412.00,1306.00,412.00"]
+              KCanvasItem {line} at (343.15,81.41) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M6106.00,-3500.00L6106.00,2000.00"]
+              KCanvasItem {path} at (346.96,108.86) size 25.31x44.18 [transform={m=((1.00,0.00)(0.00,1.00)) t=(6106.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M770.00,-196.00C770.00,-278.67,750.00,-340.67,710.00,-382.00C670.00,-423.33,609.33,-444.33,528.00,-445.00C471.33,-445.00,417.67,-434.33,367.00,-413.00C303.00,-385.00,271.00,-346.67,271.00,-298.00C271.00,-262.00,293.67,-244.00,339.00,-244.00C363.00,-244.00,390.00,-252.00,420.00,-268.00C450.00,-284.00,482.33,-292.33,517.00,-293.00C549.67,-292.33,574.00,-284.33,590.00,-269.00C606.00,-253.67,614.00,-231.00,614.00,-201.00C614.00,-169.00,601.67,-140.33,577.00,-115.00C552.33,-89.67,514.33,-67.33,463.00,-48.00C357.00,-24.00,272.00,26.67,208.00,104.00C139.33,186.00,105.00,286.00,105.00,404.00C105.00,539.33,150.00,679.00,240.00,823.00C340.00,983.00,452.67,1063.00,578.00,1063.00C643.33,1063.00,716.33,1047.67,797.00,1017.00C899.00,977.67,950.00,929.67,950.00,873.00C950.00,847.67,941.67,825.33,925.00,806.00C908.33,786.67,887.67,776.67,863.00,776.00C843.67,776.00,827.00,781.67,813.00,793.00C799.00,804.33,785.00,816.00,771.00,828.00C731.67,859.33,667.33,875.00,578.00,875.00C510.00,875.00,442.67,814.33,376.00,693.00C315.33,581.67,285.00,485.33,285.00,404.00C285.00,316.00,315.00,246.67,375.00,196.00C431.00,148.67,503.00,125.00,591.00,125.00C631.00,125.00,673.67,135.67,719.00,157.00L835.00,219.00C855.00,229.67,869.33,235.00,878.00,235.00C902.67,235.00,924.00,225.33,942.00,206.00C960.00,186.67,969.00,164.00,969.00,138.00C969.00,69.33,883.67,10.00,713.00,-40.00C732.33,-65.33,746.67,-91.00,756.00,-117.00C765.33,-143.00,770.00,-169.33,770.00,-196.00"]
+              KCanvasItem {line} at (373.97,81.41) size 1.46x161.13 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M7158.00,-3500.00L7158.00,2000.00"]
         RenderSVGText {text} at (0,0) size 465x22
           RenderText {TEXT} at (0,0) size 74x22
             text run at (0,0) width 74: "SVG Font"

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 d42faa55e4d60e1e2f2d4226189c9bea738c9e1c..6382d1cb4ca010fee22f92dafaf73eb089c22798 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
   RenderCanvas at (0,0) size 480x360
-    KCanvasContainer {svg} at (0.50,0.50) size 479x359
-      KCanvasContainer {g} at (0,0) size 0x0
-        KCanvasContainer {g} at (0,0) size 0x0
+    KCanvasContainer {svg} at (0,0) size 479.50x359.50
+      KCanvasContainer {g} at (0,0) size 410x160
+        KCanvasContainer {g} at (0,0) 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 0x0
+        KCanvasContainer {g} at (0,0) 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/metadata-example-01-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/metadata-example-01-b-expected.txt
index 9517da8ba9b1a19cd8255b71e5bbc478a489e435..0862e276d8f87a6f5c7c68a03bd25f9bc7651f61 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/metadata-example-01-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/metadata-example-01-b-expected.txt
@@ -40,29 +40,29 @@ layer at (0,0) size 480x360
               KCanvasItem {path} at (125.27,184.80) size 18.46x9.97 [fill={[type=SOLID] [color=#000000]}] [data="M117.50,154.00C114.47,156.28,107.29,158.54,104.39,159.40C105.04,160.43,105.67,161.40,106.26,162.31C112.61,160.35,117.39,157.54,119.77,155.96C119.04,155.33,118.28,154.68,117.50,154.00"]
               KCanvasItem {path} at (109.36,160.51) size 9.84x6.08 [fill={[type=SOLID] [color=#000000]}] [data="M99.33,135.91C98.75,135.16,98.24,134.44,97.80,133.76C95.47,135.26,91.14,136.76,91.14,136.76C91.31,137.28,91.62,137.98,92.04,138.83C94.80,138.82,97.02,138.05,99.33,135.91"]
               KCanvasItem {path} at (73.96,43.26) size 12.15x10.35 [fill={[type=SOLID] [color=#000000]}] [data="M66.39,44.68C68.51,42.93,71.76,40.43,71.51,37.43L70.26,36.80L70.14,36.05C65.01,39.30,62.39,40.43,61.64,41.05C62.51,42.93,64.14,42.43,64.14,42.43C66.26,41.30,68.14,40.05,68.14,40.05C66.26,42.18,65.64,43.18,65.64,43.18C65.64,43.18,65.51,44.05,66.39,44.68"]
-        KCanvasContainer {g} at (164.23,38.61) size 44.74x32.81 [transform={m=((0.04,-0.02)(0.02,0.04)) t=(153.00,58.00)}]
-          KCanvasContainer {g} at (164.23,38.61) size 41.80x27.04
-            KCanvasItem {ellipse} at (167.17,62.18) size 3.95x3.48 [stroke={[type=SOLID] [color=#426942]}] [fill={[type=SOLID] [color=#73BF73]}] [data="M222.00,210.00L221.95,211.13L221.79,212.26L221.52,213.37L221.15,214.48L220.68,215.56L220.10,216.63L219.43,217.66L218.66,218.67L217.80,219.64L216.84,220.58L215.80,221.47L214.68,222.32L213.48,223.12L212.21,223.87L210.87,224.56L209.47,225.20L208.01,225.77L206.50,226.29L204.94,226.74L203.34,227.12L201.71,227.43L200.06,227.68L198.38,227.86L196.70,227.96L195.00,228.00L193.30,227.96L191.62,227.86L189.94,227.68L188.29,227.43L186.66,227.12L185.06,226.74L183.50,226.29L181.99,225.77L180.53,225.20L179.13,224.56L177.79,223.87L176.52,223.12L175.32,222.32L174.20,221.47L173.16,220.58L172.20,219.64L171.34,218.67L170.57,217.66L169.90,216.63L169.32,215.56L168.85,214.48L168.48,213.37L168.21,212.26L168.05,211.13L168.00,210.00L168.05,208.87L168.21,207.74L168.48,206.63L168.85,205.52L169.32,204.44L169.90,203.37L170.57,202.34L171.34,201.33L172.20,200.36L173.16,199.42L174.20,198.53L175.32,197.68L176.52,196.88L177.79,196.13L179.13,195.44L180.53,194.80L181.99,194.23L183.50,193.71L185.06,193.26L186.66,192.88L188.29,192.57L189.94,192.32L191.62,192.14L193.30,192.04L195.00,192.00L196.70,192.04L198.38,192.14L200.06,192.32L201.71,192.57L203.34,192.88L204.94,193.26L206.50,193.71L208.01,194.23L209.47,194.80L210.87,195.44L212.21,196.13L213.48,196.88L214.68,197.68L215.80,198.53L216.84,199.42L217.80,200.36L218.66,201.33L219.43,202.34L220.10,203.37L220.68,204.44L221.15,205.52L221.52,206.63L221.79,207.74L221.95,208.87"]
-            KCanvasItem {ellipse} at (177.70,38.75) size 25.12x14.27 [stroke={[type=SOLID] [color=#426942]}] [fill={[type=SOLID] [color=#73BF73]}] [data="M870.00,102.00L869.56,103.13L868.23,104.26L866.01,105.37L862.93,106.48L858.99,107.56L854.20,108.63L848.59,109.66L842.17,110.67L834.97,111.64L827.03,112.58L818.37,113.47L809.02,114.32L799.02,115.12L788.42,115.87L777.25,116.56L765.56,117.20L753.39,117.77L740.80,118.29L727.83,118.74L714.53,119.12L700.96,119.43L687.16,119.68L673.20,119.86L659.13,119.96L645.00,120.00L630.87,119.96L616.80,119.86L602.84,119.68L589.04,119.43L575.47,119.12L562.17,118.74L549.20,118.29L536.61,117.77L524.44,117.20L512.75,116.56L501.58,115.87L490.98,115.12L480.98,114.32L471.63,113.47L462.97,112.58L455.03,111.64L447.83,110.67L441.41,109.66L435.80,108.63L431.01,107.56L427.07,106.48L423.99,105.37L421.77,104.26L420.44,103.13L420.00,102.00L420.44,100.87L421.77,99.74L423.99,98.63L427.07,97.52L431.01,96.44L435.80,95.37L441.41,94.34L447.83,93.33L455.03,92.36L462.97,91.42L471.63,90.53L480.98,89.68L490.98,88.88L501.58,88.13L512.75,87.44L524.44,86.80L536.61,86.23L549.20,85.71L562.17,85.26L575.47,84.88L589.04,84.57L602.84,84.32L616.80,84.14L630.87,84.04L645.00,84.00L659.13,84.04L673.20,84.14L687.16,84.32L700.96,84.57L714.53,84.88L727.83,85.26L740.80,85.71L753.39,86.23L765.56,86.80L777.25,87.44L788.42,88.13L799.02,88.88L809.02,89.68L818.37,90.53L827.03,91.42L834.97,92.36L842.17,93.33L848.59,94.34L854.20,95.37L858.99,96.44L862.93,97.52L866.01,98.63L868.23,99.74L869.56,100.87"]
-            KCanvasItem {ellipse} at (178.90,41.50) size 25.66x14.54 [stroke={[type=SOLID] [color=#426942]}] [fill={[type=SOLID] [color=#73BF73]}] [data="M875.00,156.00L874.55,157.13L873.19,158.26L870.93,159.37L867.77,160.48L863.74,161.56L858.85,162.63L853.11,163.66L846.55,164.67L839.20,165.64L831.07,166.58L822.22,167.47L812.66,168.32L802.45,169.12L791.61,169.87L780.19,170.56L768.24,171.20L755.80,171.77L742.93,172.29L729.67,172.74L716.07,173.12L702.20,173.43L688.10,173.68L673.83,173.86L659.44,173.96L645.00,174.00L630.56,173.96L616.17,173.86L601.90,173.68L587.80,173.43L573.93,173.12L560.33,172.74L547.07,172.29L534.20,171.77L521.76,171.20L509.81,170.56L498.39,169.87L487.55,169.12L477.34,168.32L467.78,167.47L458.93,166.58L450.80,165.64L443.45,164.67L436.89,163.66L431.15,162.63L426.26,161.56L422.23,160.48L419.07,159.37L416.81,158.26L415.45,157.13L415.00,156.00L415.45,154.87L416.81,153.74L419.07,152.63L422.23,151.52L426.26,150.44L431.15,149.37L436.89,148.34L443.45,147.33L450.80,146.36L458.93,145.42L467.78,144.53L477.34,143.68L487.55,142.88L498.39,142.13L509.81,141.44L521.76,140.80L534.20,140.23L547.07,139.71L560.33,139.26L573.93,138.88L587.80,138.57L601.90,138.32L616.17,138.14L630.56,138.04L645.00,138.00L659.44,138.04L673.83,138.14L688.10,138.32L702.20,138.57L716.07,138.88L729.67,139.26L742.93,139.71L755.80,140.23L768.24,140.80L780.19,141.44L791.61,142.13L802.45,142.88L812.66,143.68L822.22,144.53L831.07,145.42L839.20,146.36L846.55,147.33L853.11,148.34L858.85,149.37L863.74,150.44L867.77,151.52L870.93,152.63L873.19,153.74L874.55,154.87"]
-          KCanvasContainer {g} at (185.29,46.90) size 18.76x15.30
-            KCanvasItem {rect} at (190.00,49.29) size 6.41x4.73 [stroke={[type=SOLID] [color=#847542]}] [fill={[type=SOLID] [color=#FFDF7B]}] [data="M595.00,192.00L695.00,192.00L695.00,228.00L595.00,228.00"]
-            KCanvasItem {rect} at (186.76,49.78) size 15.82x9.52 [stroke={[type=SOLID] [color=#847542]}] [fill={[type=SOLID] [color=#FFDF7B]}] [data="M507.00,246.00L783.00,246.00L783.00,282.00L507.00,282.00"]
-            KCanvasItem {rect} at (192.78,54.98) size 6.73x4.89 [stroke={[type=SOLID] [color=#847542]}] [fill={[type=SOLID] [color=#FFDF7B]}] [data="M592.00,300.00L698.00,300.00L698.00,336.00L592.00,336.00"]
-          KCanvasContainer {g} at (166.62,47.49) size 27.33x23.00
-            KCanvasItem {path} at (166.62,52.03) size 14.52x10.83 [stroke={[type=SOLID] [color=#5A59CE]}] [data="M201.00,193.00C212.00,170.00,215.00,158.00,240.00,143.00C279.00,122.00,377.00,112.00,428.00,107.00"]
-            KCanvasItem {path} at (168.91,55.06) size 12.17x7.78 [stroke={[type=SOLID] [color=#5A59CE]}] [data="M216.00,200.00C224.00,196.00,232.00,193.00,240.00,191.00C311.00,174.00,390.00,165.00,423.00,161.00"]
-            KCanvasItem {path} at (170.52,52.99) size 20.02x10.24 [stroke={[type=SOLID] [color=#5A59CE]}] [data="M221.00,210.00C295.00,210.00,497.00,210.00,595.00,210.00"]
-            KCanvasItem {path} at (170.52,52.99) size 20.02x10.24 [stroke={[type=SOLID] [color=#5A59CE]}] [data="M221.00,210.00C295.00,210.00,497.00,210.00,595.00,210.00"]
-            KCanvasItem {path} at (170.52,55.95) size 16.74x10.31 [stroke={[type=SOLID] [color=#5A59CE]}] [data="M216.00,220.00C224.00,224.00,232.00,227.00,240.00,229.00C334.00,252.00,444.00,261.00,506.00,264.00"]
-            KCanvasItem {path} at (169.90,54.00) size 23.90x16.49 [stroke={[type=SOLID] [color=#5A59CE]}] [data="M201.00,227.00C212.00,253.00,215.00,265.00,240.00,280.00C352.00,344.00,508.00,337.00,592.00,325.00"]
-          KCanvasContainer {g} at (178.26,47.16) size 15.78x16.99
-            KCanvasItem {polygon} at (178.53,51.71) size 0.65x0.65 [fill={[type=SOLID] [color=#5A59CE]}] [data="M433.00,107.00L425.00,111.00L425.00,103.00"]
-            KCanvasItem {polygon} at (179.73,54.73) size 0.65x0.65 [fill={[type=SOLID] [color=#5A59CE]}] [data="M428.00,160.00L421.00,165.00L420.00,157.00"]
-            KCanvasItem {polygon} at (190.26,52.67) size 0.65x0.65 [fill={[type=SOLID] [color=#5A59CE]}] [data="M600.00,210.00L592.00,214.00L592.00,206.00"]
-            KCanvasItem {polygon} at (186.97,57.98) size 0.65x0.65 [fill={[type=SOLID] [color=#5A59CE]}] [data="M511.00,264.00L503.00,268.00L503.00,260.00"]
-            KCanvasItem {polygon} at (193.18,58.90) size 0.70x0.67 [fill={[type=SOLID] [color=#5A59CE]}] [data="M597.00,324.00L590.00,329.00L588.00,321.00"]
-          KCanvasContainer {g} at (153,58) size 0x0
+        KCanvasContainer {g} at (194.83,50.21) size 44.74x32.81 [transform={m=((0.04,-0.02)(0.02,0.04)) t=(153.00,58.00)}]
+          KCanvasContainer {g} at (194.83,50.21) size 41.80x27.04
+            KCanvasItem {ellipse} at (197.77,73.78) size 3.95x3.48 [stroke={[type=SOLID] [color=#426942]}] [fill={[type=SOLID] [color=#73BF73]}] [data="M222.00,210.00L221.95,211.13L221.79,212.26L221.52,213.37L221.15,214.48L220.68,215.56L220.10,216.63L219.43,217.66L218.66,218.67L217.80,219.64L216.84,220.58L215.80,221.47L214.68,222.32L213.48,223.12L212.21,223.87L210.87,224.56L209.47,225.20L208.01,225.77L206.50,226.29L204.94,226.74L203.34,227.12L201.71,227.43L200.06,227.68L198.38,227.86L196.70,227.96L195.00,228.00L193.30,227.96L191.62,227.86L189.94,227.68L188.29,227.43L186.66,227.12L185.06,226.74L183.50,226.29L181.99,225.77L180.53,225.20L179.13,224.56L177.79,223.87L176.52,223.12L175.32,222.32L174.20,221.47L173.16,220.58L172.20,219.64L171.34,218.67L170.57,217.66L169.90,216.63L169.32,215.56L168.85,214.48L168.48,213.37L168.21,212.26L168.05,211.13L168.00,210.00L168.05,208.87L168.21,207.74L168.48,206.63L168.85,205.52L169.32,204.44L169.90,203.37L170.57,202.34L171.34,201.33L172.20,200.36L173.16,199.42L174.20,198.53L175.32,197.68L176.52,196.88L177.79,196.13L179.13,195.44L180.53,194.80L181.99,194.23L183.50,193.71L185.06,193.26L186.66,192.88L188.29,192.57L189.94,192.32L191.62,192.14L193.30,192.04L195.00,192.00L196.70,192.04L198.38,192.14L200.06,192.32L201.71,192.57L203.34,192.88L204.94,193.26L206.50,193.71L208.01,194.23L209.47,194.80L210.87,195.44L212.21,196.13L213.48,196.88L214.68,197.68L215.80,198.53L216.84,199.42L217.80,200.36L218.66,201.33L219.43,202.34L220.10,203.37L220.68,204.44L221.15,205.52L221.52,206.63L221.79,207.74L221.95,208.87"]
+            KCanvasItem {ellipse} at (208.30,50.35) size 25.12x14.27 [stroke={[type=SOLID] [color=#426942]}] [fill={[type=SOLID] [color=#73BF73]}] [data="M870.00,102.00L869.56,103.13L868.23,104.26L866.01,105.37L862.93,106.48L858.99,107.56L854.20,108.63L848.59,109.66L842.17,110.67L834.97,111.64L827.03,112.58L818.37,113.47L809.02,114.32L799.02,115.12L788.42,115.87L777.25,116.56L765.56,117.20L753.39,117.77L740.80,118.29L727.83,118.74L714.53,119.12L700.96,119.43L687.16,119.68L673.20,119.86L659.13,119.96L645.00,120.00L630.87,119.96L616.80,119.86L602.84,119.68L589.04,119.43L575.47,119.12L562.17,118.74L549.20,118.29L536.61,117.77L524.44,117.20L512.75,116.56L501.58,115.87L490.98,115.12L480.98,114.32L471.63,113.47L462.97,112.58L455.03,111.64L447.83,110.67L441.41,109.66L435.80,108.63L431.01,107.56L427.07,106.48L423.99,105.37L421.77,104.26L420.44,103.13L420.00,102.00L420.44,100.87L421.77,99.74L423.99,98.63L427.07,97.52L431.01,96.44L435.80,95.37L441.41,94.34L447.83,93.33L455.03,92.36L462.97,91.42L471.63,90.53L480.98,89.68L490.98,88.88L501.58,88.13L512.75,87.44L524.44,86.80L536.61,86.23L549.20,85.71L562.17,85.26L575.47,84.88L589.04,84.57L602.84,84.32L616.80,84.14L630.87,84.04L645.00,84.00L659.13,84.04L673.20,84.14L687.16,84.32L700.96,84.57L714.53,84.88L727.83,85.26L740.80,85.71L753.39,86.23L765.56,86.80L777.25,87.44L788.42,88.13L799.02,88.88L809.02,89.68L818.37,90.53L827.03,91.42L834.97,92.36L842.17,93.33L848.59,94.34L854.20,95.37L858.99,96.44L862.93,97.52L866.01,98.63L868.23,99.74L869.56,100.87"]
+            KCanvasItem {ellipse} at (209.50,53.10) size 25.66x14.54 [stroke={[type=SOLID] [color=#426942]}] [fill={[type=SOLID] [color=#73BF73]}] [data="M875.00,156.00L874.55,157.13L873.19,158.26L870.93,159.37L867.77,160.48L863.74,161.56L858.85,162.63L853.11,163.66L846.55,164.67L839.20,165.64L831.07,166.58L822.22,167.47L812.66,168.32L802.45,169.12L791.61,169.87L780.19,170.56L768.24,171.20L755.80,171.77L742.93,172.29L729.67,172.74L716.07,173.12L702.20,173.43L688.10,173.68L673.83,173.86L659.44,173.96L645.00,174.00L630.56,173.96L616.17,173.86L601.90,173.68L587.80,173.43L573.93,173.12L560.33,172.74L547.07,172.29L534.20,171.77L521.76,171.20L509.81,170.56L498.39,169.87L487.55,169.12L477.34,168.32L467.78,167.47L458.93,166.58L450.80,165.64L443.45,164.67L436.89,163.66L431.15,162.63L426.26,161.56L422.23,160.48L419.07,159.37L416.81,158.26L415.45,157.13L415.00,156.00L415.45,154.87L416.81,153.74L419.07,152.63L422.23,151.52L426.26,150.44L431.15,149.37L436.89,148.34L443.45,147.33L450.80,146.36L458.93,145.42L467.78,144.53L477.34,143.68L487.55,142.88L498.39,142.13L509.81,141.44L521.76,140.80L534.20,140.23L547.07,139.71L560.33,139.26L573.93,138.88L587.80,138.57L601.90,138.32L616.17,138.14L630.56,138.04L645.00,138.00L659.44,138.04L673.83,138.14L688.10,138.32L702.20,138.57L716.07,138.88L729.67,139.26L742.93,139.71L755.80,140.23L768.24,140.80L780.19,141.44L791.61,142.13L802.45,142.88L812.66,143.68L822.22,144.53L831.07,145.42L839.20,146.36L846.55,147.33L853.11,148.34L858.85,149.37L863.74,150.44L867.77,151.52L870.93,152.63L873.19,153.74L874.55,154.87"]
+          KCanvasContainer {g} at (215.89,58.50) size 18.76x15.30
+            KCanvasItem {rect} at (220.60,60.89) size 6.41x4.73 [stroke={[type=SOLID] [color=#847542]}] [fill={[type=SOLID] [color=#FFDF7B]}] [data="M595.00,192.00L695.00,192.00L695.00,228.00L595.00,228.00"]
+            KCanvasItem {rect} at (217.36,61.38) size 15.82x9.52 [stroke={[type=SOLID] [color=#847542]}] [fill={[type=SOLID] [color=#FFDF7B]}] [data="M507.00,246.00L783.00,246.00L783.00,282.00L507.00,282.00"]
+            KCanvasItem {rect} at (223.38,66.58) size 6.73x4.89 [stroke={[type=SOLID] [color=#847542]}] [fill={[type=SOLID] [color=#FFDF7B]}] [data="M592.00,300.00L698.00,300.00L698.00,336.00L592.00,336.00"]
+          KCanvasContainer {g} at (197.22,59.09) size 27.33x23.00
+            KCanvasItem {path} at (197.22,63.63) size 14.52x10.83 [stroke={[type=SOLID] [color=#5A59CE]}] [data="M201.00,193.00C212.00,170.00,215.00,158.00,240.00,143.00C279.00,122.00,377.00,112.00,428.00,107.00"]
+            KCanvasItem {path} at (199.51,66.66) size 12.17x7.78 [stroke={[type=SOLID] [color=#5A59CE]}] [data="M216.00,200.00C224.00,196.00,232.00,193.00,240.00,191.00C311.00,174.00,390.00,165.00,423.00,161.00"]
+            KCanvasItem {path} at (201.12,64.59) size 20.02x10.24 [stroke={[type=SOLID] [color=#5A59CE]}] [data="M221.00,210.00C295.00,210.00,497.00,210.00,595.00,210.00"]
+            KCanvasItem {path} at (201.12,64.59) size 20.02x10.24 [stroke={[type=SOLID] [color=#5A59CE]}] [data="M221.00,210.00C295.00,210.00,497.00,210.00,595.00,210.00"]
+            KCanvasItem {path} at (201.12,67.55) size 16.74x10.31 [stroke={[type=SOLID] [color=#5A59CE]}] [data="M216.00,220.00C224.00,224.00,232.00,227.00,240.00,229.00C334.00,252.00,444.00,261.00,506.00,264.00"]
+            KCanvasItem {path} at (200.50,65.60) size 23.90x16.49 [stroke={[type=SOLID] [color=#5A59CE]}] [data="M201.00,227.00C212.00,253.00,215.00,265.00,240.00,280.00C352.00,344.00,508.00,337.00,592.00,325.00"]
+          KCanvasContainer {g} at (208.86,58.76) size 15.78x16.99
+            KCanvasItem {polygon} at (209.13,63.31) size 0.65x0.65 [fill={[type=SOLID] [color=#5A59CE]}] [data="M433.00,107.00L425.00,111.00L425.00,103.00"]
+            KCanvasItem {polygon} at (210.33,66.33) size 0.65x0.65 [fill={[type=SOLID] [color=#5A59CE]}] [data="M428.00,160.00L421.00,165.00L420.00,157.00"]
+            KCanvasItem {polygon} at (220.86,64.27) size 0.65x0.65 [fill={[type=SOLID] [color=#5A59CE]}] [data="M600.00,210.00L592.00,214.00L592.00,206.00"]
+            KCanvasItem {polygon} at (217.57,69.58) size 0.65x0.65 [fill={[type=SOLID] [color=#5A59CE]}] [data="M511.00,264.00L503.00,268.00L503.00,260.00"]
+            KCanvasItem {polygon} at (223.78,70.50) size 0.70x0.67 [fill={[type=SOLID] [color=#5A59CE]}] [data="M597.00,324.00L590.00,329.00L588.00,321.00"]
+          KCanvasContainer {g} at (183.60,69.60) size 0x0
             RenderSVGText {text} at (0,0) size 465x12
               RenderText {TEXT} at (0,0) size 316x12
                 text run at (0,0) width 316: "http://prismstandard.org/vocabularies/1.0/resourcetype.xml#birdsEye"
@@ -81,7 +81,7 @@ layer at (0,0) size 480x360
             RenderSVGText {text} at (0,0) size 465x12
               RenderText {TEXT} at (0,0) size 74x12
                 text run at (0,0) width 74: "Sibyll Trelawney"
-          KCanvasContainer {g} at (153,58) size 0x0
+          KCanvasContainer {g} at (183.60,69.60) size 0x0
             RenderSVGText {text} at (0,0) size 465x12
               RenderText {TEXT} at (0,0) size 162x12
                 text run at (0,0) width 162: "http://purl.org/dc/elements/1.1/type"

diff --git a/LayoutTests/svg/W3C-SVG-1.1/painting-marker-01-f-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/painting-marker-01-f-expected.txt
index 9cf36c647084df3218bc28bc49b5bbd3fbb75481..3341c17fc2a94011546bba29f998c5e042ffd2d2 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/painting-marker-01-f-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/painting-marker-01-f-expected.txt
@@ -23,36 +23,36 @@ layer at (0,0) size 480x360
         KCanvasItem {path} at (130,36) size 54x54 [stroke={[type=SOLID] [color=#000000] [stroke width=8.00]}] [start marker=#marker1] [middle marker=#marker1] [end marker=#marker1] [data="M130.00,40.00L180.00,40.00L180.00,90.00"]
         KCanvasContainer {g} at (242,32) size 66x66 [transform={m=((1.00,0.00)(0.00,1.00)) t=(120.00,0.00)}]
           KCanvasItem {path} at (250,36) size 54x54 [stroke={[type=SOLID] [color=#000000] [stroke width=8.00]}] [data="M130.00,40.00L180.00,40.00L180.00,90.00"]
-          KCanvasContainer {g} at (314,32) size 16x16 [transform={m=((1.60,0.00)(0.00,1.60)) t=(122.00,32.00)}]
-            KCanvasItem {rect} at (314,32) size 16x16 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L10.00,0.00L10.00,10.00L0.00,10.00"]
-          KCanvasContainer {g} at (364,32) size 16x16 [transform={m=((1.60,0.00)(0.00,1.60)) t=(172.00,32.00)}]
-            KCanvasItem {rect} at (364,32) size 16x16 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L10.00,0.00L10.00,10.00L0.00,10.00"]
-          KCanvasContainer {g} at (364,82) size 16x16 [transform={m=((1.60,0.00)(0.00,1.60)) t=(172.00,82.00)}]
-            KCanvasItem {rect} at (364,82) size 16x16 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L10.00,0.00L10.00,10.00L0.00,10.00"]
+          KCanvasContainer {g} at (242,32) size 16x16 [transform={m=((1.60,0.00)(0.00,1.60)) t=(122.00,32.00)}]
+            KCanvasItem {rect} at (242,32) size 16x16 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L10.00,0.00L10.00,10.00L0.00,10.00"]
+          KCanvasContainer {g} at (292,32) size 16x16 [transform={m=((1.60,0.00)(0.00,1.60)) t=(172.00,32.00)}]
+            KCanvasItem {rect} at (292,32) size 16x16 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L10.00,0.00L10.00,10.00L0.00,10.00"]
+          KCanvasContainer {g} at (292,82) size 16x16 [transform={m=((1.60,0.00)(0.00,1.60)) t=(172.00,82.00)}]
+            KCanvasItem {rect} at (292,82) size 16x16 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L10.00,0.00L10.00,10.00L0.00,10.00"]
         RenderSVGText {text} at (0,0) size 465x16
           RenderText {TEXT} at (0,0) size 137x16
             text run at (0,0) width 137: "Start, Middle and End"
         KCanvasItem {path} at (130,131) size 54x54 [stroke={[type=SOLID] [color=#000000] [stroke width=8.00]}] [start marker=#markerStart] [middle marker=#markerMiddle] [end marker=#markerEnd] [data="M130.00,135.00L180.00,135.00L180.00,185.00"]
         KCanvasContainer {g} at (242,127) size 66x66 [transform={m=((1.00,0.00)(0.00,1.00)) t=(120.00,0.00)}]
           KCanvasItem {path} at (250,131) size 54x54 [stroke={[type=SOLID] [color=#000000] [stroke width=8.00]}] [data="M130.00,135.00L180.00,135.00L180.00,185.00"]
-          KCanvasContainer {g} at (314,127) size 16x16 [transform={m=((1.60,0.00)(0.00,1.60)) t=(122.00,127.00)}]
-            KCanvasItem {rect} at (314,127) size 16x16 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L10.00,0.00L10.00,10.00L0.00,10.00"]
-          KCanvasContainer {g} at (364,127) size 16x16 [transform={m=((1.60,0.00)(0.00,1.60)) t=(172.00,127.00)}]
-            KCanvasItem {circle} at (364,127) size 16x16 [fill={[type=SOLID] [color=#008000]}] [data="M10.00,5.00L9.99,5.31L9.96,5.63L9.91,5.94L9.84,6.24L9.76,6.55L9.65,6.84L9.52,7.13L9.38,7.41L9.22,7.68L9.05,7.94L8.85,8.19L8.64,8.42L8.42,8.64L8.19,8.85L7.94,9.05L7.68,9.22L7.41,9.38L7.13,9.52L6.84,9.65L6.55,9.76L6.24,9.84L5.94,9.91L5.63,9.96L5.31,9.99L5.00,10.00L4.69,9.99L4.37,9.96L4.06,9.91L3.76,9.84L3.45,9.76L3.16,9.65L2.87,9.52L2.59,9.38L2.32,9.22L2.06,9.05L1.81,8.85L1.58,8.64L1.36,8.42L1.15,8.19L0.95,7.94L0.78,7.68L0.62,7.41L0.48,7.13L0.35,6.84L0.24,6.55L0.16,6.24L0.09,5.94L0.04,5.63L0.01,5.31L0.00,5.00L0.01,4.69L0.04,4.37L0.09,4.06L0.16,3.76L0.24,3.45L0.35,3.16L0.48,2.87L0.62,2.59L0.78,2.32L0.95,2.06L1.15,1.81L1.36,1.58L1.58,1.36L1.81,1.15L2.06,0.95L2.32,0.78L2.59,0.62L2.87,0.48L3.16,0.35L3.45,0.24L3.76,0.16L4.06,0.09L4.37,0.04L4.69,0.01L5.00,0.00L5.31,0.01L5.63,0.04L5.94,0.09L6.24,0.16L6.55,0.24L6.84,0.35L7.13,0.48L7.41,0.62L7.68,0.78L7.94,0.95L8.19,1.15L8.42,1.36L8.64,1.58L8.85,1.81L9.05,2.06L9.22,2.32L9.38,2.59L9.52,2.87L9.65,3.16L9.76,3.45L9.84,3.76L9.91,4.06L9.96,4.37L9.99,4.69"]
-          KCanvasContainer {g} at (364,177) size 16x16 [transform={m=((1.60,0.00)(0.00,1.60)) t=(172.00,177.00)}]
-            KCanvasItem {path} at (364,177) size 16x16 [fill={[type=SOLID] [color=#0000FF]}] [data="M5.00,0.00L10.00,10.00L0.00,10.00"]
+          KCanvasContainer {g} at (242,127) size 16x16 [transform={m=((1.60,0.00)(0.00,1.60)) t=(122.00,127.00)}]
+            KCanvasItem {rect} at (242,127) size 16x16 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L10.00,0.00L10.00,10.00L0.00,10.00"]
+          KCanvasContainer {g} at (292,127) size 16x16 [transform={m=((1.60,0.00)(0.00,1.60)) t=(172.00,127.00)}]
+            KCanvasItem {circle} at (292,127) size 16x16 [fill={[type=SOLID] [color=#008000]}] [data="M10.00,5.00L9.99,5.31L9.96,5.63L9.91,5.94L9.84,6.24L9.76,6.55L9.65,6.84L9.52,7.13L9.38,7.41L9.22,7.68L9.05,7.94L8.85,8.19L8.64,8.42L8.42,8.64L8.19,8.85L7.94,9.05L7.68,9.22L7.41,9.38L7.13,9.52L6.84,9.65L6.55,9.76L6.24,9.84L5.94,9.91L5.63,9.96L5.31,9.99L5.00,10.00L4.69,9.99L4.37,9.96L4.06,9.91L3.76,9.84L3.45,9.76L3.16,9.65L2.87,9.52L2.59,9.38L2.32,9.22L2.06,9.05L1.81,8.85L1.58,8.64L1.36,8.42L1.15,8.19L0.95,7.94L0.78,7.68L0.62,7.41L0.48,7.13L0.35,6.84L0.24,6.55L0.16,6.24L0.09,5.94L0.04,5.63L0.01,5.31L0.00,5.00L0.01,4.69L0.04,4.37L0.09,4.06L0.16,3.76L0.24,3.45L0.35,3.16L0.48,2.87L0.62,2.59L0.78,2.32L0.95,2.06L1.15,1.81L1.36,1.58L1.58,1.36L1.81,1.15L2.06,0.95L2.32,0.78L2.59,0.62L2.87,0.48L3.16,0.35L3.45,0.24L3.76,0.16L4.06,0.09L4.37,0.04L4.69,0.01L5.00,0.00L5.31,0.01L5.63,0.04L5.94,0.09L6.24,0.16L6.55,0.24L6.84,0.35L7.13,0.48L7.41,0.62L7.68,0.78L7.94,0.95L8.19,1.15L8.42,1.36L8.64,1.58L8.85,1.81L9.05,2.06L9.22,2.32L9.38,2.59L9.52,2.87L9.65,3.16L9.76,3.45L9.84,3.76L9.91,4.06L9.96,4.37L9.99,4.69"]
+          KCanvasContainer {g} at (292,177) size 16x16 [transform={m=((1.60,0.00)(0.00,1.60)) t=(172.00,177.00)}]
+            KCanvasItem {path} at (292,177) size 16x16 [fill={[type=SOLID] [color=#0000FF]}] [data="M5.00,0.00L10.00,10.00L0.00,10.00"]
         RenderSVGText {text} at (0,0) size 465x16
           RenderText {TEXT} at (0,0) size 137x16
             text run at (0,0) width 137: "Automatic Orientation"
         KCanvasItem {path} at (130,226) size 54x54 [stroke={[type=SOLID] [color=#000000] [stroke width=8.00]}] [start marker=#marker2] [middle marker=#marker2] [end marker=#marker2] [data="M130.00,230.00L180.00,230.00L180.00,280.00"]
         KCanvasContainer {g} at (242,218.69) size 69.31x69.31 [transform={m=((1.00,0.00)(0.00,1.00)) t=(120.00,0.00)}]
           KCanvasItem {path} at (250,226) size 54x54 [stroke={[type=SOLID] [color=#000000] [stroke width=8.00]}] [data="M130.00,230.00L180.00,230.00L180.00,280.00"]
-          KCanvasContainer {g} at (314,222) size 16x16 [transform={m=((1.60,0.00)(0.00,1.60)) t=(122.00,222.00)}]
-            KCanvasItem {path} at (314,222) size 16x16 [fill={[type=SOLID] [color=#0000FF]}] [data="M5.00,0.00L10.00,10.00L0.00,10.00"]
-          KCanvasContainer {g} at (304.45,354.45) size 22.63x22.63 [transform={m=((1.13,1.13)(-1.13,1.13)) t=(180.00,218.69)}]
-            KCanvasItem {path} at (304.45,354.45) size 22.63x22.63 [fill={[type=SOLID] [color=#0000FF]}] [data="M5.00,0.00L10.00,10.00L0.00,10.00"]
-          KCanvasContainer {g} at (172.00,464) size 16x16 [transform={m=((-0.00,1.60)(-1.60,-0.00)) t=(188.00,272.00)}]
-            KCanvasItem {path} at (172.00,464) size 16x16 [fill={[type=SOLID] [color=#0000FF]}] [data="M5.00,0.00L10.00,10.00L0.00,10.00"]
+          KCanvasContainer {g} at (242,222) size 16x16 [transform={m=((1.60,0.00)(0.00,1.60)) t=(122.00,222.00)}]
+            KCanvasItem {path} at (242,222) size 16x16 [fill={[type=SOLID] [color=#0000FF]}] [data="M5.00,0.00L10.00,10.00L0.00,10.00"]
+          KCanvasContainer {g} at (288.69,218.69) size 22.63x22.63 [transform={m=((1.13,1.13)(-1.13,1.13)) t=(180.00,218.69)}]
+            KCanvasItem {path} at (288.69,218.69) size 22.63x22.63 [fill={[type=SOLID] [color=#0000FF]}] [data="M5.00,0.00L10.00,10.00L0.00,10.00"]
+          KCanvasContainer {g} at (292,272) size 16x16 [transform={m=((-0.00,1.60)(-1.60,-0.00)) t=(188.00,272.00)}]
+            KCanvasItem {path} at (292,272) size 16x16 [fill={[type=SOLID] [color=#0000FF]}] [data="M5.00,0.00L10.00,10.00L0.00,10.00"]
       RenderSVGText {text} at (0,0) size 465x46
         RenderText {TEXT} at (0,0) size 264x46
           text run at (0,0) width 264: "$Revision: 1.1 $"

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 7f512853cde1212ae43cd362962c337746d890db..45a157774ed32d359e13ac584254a3795e627271 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
@@ -20,18 +20,18 @@ layer at (0,0) size 480x360
           KCanvasItem {path} at (30,60) size 50x50 [fill={[type=SOLID] [color=#000000]}] [start marker=#marker1] [middle marker=#marker1] [end marker=#marker1] [data="M30.00,60.00L80.00,60.00L80.00,110.00"]
           KCanvasContainer {g} at (142,52) size 66x66 [transform={m=((1.00,0.00)(0.00,1.00)) t=(120.00,0.00)}]
             KCanvasItem {path} at (150,60) size 50x50 [fill={[type=SOLID] [color=#000000]}] [data="M30.00,60.00L80.00,60.00L80.00,110.00"]
-            KCanvasContainer {g} at (982,52) size 16x16 [transform={m=((8.00,0.00)(0.00,8.00)) t=(22.00,52.00)}]
-              KCanvasContainer {g} at (982,52) size 16x16 [clip path="#overflowHiddenClip1"]
-                KCanvasContainer {g} at (196.40,10.40) size 16x16 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
-                  KCanvasItem {rect} at (196.40,10.40) size 16x16 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00L10.00,0.00L10.00,10.00L0.00,10.00"]
-            KCanvasContainer {g} at (1032,52) size 16x16 [transform={m=((8.00,0.00)(0.00,8.00)) t=(72.00,52.00)}]
-              KCanvasContainer {g} at (1032,52) size 16x16 [clip path="#overflowHiddenClip1"]
-                KCanvasContainer {g} at (206.40,10.40) size 16x16 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
-                  KCanvasItem {rect} at (206.40,10.40) size 16x16 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00L10.00,0.00L10.00,10.00L0.00,10.00"]
-            KCanvasContainer {g} at (1032,102) size 16x16 [transform={m=((8.00,0.00)(0.00,8.00)) t=(72.00,102.00)}]
-              KCanvasContainer {g} at (1032,102) size 16x16 [clip path="#overflowHiddenClip1"]
-                KCanvasContainer {g} at (206.40,20.40) size 16x16 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
-                  KCanvasItem {rect} at (206.40,20.40) size 16x16 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00L10.00,0.00L10.00,10.00L0.00,10.00"]
+            KCanvasContainer {g} at (142,52) size 16x16 [transform={m=((8.00,0.00)(0.00,8.00)) t=(22.00,52.00)}]
+              KCanvasContainer {g} at (142,52) size 16x16 [clip path="#overflowHiddenClip1"]
+                KCanvasContainer {g} at (142,52) size 16x16 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
+                  KCanvasItem {rect} at (142,52) size 16x16 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00L10.00,0.00L10.00,10.00L0.00,10.00"]
+            KCanvasContainer {g} at (192,52) size 16x16 [transform={m=((8.00,0.00)(0.00,8.00)) t=(72.00,52.00)}]
+              KCanvasContainer {g} at (192,52) size 16x16 [clip path="#overflowHiddenClip1"]
+                KCanvasContainer {g} at (192,52) size 16x16 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
+                  KCanvasItem {rect} at (192,52) size 16x16 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00L10.00,0.00L10.00,10.00L0.00,10.00"]
+            KCanvasContainer {g} at (192,102) size 16x16 [transform={m=((8.00,0.00)(0.00,8.00)) t=(72.00,102.00)}]
+              KCanvasContainer {g} at (192,102) size 16x16 [clip path="#overflowHiddenClip1"]
+                KCanvasContainer {g} at (192,102) size 16x16 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
+                  KCanvasItem {rect} at (192,102) size 16x16 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00L10.00,0.00L10.00,10.00L0.00,10.00"]
         KCanvasContainer {g} at (-2,-2) size 451.60x121.60
           KCanvasContainer {marker} at (-2,-2) size 24x24
             KCanvasItem {rect} at (-2,-2) size 24x24 [stroke={[type=SOLID] [color=#000000] [stroke width=4.00]}] [data="M0.00,0.00L20.00,0.00L20.00,20.00L0.00,20.00"]
@@ -41,18 +41,18 @@ layer at (0,0) size 480x360
           KCanvasItem {path} at (265.17,58) size 56.83x56.83 [stroke={[type=SOLID] [color=#000000] [stroke width=4.00]}] [start marker=#marker2] [middle marker=#marker2] [end marker=#marker2] [data="M270.00,60.00L320.00,60.00L320.00,110.00"]
           KCanvasContainer {g} at (380.40,50.40) size 69.20x69.20 [transform={m=((1.00,0.00)(0.00,1.00)) t=(120.00,0.00)}]
             KCanvasItem {path} at (385.17,58) size 56.83x56.83 [stroke={[type=SOLID] [color=#000000] [stroke width=4.00]}] [data="M270.00,60.00L320.00,60.00L320.00,110.00"]
-            KCanvasContainer {g} at (740.40,50.40) size 19.20x19.20 [transform={m=((4.00,0.00)(0.00,4.00)) t=(262.00,52.00)}]
-              KCanvasContainer {g} at (740.40,50.40) size 19.20x19.20 [clip path="#overflowHiddenClip"]
-                KCanvasContainer {g} at (146.80,8.80) size 19.20x19.20 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
-                  KCanvasItem {rect} at (146.80,8.80) size 19.20x19.20 [stroke={[type=SOLID] [color=#000000] [stroke width=4.00]}] [data="M0.00,0.00L20.00,0.00L20.00,20.00L0.00,20.00"]
-            KCanvasContainer {g} at (790.40,50.40) size 19.20x19.20 [transform={m=((4.00,0.00)(0.00,4.00)) t=(312.00,52.00)}]
-              KCanvasContainer {g} at (790.40,50.40) size 19.20x19.20 [clip path="#overflowHiddenClip"]
-                KCanvasContainer {g} at (156.80,8.80) size 19.20x19.20 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
-                  KCanvasItem {rect} at (156.80,8.80) size 19.20x19.20 [stroke={[type=SOLID] [color=#000000] [stroke width=4.00]}] [data="M0.00,0.00L20.00,0.00L20.00,20.00L0.00,20.00"]
-            KCanvasContainer {g} at (790.40,100.40) size 19.20x19.20 [transform={m=((4.00,0.00)(0.00,4.00)) t=(312.00,102.00)}]
-              KCanvasContainer {g} at (790.40,100.40) size 19.20x19.20 [clip path="#overflowHiddenClip"]
-                KCanvasContainer {g} at (156.80,18.80) size 19.20x19.20 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
-                  KCanvasItem {rect} at (156.80,18.80) size 19.20x19.20 [stroke={[type=SOLID] [color=#000000] [stroke width=4.00]}] [data="M0.00,0.00L20.00,0.00L20.00,20.00L0.00,20.00"]
+            KCanvasContainer {g} at (380.40,50.40) size 19.20x19.20 [transform={m=((4.00,0.00)(0.00,4.00)) t=(262.00,52.00)}]
+              KCanvasContainer {g} at (380.40,50.40) size 19.20x19.20 [clip path="#overflowHiddenClip"]
+                KCanvasContainer {g} at (380.40,50.40) size 19.20x19.20 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
+                  KCanvasItem {rect} at (380.40,50.40) size 19.20x19.20 [stroke={[type=SOLID] [color=#000000] [stroke width=4.00]}] [data="M0.00,0.00L20.00,0.00L20.00,20.00L0.00,20.00"]
+            KCanvasContainer {g} at (430.40,50.40) size 19.20x19.20 [transform={m=((4.00,0.00)(0.00,4.00)) t=(312.00,52.00)}]
+              KCanvasContainer {g} at (430.40,50.40) size 19.20x19.20 [clip path="#overflowHiddenClip"]
+                KCanvasContainer {g} at (430.40,50.40) size 19.20x19.20 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
+                  KCanvasItem {rect} at (430.40,50.40) size 19.20x19.20 [stroke={[type=SOLID] [color=#000000] [stroke width=4.00]}] [data="M0.00,0.00L20.00,0.00L20.00,20.00L0.00,20.00"]
+            KCanvasContainer {g} at (430.40,100.40) size 19.20x19.20 [transform={m=((4.00,0.00)(0.00,4.00)) t=(312.00,102.00)}]
+              KCanvasContainer {g} at (430.40,100.40) size 19.20x19.20 [clip path="#overflowHiddenClip"]
+                KCanvasContainer {g} at (430.40,100.40) size 19.20x19.20 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
+                  KCanvasItem {rect} at (430.40,100.40) size 19.20x19.20 [stroke={[type=SOLID] [color=#000000] [stroke width=4.00]}] [data="M0.00,0.00L20.00,0.00L20.00,20.00L0.00,20.00"]
         KCanvasContainer {g} at (-4,-4) size 28x28
           KCanvasContainer {marker} at (-4,-4) size 28x28
             KCanvasItem {rect} at (-4,-4) size 28x28 [stroke={[type=SOLID] [color=#000000] [stroke width=8.00]}] [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00L20.00,0.00L20.00,20.00L0.00,20.00"]
@@ -66,18 +66,18 @@ layer at (0,0) size 480x360
           KCanvasContainer {g} at (138.80,178.80) size 72.40x72.40 [transform={m=((1.00,0.00)(0.00,1.00)) t=(120.00,0.00)}]
             KCanvasItem {path} at (145.17,188) size 56.83x56.83 [stroke={[type=SOLID] [color=#800080] [stroke width=4.00]}] [fill={[type=SOLID] [color=#FF0000]}] [data="M30.00,190.00L80.00,190.00L80.00,240.00"]
             KCanvasContainer {g} at (138.80,178.80) size 72.40x72.40
-              KCanvasContainer {g} at (498.80,178.80) size 22.40x22.40 [transform={m=((4.00,0.00)(0.00,4.00)) t=(22.00,182.00)}]
-                KCanvasContainer {g} at (498.80,178.80) size 22.40x22.40 [clip path="#overflowHiddenClip"]
-                  KCanvasContainer {g} at (97.20,33.20) size 22.40x22.40 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
-                    KCanvasItem {rect} at (97.20,33.20) size 22.40x22.40 [stroke={[type=SOLID] [color=#000000] [stroke width=8.00]}] [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00L20.00,0.00L20.00,20.00L0.00,20.00"]
-              KCanvasContainer {g} at (548.80,178.80) size 22.40x22.40 [transform={m=((4.00,0.00)(0.00,4.00)) t=(72.00,182.00)}]
-                KCanvasContainer {g} at (548.80,178.80) size 22.40x22.40 [clip path="#overflowHiddenClip"]
-                  KCanvasContainer {g} at (107.20,33.20) size 22.40x22.40 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
-                    KCanvasItem {rect} at (107.20,33.20) size 22.40x22.40 [stroke={[type=SOLID] [color=#000000] [stroke width=8.00]}] [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00L20.00,0.00L20.00,20.00L0.00,20.00"]
-              KCanvasContainer {g} at (548.80,228.80) size 22.40x22.40 [transform={m=((4.00,0.00)(0.00,4.00)) t=(72.00,232.00)}]
-                KCanvasContainer {g} at (548.80,228.80) size 22.40x22.40 [clip path="#overflowHiddenClip"]
-                  KCanvasContainer {g} at (107.20,43.20) size 22.40x22.40 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
-                    KCanvasItem {rect} at (107.20,43.20) size 22.40x22.40 [stroke={[type=SOLID] [color=#000000] [stroke width=8.00]}] [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00L20.00,0.00L20.00,20.00L0.00,20.00"]
+              KCanvasContainer {g} at (138.80,178.80) size 22.40x22.40 [transform={m=((4.00,0.00)(0.00,4.00)) t=(22.00,182.00)}]
+                KCanvasContainer {g} at (138.80,178.80) size 22.40x22.40 [clip path="#overflowHiddenClip"]
+                  KCanvasContainer {g} at (138.80,178.80) size 22.40x22.40 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
+                    KCanvasItem {rect} at (138.80,178.80) size 22.40x22.40 [stroke={[type=SOLID] [color=#000000] [stroke width=8.00]}] [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00L20.00,0.00L20.00,20.00L0.00,20.00"]
+              KCanvasContainer {g} at (188.80,178.80) size 22.40x22.40 [transform={m=((4.00,0.00)(0.00,4.00)) t=(72.00,182.00)}]
+                KCanvasContainer {g} at (188.80,178.80) size 22.40x22.40 [clip path="#overflowHiddenClip"]
+                  KCanvasContainer {g} at (188.80,178.80) size 22.40x22.40 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
+                    KCanvasItem {rect} at (188.80,178.80) size 22.40x22.40 [stroke={[type=SOLID] [color=#000000] [stroke width=8.00]}] [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00L20.00,0.00L20.00,20.00L0.00,20.00"]
+              KCanvasContainer {g} at (188.80,228.80) size 22.40x22.40 [transform={m=((4.00,0.00)(0.00,4.00)) t=(72.00,232.00)}]
+                KCanvasContainer {g} at (188.80,228.80) size 22.40x22.40 [clip path="#overflowHiddenClip"]
+                  KCanvasContainer {g} at (188.80,228.80) size 22.40x22.40 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
+                    KCanvasItem {rect} at (188.80,228.80) size 22.40x22.40 [stroke={[type=SOLID] [color=#000000] [stroke width=8.00]}] [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00L20.00,0.00L20.00,20.00L0.00,20.00"]
         KCanvasContainer {g} at (265.17,178.80) size 186.03x72.40
           RenderSVGText {text} at (0,0) size 465x11
             RenderText {TEXT} at (0,0) size 77x11
@@ -86,18 +86,18 @@ layer at (0,0) size 480x360
           KCanvasContainer {g} at (378.80,178.80) size 72.40x72.40 [transform={m=((1.00,0.00)(0.00,1.00)) t=(120.00,0.00)}]
             KCanvasItem {path} at (385.17,188) size 56.83x56.83 [stroke={[type=SOLID] [color=#800080] [stroke width=4.00]}] [fill={[type=SOLID] [color=#FF0000]}] [data="M270.00,190.00L320.00,190.00L320.00,240.00"]
             KCanvasContainer {g} at (378.80,178.80) size 72.40x72.40
-              KCanvasContainer {g} at (738.80,178.80) size 22.40x22.40 [transform={m=((4.00,0.00)(0.00,4.00)) t=(262.00,182.00)}]
-                KCanvasContainer {g} at (738.80,178.80) size 22.40x22.40 [clip path="#overflowHiddenClip"]
-                  KCanvasContainer {g} at (293.60,69.60) size 22.40x22.40 [transform={m=((0.40,0.00)(0.00,0.40)) t=(0.00,0.00)}]
-                    KCanvasItem {rect} at (293.60,69.60) size 22.40x22.40 [stroke={[type=SOLID] [color=#0000FF] [stroke width=4.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00L10.00,0.00L10.00,10.00L0.00,10.00"]
-              KCanvasContainer {g} at (788.80,178.80) size 22.40x22.40 [transform={m=((4.00,0.00)(0.00,4.00)) t=(312.00,182.00)}]
-                KCanvasContainer {g} at (788.80,178.80) size 22.40x22.40 [clip path="#overflowHiddenClip"]
-                  KCanvasContainer {g} at (313.60,69.60) size 22.40x22.40 [transform={m=((0.40,0.00)(0.00,0.40)) t=(0.00,0.00)}]
-                    KCanvasItem {rect} at (313.60,69.60) size 22.40x22.40 [stroke={[type=SOLID] [color=#0000FF] [stroke width=4.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00L10.00,0.00L10.00,10.00L0.00,10.00"]
-              KCanvasContainer {g} at (788.80,228.80) size 22.40x22.40 [transform={m=((4.00,0.00)(0.00,4.00)) t=(312.00,232.00)}]
-                KCanvasContainer {g} at (788.80,228.80) size 22.40x22.40 [clip path="#overflowHiddenClip"]
-                  KCanvasContainer {g} at (313.60,89.60) size 22.40x22.40 [transform={m=((0.40,0.00)(0.00,0.40)) t=(0.00,0.00)}]
-                    KCanvasItem {rect} at (313.60,89.60) size 22.40x22.40 [stroke={[type=SOLID] [color=#0000FF] [stroke width=4.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00L10.00,0.00L10.00,10.00L0.00,10.00"]
+              KCanvasContainer {g} at (378.80,178.80) size 22.40x22.40 [transform={m=((4.00,0.00)(0.00,4.00)) t=(262.00,182.00)}]
+                KCanvasContainer {g} at (378.80,178.80) size 22.40x22.40 [clip path="#overflowHiddenClip"]
+                  KCanvasContainer {g} at (378.80,178.80) size 22.40x22.40 [transform={m=((0.40,0.00)(0.00,0.40)) t=(0.00,0.00)}]
+                    KCanvasItem {rect} at (378.80,178.80) size 22.40x22.40 [stroke={[type=SOLID] [color=#0000FF] [stroke width=4.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00L10.00,0.00L10.00,10.00L0.00,10.00"]
+              KCanvasContainer {g} at (428.80,178.80) size 22.40x22.40 [transform={m=((4.00,0.00)(0.00,4.00)) t=(312.00,182.00)}]
+                KCanvasContainer {g} at (428.80,178.80) size 22.40x22.40 [clip path="#overflowHiddenClip"]
+                  KCanvasContainer {g} at (428.80,178.80) size 22.40x22.40 [transform={m=((0.40,0.00)(0.00,0.40)) t=(0.00,0.00)}]
+                    KCanvasItem {rect} at (428.80,178.80) size 22.40x22.40 [stroke={[type=SOLID] [color=#0000FF] [stroke width=4.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00L10.00,0.00L10.00,10.00L0.00,10.00"]
+              KCanvasContainer {g} at (428.80,228.80) size 22.40x22.40 [transform={m=((4.00,0.00)(0.00,4.00)) t=(312.00,232.00)}]
+                KCanvasContainer {g} at (428.80,228.80) size 22.40x22.40 [clip path="#overflowHiddenClip"]
+                  KCanvasContainer {g} at (428.80,228.80) size 22.40x22.40 [transform={m=((0.40,0.00)(0.00,0.40)) t=(0.00,0.00)}]
+                    KCanvasItem {rect} at (428.80,228.80) size 22.40x22.40 [stroke={[type=SOLID] [color=#0000FF] [stroke width=4.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00L10.00,0.00L10.00,10.00L0.00,10.00"]
       RenderSVGText {text} at (0,0) size 465x46
         RenderText {TEXT} at (0,0) size 264x46
           text run at (0,0) width 264: "$Revision: 1.1 $"

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 ea102d70db7d5acafd484087c8c264ea3ad4e8dd..1507a9ca5321a64ab633197f4dad29b46d7bb7f9 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
   RenderCanvas at (0,0) size 480x360
-    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)}]
+    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)}]
           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 (126,99) size 234x126 [opacity=0.50]
+          KCanvasContainer {g} at (0,0) size 360x225 [opacity=0.50]
             RenderSVGText {text} at (0,0) size 465x138
               RenderText {TEXT} at (0,0) size 253x138
                 text run at (0,0) width 253: "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 11aaea0f35d1f0ffde0bf3254a3a8e02f9074721..4fc64905af411eec89d517f13d1ed82cb9de0f68 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
   RenderCanvas at (0,0) size 480x360
-    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)}]
+    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)}]
           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 573d3766ffa0ec2c1f568c6ea0e45135a04b7f98..f572fd450e8f8567718e64728855058256b36d49 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
   RenderCanvas at (0,0) size 480x360
-    KCanvasContainer {svg} at (0.50,0.50) size 479x359
-      KCanvasContainer {g} at (0,0) size 0x0
+    KCanvasContainer {svg} at (0,0) size 479.50x359.50
+      KCanvasContainer {g} at (0,0) size 240x150
         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-02-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/struct-image-02-b-expected.txt
index f0f46a1b1c3e430f5dde539061afe0c335be1c49..7e453e334e9cdc68e31403988f95fe0d9b824bce 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/struct-image-02-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/struct-image-02-b-expected.txt
@@ -2,9 +2,9 @@ layer at (0,0) size 480x360
   RenderCanvas at (0,0) size 480x360
     KCanvasContainer {svg} at (0,0) size 480x359.50
       KCanvasContainer {g} at (0,0) size 480x300
-        KCanvasContainer {g} at (0,0) size 0x0
-          KCanvasContainer {use} at (0,0) size 0x0
-            KCanvasContainer {g} at (0,0) size 0x0
+        KCanvasContainer {g} at (0,0) size 240x150
+          KCanvasContainer {use} at (0,0) size 240x150
+            KCanvasContainer {g} at (0,0) size 240x150
               RenderImage {image} at (0,0) size 240x150
         KCanvasContainer {g} at (0,0) size 240x225
           KCanvasContainer {use} at (0,0) size 240x225

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 03972ee62244baf8a46b9d0872801e3b8cfaed29..f98c26cd0ba129f554765759890b882474a349bc 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
   RenderCanvas at (0,0) size 480x360
-    KCanvasContainer {svg} at (0.50,0.50) size 479x359
-      KCanvasContainer {g} at (23,13) size 434x224
+    KCanvasContainer {svg} at (0,0) size 479.50x359.50
+      KCanvasContainer {g} at (0,0) size 457x237
         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 c162053236047dc8da792625e2307cc941589ccb..a60aa15df990e47fb7b22f591f1ab775ba455418 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
   RenderCanvas at (0,0) size 480x360
-    KCanvasContainer {svg} at (0.50,0.50) size 479x359
-      KCanvasContainer {g} at (0,0) size 0x0
+    KCanvasContainer {svg} at (0,0) size 479.50x359.50
+      KCanvasContainer {g} at (0,0) size 240x150
         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-05-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/struct-image-05-b-expected.txt
index 7e2b0d29077ca276f23662a254922e24d917945b..6dd87b2c2adcb7ee415ba1bfd136a3dbd8e6668b 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/struct-image-05-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/struct-image-05-b-expected.txt
@@ -1,7 +1,7 @@
 layer at (0,0) size 480x360
   RenderCanvas at (0,0) size 480x360
-    KCanvasContainer {svg} at (0.50,0.50) size 479x359
-      KCanvasContainer {g} at (0,0) size 0x0
+    KCanvasContainer {svg} at (0,0) size 479.50x359.50
+      KCanvasContainer {g} at (0,0) size 240x150
         RenderImage {image} at (0,0) size 240x150
       RenderSVGText {text} at (0,0) size 465x46
         RenderText {TEXT} at (0,0) size 264x46

diff --git a/LayoutTests/svg/W3C-SVG-1.1/struct-symbol-01-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/struct-symbol-01-b-expected.txt
index d29d0474f58de2cd69f526b66aa40ed96aac39d4..e527f4f79c345955ee90b1f9d708df1f65687185 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/struct-symbol-01-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/struct-symbol-01-b-expected.txt
@@ -1,19 +1,19 @@
 layer at (0,0) size 480x360
   RenderCanvas at (0,0) size 480x360
-    KCanvasContainer {svg} at (0.50,0.50) size 1239.50x1149.50
-      KCanvasContainer {g} at (240,150) size 1000x1000
-        KCanvasContainer {g} at (240,150) size 1000x1000
-          KCanvasContainer {use} at (0,0) size 0x0
-            KCanvasContainer {g} at (0,0) size 0x0
-              KCanvasContainer {svg} at (45,0) size 0x0
+    KCanvasContainer {svg} at (0,0) size 1240x1150
+      KCanvasContainer {g} at (0,0) size 1240x1150
+        KCanvasContainer {g} at (0,0) size 1240x1150
+          KCanvasContainer {use} at (0,0) size 1000x1000
+            KCanvasContainer {g} at (0,0) size 1000x1000
+              KCanvasContainer {svg} at (45,0) size 150x150
                 RenderImage {image} at (0,0) size 1000x1000
           KCanvasContainer {use} at (240,150) size 1000x1000
             KCanvasContainer {g} at (240,150) size 1000x1000 [transform={m=((1.00,0.00)(0.00,1.00)) t=(240.00,150.00)}]
-              KCanvasContainer {svg} at (81,22.50) size 150x150
-                KCanvasItem {rect} at (81,22.50) size 75x75 [fill={[type=SOLID] [color=#FFFF00]}] [data="M0.00,0.00L500.00,0.00L500.00,500.00L0.00,500.00"]
-                KCanvasItem {rect} at (156,22.50) size 75x75 [fill={[type=SOLID] [color=#FF0000]}] [data="M500.00,0.00L1000.00,0.00L1000.00,500.00L500.00,500.00"]
-                KCanvasItem {rect} at (81,97.50) size 75x75 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,500.00L500.00,500.00L500.00,1000.00L0.00,1000.00"]
-                KCanvasItem {rect} at (156,97.50) size 75x75 [fill={[type=SOLID] [color=#FFFF00]}] [data="M500.00,500.00L1000.00,500.00L1000.00,1000.00L500.00,1000.00"]
+              KCanvasContainer {svg} at (285,150) size 150x150
+                KCanvasItem {rect} at (285,150) size 75x75 [fill={[type=SOLID] [color=#FFFF00]}] [data="M0.00,0.00L500.00,0.00L500.00,500.00L0.00,500.00"]
+                KCanvasItem {rect} at (360,150) size 75x75 [fill={[type=SOLID] [color=#FF0000]}] [data="M500.00,0.00L1000.00,0.00L1000.00,500.00L500.00,500.00"]
+                KCanvasItem {rect} at (285,225) size 75x75 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,500.00L500.00,500.00L500.00,1000.00L0.00,1000.00"]
+                KCanvasItem {rect} at (360,225) size 75x75 [fill={[type=SOLID] [color=#FFFF00]}] [data="M500.00,500.00L1000.00,500.00L1000.00,1000.00L500.00,1000.00"]
       RenderSVGText {text} at (0,0) size 465x46
         RenderText {TEXT} at (0,0) size 264x46
           text run at (0,0) width 264: "$Revision: 1.3 $"

diff --git a/LayoutTests/svg/W3C-SVG-1.1/styling-css-02-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/styling-css-02-b-expected.txt
index 441c57112eda4f3aa5f54b3590595b9891f65337..c95a068d2aab678eadde25a9ff391be61d325d09 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/styling-css-02-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/styling-css-02-b-expected.txt
@@ -25,7 +25,7 @@ layer at (0,0) size 480x360
             RenderText {TEXT} at (0,0) size 269x18
               text run at (0,0) width 269: "and the selector [transform=\"scale(2)\"]"
           KCanvasContainer {g} at (130,220) size 260x60
-            KCanvasItem {circle} at (130,370) size 60x60 [transform={m=((2.00,0.00)(0.00,2.00)) t=(0.00,0.00)}] [fill={[type=SOLID] [color=#FF0000]}] [data="M95.00,50.00L94.97,50.94L94.88,51.88L94.73,52.81L94.53,53.73L94.27,54.64L93.95,55.52L93.57,56.39L93.14,57.23L92.66,58.04L92.14,58.82L91.56,59.56L90.93,60.27L90.27,60.93L89.56,61.56L88.82,62.14L88.04,62.66L87.23,63.14L86.39,63.57L85.52,63.95L84.64,64.27L83.73,64.53L82.81,64.73L81.88,64.88L80.94,64.97L80.00,65.00L79.06,64.97L78.12,64.88L77.19,64.73L76.27,64.53L75.36,64.27L74.48,63.95L73.61,63.57L72.77,63.14L71.96,62.66L71.18,62.14L70.44,61.56L69.73,60.93L69.07,60.27L68.44,59.56L67.86,58.82L67.34,58.04L66.86,57.23L66.43,56.39L66.05,55.52L65.73,54.64L65.47,53.73L65.27,52.81L65.12,51.88L65.03,50.94L65.00,50.00L65.03,49.06L65.12,48.12L65.27,47.19L65.47,46.27L65.73,45.36L66.05,44.48L66.43,43.61L66.86,42.77L67.34,41.96L67.86,41.18L68.44,40.44L69.07,39.73L69.73,39.07L70.44,38.44L71.18,37.86L71.96,37.34L72.77,36.86L73.61,36.43L74.48,36.05L75.36,35.73L76.27,35.47L77.19,35.27L78.12,35.12L79.06,35.03L80.00,35.00L80.94,35.03L81.88,35.12L82.81,35.27L83.73,35.47L84.64,35.73L85.52,36.05L86.39,36.43L87.23,36.86L88.04,37.34L88.82,37.86L89.56,38.44L90.27,39.07L90.93,39.73L91.56,40.44L92.14,41.18L92.66,41.96L93.14,42.77L93.57,43.61L93.95,44.48L94.27,45.36L94.53,46.27L94.73,47.19L94.88,48.12L94.97,49.06"]
+            KCanvasItem {circle} at (130,220) size 60x60 [transform={m=((2.00,0.00)(0.00,2.00)) t=(0.00,0.00)}] [fill={[type=SOLID] [color=#FF0000]}] [data="M95.00,50.00L94.97,50.94L94.88,51.88L94.73,52.81L94.53,53.73L94.27,54.64L93.95,55.52L93.57,56.39L93.14,57.23L92.66,58.04L92.14,58.82L91.56,59.56L90.93,60.27L90.27,60.93L89.56,61.56L88.82,62.14L88.04,62.66L87.23,63.14L86.39,63.57L85.52,63.95L84.64,64.27L83.73,64.53L82.81,64.73L81.88,64.88L80.94,64.97L80.00,65.00L79.06,64.97L78.12,64.88L77.19,64.73L76.27,64.53L75.36,64.27L74.48,63.95L73.61,63.57L72.77,63.14L71.96,62.66L71.18,62.14L70.44,61.56L69.73,60.93L69.07,60.27L68.44,59.56L67.86,58.82L67.34,58.04L66.86,57.23L66.43,56.39L66.05,55.52L65.73,54.64L65.47,53.73L65.27,52.81L65.12,51.88L65.03,50.94L65.00,50.00L65.03,49.06L65.12,48.12L65.27,47.19L65.47,46.27L65.73,45.36L66.05,44.48L66.43,43.61L66.86,42.77L67.34,41.96L67.86,41.18L68.44,40.44L69.07,39.73L69.73,39.07L70.44,38.44L71.18,37.86L71.96,37.34L72.77,36.86L73.61,36.43L74.48,36.05L75.36,35.73L76.27,35.47L77.19,35.27L78.12,35.12L79.06,35.03L80.00,35.00L80.94,35.03L81.88,35.12L82.81,35.27L83.73,35.47L84.64,35.73L85.52,36.05L86.39,36.43L87.23,36.86L88.04,37.34L88.82,37.86L89.56,38.44L90.27,39.07L90.93,39.73L91.56,40.44L92.14,41.18L92.66,41.96L93.14,42.77L93.57,43.61L93.95,44.48L94.27,45.36L94.53,46.27L94.73,47.19L94.88,48.12L94.97,49.06"]
             KCanvasItem {rect} at (220,230) size 60x40 [fill={[type=SOLID] [color=#FF0000]}] [data="M220.00,80.00L280.00,80.00L280.00,120.00L220.00,120.00"]
             KCanvasItem {polygon} at (300,220) size 90x50 [fill={[type=SOLID] [color=#008000]}] [data="M300.00,100.00L320.00,120.00L340.00,110.00L360.00,120.00L390.00,90.00L340.00,70.00"]
       RenderSVGText {text} at (0,0) size 465x46

diff --git a/LayoutTests/svg/W3C-SVG-1.1/text-text-01-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/text-text-01-b-expected.txt
index a74151b7551520a4926a9cc996a299cfa5d91edb..5487e781278110f1209509e05e8fd4300c7ba85c 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/text-text-01-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/text-text-01-b-expected.txt
@@ -36,22 +36,22 @@ layer at (0,0) size 480x360
             RenderSVGText {text} at (0,0) size 465x10
               RenderText {TEXT} at (0,0) size 85x10
                 text run at (0,0) width 85: "lengthAdjust: default"
-        KCanvasContainer {g} at (4.50,116.50) size 420x13.50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,22.00)}]
-          KCanvasContainer {g} at (0,22) size 0x0
+        KCanvasContainer {g} at (4.50,160.50) size 420x13.50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,22.00)}]
+          KCanvasContainer {g} at (0,66) size 0x0
             RenderSVGText {text} at (0,0) size 465x10
               RenderText {TEXT} at (0,0) size 61x10
                 text run at (0,0) width 61: "Line to Stretch"
             RenderSVGText {text} at (0,0) size 465x10
               RenderText {TEXT} at (0,0) size 99x10
                 text run at (0,0) width 99: "this is a line to squeeze"
-          KCanvasContainer {g} at (4.50,116.50) size 420x13.50
-            KCanvasItem {line} at (6,116.50) size 201x3 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M2.00,32.00L69.00,32.00"]
-            KCanvasItem {line} at (4.50,118) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M2.00,32.00L2.00,36.00"]
-            KCanvasItem {line} at (205.50,118) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M69.00,32.00L69.00,36.00"]
-            KCanvasItem {line} at (222,116.50) size 201x3 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M74.00,32.00L141.00,32.00"]
-            KCanvasItem {line} at (220.50,118) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M74.00,32.00L74.00,36.00"]
-            KCanvasItem {line} at (421.50,118) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M141.00,32.00L141.00,36.00"]
-          KCanvasContainer {g} at (0,22) size 0x0
+          KCanvasContainer {g} at (4.50,160.50) size 420x13.50
+            KCanvasItem {line} at (6,160.50) size 201x3 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M2.00,32.00L69.00,32.00"]
+            KCanvasItem {line} at (4.50,162) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M2.00,32.00L2.00,36.00"]
+            KCanvasItem {line} at (205.50,162) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M69.00,32.00L69.00,36.00"]
+            KCanvasItem {line} at (222,160.50) size 201x3 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M74.00,32.00L141.00,32.00"]
+            KCanvasItem {line} at (220.50,162) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M74.00,32.00L74.00,36.00"]
+            KCanvasItem {line} at (421.50,162) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M141.00,32.00L141.00,36.00"]
+          KCanvasContainer {g} at (0,66) size 0x0
             RenderSVGText {text} at (0,0) size 465x10
               RenderText {TEXT} at (0,0) size 96x10
                 text run at (0,0) width 96: "textLength: 25% longer"
@@ -64,22 +64,22 @@ layer at (0,0) size 480x360
             RenderSVGText {text} at (0,0) size 465x10
               RenderText {TEXT} at (0,0) size 85x10
                 text run at (0,0) width 85: "lengthAdjust: default"
-        KCanvasContainer {g} at (4.50,138.50) size 420x13.50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,44.00)}]
-          KCanvasContainer {g} at (0,44) size 0x0
+        KCanvasContainer {g} at (4.50,226.50) size 420x13.50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,44.00)}]
+          KCanvasContainer {g} at (0,132) size 0x0
             RenderSVGText {text} at (0,0) size 465x10
               RenderText {TEXT} at (0,0) size 61x10
                 text run at (0,0) width 61: "Line to Stretch"
             RenderSVGText {text} at (0,0) size 465x10
               RenderText {TEXT} at (0,0) size 99x10
                 text run at (0,0) width 99: "this is a line to squeeze"
-          KCanvasContainer {g} at (4.50,138.50) size 420x13.50
-            KCanvasItem {line} at (6,138.50) size 201x3 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M2.00,32.00L69.00,32.00"]
-            KCanvasItem {line} at (4.50,140) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M2.00,32.00L2.00,36.00"]
-            KCanvasItem {line} at (205.50,140) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M69.00,32.00L69.00,36.00"]
-            KCanvasItem {line} at (222,138.50) size 201x3 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M74.00,32.00L141.00,32.00"]
-            KCanvasItem {line} at (220.50,140) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M74.00,32.00L74.00,36.00"]
-            KCanvasItem {line} at (421.50,140) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M141.00,32.00L141.00,36.00"]
-          KCanvasContainer {g} at (0,44) size 0x0
+          KCanvasContainer {g} at (4.50,226.50) size 420x13.50
+            KCanvasItem {line} at (6,226.50) size 201x3 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M2.00,32.00L69.00,32.00"]
+            KCanvasItem {line} at (4.50,228) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M2.00,32.00L2.00,36.00"]
+            KCanvasItem {line} at (205.50,228) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M69.00,32.00L69.00,36.00"]
+            KCanvasItem {line} at (222,226.50) size 201x3 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M74.00,32.00L141.00,32.00"]
+            KCanvasItem {line} at (220.50,228) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M74.00,32.00L74.00,36.00"]
+            KCanvasItem {line} at (421.50,228) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M141.00,32.00L141.00,36.00"]
+          KCanvasContainer {g} at (0,132) size 0x0
             RenderSVGText {text} at (0,0) size 465x10
               RenderText {TEXT} at (0,0) size 96x10
                 text run at (0,0) width 96: "textLength: 25% longer"
@@ -92,22 +92,22 @@ layer at (0,0) size 480x360
             RenderSVGText {text} at (0,0) size 465x10
               RenderText {TEXT} at (0,0) size 89x10
                 text run at (0,0) width 89: "lengthAdjust: spacing"
-        KCanvasContainer {g} at (4.50,160.50) size 420x13.50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,66.00)}]
-          KCanvasContainer {g} at (0,66) size 0x0
+        KCanvasContainer {g} at (4.50,292.50) size 420x13.50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,66.00)}]
+          KCanvasContainer {g} at (0,198) size 0x0
             RenderSVGText {text} at (0,0) size 465x10
               RenderText {TEXT} at (0,0) size 61x10
                 text run at (0,0) width 61: "Line to Stretch"
             RenderSVGText {text} at (0,0) size 465x10
               RenderText {TEXT} at (0,0) size 99x10
                 text run at (0,0) width 99: "this is a line to squeeze"
-          KCanvasContainer {g} at (4.50,160.50) size 420x13.50
-            KCanvasItem {line} at (6,160.50) size 201x3 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M2.00,32.00L69.00,32.00"]
-            KCanvasItem {line} at (4.50,162) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M2.00,32.00L2.00,36.00"]
-            KCanvasItem {line} at (205.50,162) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M69.00,32.00L69.00,36.00"]
-            KCanvasItem {line} at (222,160.50) size 201x3 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M74.00,32.00L141.00,32.00"]
-            KCanvasItem {line} at (220.50,162) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M74.00,32.00L74.00,36.00"]
-            KCanvasItem {line} at (421.50,162) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M141.00,32.00L141.00,36.00"]
-          KCanvasContainer {g} at (0,66) size 0x0
+          KCanvasContainer {g} at (4.50,292.50) size 420x13.50
+            KCanvasItem {line} at (6,292.50) size 201x3 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M2.00,32.00L69.00,32.00"]
+            KCanvasItem {line} at (4.50,294) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M2.00,32.00L2.00,36.00"]
+            KCanvasItem {line} at (205.50,294) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M69.00,32.00L69.00,36.00"]
+            KCanvasItem {line} at (222,292.50) size 201x3 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M74.00,32.00L141.00,32.00"]
+            KCanvasItem {line} at (220.50,294) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M74.00,32.00L74.00,36.00"]
+            KCanvasItem {line} at (421.50,294) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M141.00,32.00L141.00,36.00"]
+          KCanvasContainer {g} at (0,198) size 0x0
             RenderSVGText {text} at (0,0) size 465x10
               RenderText {TEXT} at (0,0) size 96x10
                 text run at (0,0) width 96: "textLength: 25% longer"

diff --git a/LayoutTests/svg/custom/filter-source-alpha-expected.txt b/LayoutTests/svg/custom/filter-source-alpha-expected.txt
index 5fdea59fa7b3e1c4f1035229fca6dcb128c5c05e..cc44eba7aefa8d04de29ae1046c659bf427415a0 100644 (file)
--- a/LayoutTests/svg/custom/filter-source-alpha-expected.txt
+++ b/LayoutTests/svg/custom/filter-source-alpha-expected.txt
@@ -1,4 +1,4 @@
-KCanvasResource {id="filter" [type=FILTER]  [bounding box=at (-10,-10) size 120x120] [effect bounding box mode=0] [effects=[[type=GAUSSIAN-BLUR] [in="SourceAlpha"] [result="blur"] [subregion="at (0,0) size 800x600"] [std dev. x=0.00 y=0.00], [type=MERGE]  [subregion="at (0,0) size 800x600"][merge inputs=[blur, SourceGraphic]]]]}
+KCanvasResource {id="filter" [type=FILTER]  [bounding box=at (-0.10,-0.10) size 1.20x1.20] [effect bounding box mode=0] [effects=[[type=GAUSSIAN-BLUR] [in="SourceAlpha"] [result="blur"] [subregion="at (0,0) size 800x600"] [std dev. x=0.00 y=0.00], [type=MERGE]  [subregion="at (0,0) size 800x600"][merge inputs=[blur, SourceGraphic]]]]}
 layer at (0,0) size 800x600
   RenderCanvas at (0,0) size 800x600
     KCanvasContainer {svg} at (0,0) size 100x100

diff --git a/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.checksum b/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.checksum
index 6ff90d3792fda2ed8699f987e45ba970cfbfa89d..d205be1ab9b458908e176e1a2b12dbd37c1054c5 100644 (file)
--- a/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.checksum
+++ b/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.checksum
@@ -1 +1 @@
-f97fe31c2c456d256af1322050e567a5
\ No newline at end of file
+182759b6095940303b94ee810fc6edb5
\ No newline at end of file

diff --git a/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.png b/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.png
index 4dc23b0bcd4765b9fdc6ed702e19d379d8382841..31b2b4eddd74d132e42ad4aea037ad09f8ba6509 100644 (file)
Binary files a/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.png and b/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.png differ

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 372d13b8923f1e34b3fc92876d243b0f56c3997d..15f1e4febe2afcd8cfcad3ac37b37354a18e68ac 100644 (file)
--- a/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.txt
+++ b/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.txt
@@ -1,8 +1,8 @@
 KCanvasResource {id="myclip" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=M0.00,0.00L100.00,0.00L100.00,100.00L0.00,100.00]]]}
-KCanvasResource {id="myfilter" [type=FILTER]  [bounding box=at (-10,-10) size 120x120] [effect bounding box mode=0] [effects=[[type=GAUSSIAN-BLUR]  [subregion="at (0,0) size 800x600"] [std dev. x=10.00 y=10.00]]]}
+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
   RenderCanvas at (0,0) size 800x600
-    KCanvasContainer {svg} at (0,0) size 0x0
+    KCanvasContainer {svg} at (0,-100) 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/junk-data-expected.checksum b/LayoutTests/svg/custom/junk-data-expected.checksum
index 6fa3c527ae5600f7f146d3d35747bb9410157eb2..905b9ac7d6d19ba732ebb32d9147558b5ea775ed 100644 (file)
--- a/LayoutTests/svg/custom/junk-data-expected.checksum
+++ b/LayoutTests/svg/custom/junk-data-expected.checksum
@@ -1 +1 @@
-3eaee9f2c172cba5c66d3638fabde0b3
\ No newline at end of file
+def82f43ecc2db8350f67f600761cd26
\ No newline at end of file

diff --git a/LayoutTests/svg/custom/junk-data-expected.png b/LayoutTests/svg/custom/junk-data-expected.png
index cbc37f2d45c88cf428521fd7ad889f6f69d07fa0..f728971ef2cf8fb0e3f2db4fa24b91bc366383ff 100644 (file)
Binary files a/LayoutTests/svg/custom/junk-data-expected.png and b/LayoutTests/svg/custom/junk-data-expected.png differ

diff --git a/LayoutTests/svg/custom/junk-data-expected.txt b/LayoutTests/svg/custom/junk-data-expected.txt
index d01e4c9995f6db2dbc7ce3ffec57a94072aaa4ca..985d8a0ed4a6a46a0911262519037494cffb49ba 100644 (file)
--- a/LayoutTests/svg/custom/junk-data-expected.txt
+++ b/LayoutTests/svg/custom/junk-data-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 785x730
+layer at (0,0) size 785x742
   RenderCanvas at (0,0) size 785x600
-layer at (0,0) size 785x156
-  RenderBlock {HTML} at (0,0) size 785x156
-    RenderBody {BODY} at (8,18) size 769x130
+layer at (0,0) size 785x742
+  RenderBlock {HTML} at (0,0) size 785x742
+    RenderBody {BODY} at (8,18) size 769x716
       RenderBlock (anonymous) at (0,0) size 769x0
         RenderInline {PARSERERROR} at (0,0) size 0x0 [bgcolor=#FFDDDD] [border: (2px solid #CC7777)]
       RenderBlock (anonymous) at (0,0) size 769x94
@@ -15,7 +15,7 @@ layer at (0,0) size 785x156
         RenderBlock {H3} at (0,72) size 769x22
           RenderText {TEXT} at (0,0) size 429x22
             text run at (0,0) width 429: "Below is a rendering of the page up to the first error."
-      RenderBlock (anonymous) at (0,112) size 769x18
+      RenderBlock (anonymous) at (0,112) size 769x604
         RenderInline {PARSERERROR} at (0,0) size 0x0 [bgcolor=#FFDDDD] [border: (2px solid #CC7777)]
         KCanvasContainer {svg} at (8,130) size 100x100
           RenderSVGText {text} at (0,0) size 769x18

diff --git a/LayoutTests/svg/custom/missing-xlink-expected.checksum b/LayoutTests/svg/custom/missing-xlink-expected.checksum
index 7b996237441d09f2600859c6cc9d9271c8a9ac69..81480d96fbcedf377224c1fd216f30f8855db8c4 100644 (file)
--- a/LayoutTests/svg/custom/missing-xlink-expected.checksum
+++ b/LayoutTests/svg/custom/missing-xlink-expected.checksum
@@ -1 +1 @@
-4f129c10741d25112276bec387acea2c
\ No newline at end of file
+66e4f31194a6c66d4c0e4abfba0e8e50
\ No newline at end of file

diff --git a/LayoutTests/svg/custom/missing-xlink-expected.png b/LayoutTests/svg/custom/missing-xlink-expected.png
index d560696e4338208b598e0f440dc65158d23c711f..7eb31f8e8b9b32dfcc8f7c6a8bc8732ea00bc598 100644 (file)
Binary files a/LayoutTests/svg/custom/missing-xlink-expected.png and b/LayoutTests/svg/custom/missing-xlink-expected.png differ

diff --git a/LayoutTests/svg/custom/missing-xlink-expected.txt b/LayoutTests/svg/custom/missing-xlink-expected.txt
index a7346b1da887a54f4645ef06667168158cf48111..64dffd54c08061889d8600b702239d16db9348fc 100644 (file)
--- a/LayoutTests/svg/custom/missing-xlink-expected.txt
+++ b/LayoutTests/svg/custom/missing-xlink-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 785x730
+layer at (0,0) size 785x742
   RenderCanvas at (0,0) size 785x600
-layer at (0,0) size 785x156
-  RenderBlock {HTML} at (0,0) size 785x156
-    RenderBody {BODY} at (8,18) size 769x130
+layer at (0,0) size 785x742
+  RenderBlock {HTML} at (0,0) size 785x742
+    RenderBody {BODY} at (8,18) size 769x716
       RenderBlock (anonymous) at (0,0) size 769x0
         RenderInline {PARSERERROR} at (0,0) size 0x0 [bgcolor=#FFDDDD] [border: (2px solid #CC7777)]
       RenderBlock (anonymous) at (0,0) size 769x94
@@ -15,7 +15,7 @@ layer at (0,0) size 785x156
         RenderBlock {H3} at (0,72) size 769x22
           RenderText {TEXT} at (0,0) size 429x22
             text run at (0,0) width 429: "Below is a rendering of the page up to the first error."
-      RenderBlock (anonymous) at (0,112) size 769x18
+      RenderBlock (anonymous) at (0,112) size 769x604
         RenderInline {PARSERERROR} at (0,0) size 0x0 [bgcolor=#FFDDDD] [border: (2px solid #CC7777)]
         KCanvasContainer {svg} at (8,130) size 100x100
           RenderSVGText {text} at (0,0) size 769x18

diff --git a/LayoutTests/svg/custom/simpleCDF-expected.checksum b/LayoutTests/svg/custom/simpleCDF-expected.checksum
index a9c2ffcc2fcef9aaa9acf4fe78288e1995c0ea61..a8217548c5ab897850e38e3f7db952a2788fbdb5 100644 (file)
--- a/LayoutTests/svg/custom/simpleCDF-expected.checksum
+++ b/LayoutTests/svg/custom/simpleCDF-expected.checksum
@@ -1 +1 @@
-81315fd7a09e33bcf06fc6b91fdf918e
\ No newline at end of file
+39b8d733b1579942396ebff569bc4a57
\ No newline at end of file

diff --git a/LayoutTests/svg/custom/simpleCDF-expected.png b/LayoutTests/svg/custom/simpleCDF-expected.png
index c9e4b65876739c79e8e04d802e0f852ee4d841db..c7d5df78f64b79f9a593be1f0eee8f6073a6c11f 100644 (file)
Binary files a/LayoutTests/svg/custom/simpleCDF-expected.png and b/LayoutTests/svg/custom/simpleCDF-expected.png differ

diff --git a/LayoutTests/svg/custom/simpleCDF-expected.txt b/LayoutTests/svg/custom/simpleCDF-expected.txt
index ac93f3aef8b54db7e0b65011f1aee02832cdaaa9..264842137eeb32d3bb7ba9c06b03580d4d06f214 100644 (file)
--- a/LayoutTests/svg/custom/simpleCDF-expected.txt
+++ b/LayoutTests/svg/custom/simpleCDF-expected.txt
@@ -1,15 +1,15 @@
 layer at (0,0) size 800x600
   RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x118
-  RenderBlock {HTML} at (0,0) size 800x118
-    RenderBody {BODY} at (8,16) size 784x86
+layer at (0,0) size 800x304
+  RenderBlock {HTML} at (0,0) size 800x304
+    RenderBody {BODY} at (8,16) size 784x272
       RenderBlock {P} at (0,0) size 784x18
         RenderText {TEXT} at (0,0) size 135x18
           text run at (0,0) width 135: "This is a test of CDF:"
-      RenderBlock (anonymous) at (0,34) size 784x18
+      RenderBlock (anonymous) at (0,34) size 784x204
         KCanvasContainer {svg} at (8,50) size 200x200
           KCanvasItem {rect} at (8,50) size 200x200 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00L200.00,0.00L200.00,200.00L0.00,200.00"]
         RenderText {TEXT} at (0,0) size 0x0
-      RenderBlock {P} at (0,68) size 784x18
+      RenderBlock {P} at (0,254) size 784x18
         RenderText {TEXT} at (0,0) size 269x18
           text run at (0,0) width 269: "You should see an SVG image above this!"

diff --git a/LayoutTests/svg/custom/text-filter-expected.checksum b/LayoutTests/svg/custom/text-filter-expected.checksum
index 774439f65d31a9fd211e51923f5db0fed0ba116c..3bcde7e6ec5458634b375b9819cffe80384c2230 100644 (file)
--- a/LayoutTests/svg/custom/text-filter-expected.checksum
+++ b/LayoutTests/svg/custom/text-filter-expected.checksum
@@ -1 +1 @@
-7f843dddfdabff32e3635aea5329069b
\ No newline at end of file
+745fc4226f1a01f63118013979e8c168
\ No newline at end of file

diff --git a/LayoutTests/svg/custom/text-filter-expected.png b/LayoutTests/svg/custom/text-filter-expected.png
index 468873a55a2377797f29b5bd5ecdfda74b341cb6..a90db9c1b501574cecfa54b892cbcbc37af3e869 100644 (file)
Binary files a/LayoutTests/svg/custom/text-filter-expected.png and b/LayoutTests/svg/custom/text-filter-expected.png differ

diff --git a/LayoutTests/svg/custom/text-filter-expected.txt b/LayoutTests/svg/custom/text-filter-expected.txt
index 3e75da362b14910d251dd92d9190ce86f2701e90..bd6fcc6f098ac43ee568688c78d38ed59da45608 100644 (file)
--- a/LayoutTests/svg/custom/text-filter-expected.txt
+++ b/LayoutTests/svg/custom/text-filter-expected.txt
@@ -1,4 +1,4 @@
-KCanvasResource {id="myfilter" [type=FILTER]  [bounding box=at (-10,-10) size 120x120] [effect bounding box mode=0] [effects=[[type=GAUSSIAN-BLUR]  [subregion="at (0,0) size 800x600"] [std dev. x=3.00 y=3.00]]]}
+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=3.00 y=3.00]]]}
 layer at (0,0) size 800x600
   RenderCanvas at (0,0) size 800x600
     KCanvasContainer {svg} at (0,0) size 0x0

diff --git a/LayoutTests/svg/custom/text-image-opacity-expected.txt b/LayoutTests/svg/custom/text-image-opacity-expected.txt
index 1e5888bcfbaf654604bc268833af3ed8140b7c25..b5e1b50afa49bf886a33235ed1c28acb879d57d8 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
   RenderCanvas at (0,0) size 800x600
-    KCanvasContainer {svg} at (0,0) size 0x0
+    KCanvasContainer {svg} at (0,0) size 100x100
       RenderSVGText {text} at (0,0) size 785x18
         RenderText {TEXT} at (0,0) size 29x18
           text run at (0,0) width 29: "Fail!"

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8d149b33f3de6634bc346f933bf86d6ad3e4cba7..3997f2ef5bbeae21c1ac43c77fb732516f1ca3f1 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,63 @@
+2006-01-29  Eric Seidel  <eseidel@apple.com>
+
+        Reviewed by hyatt & darin.
+
+        There are a few small, but intertwined fixes in this patch:
+
+        Remaining fixes for SVGTetris:
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=6889
+
+        Testing blocked by: http://bugzilla.opendarwin.org/show_bug.cgi?id=6905
+
+        Fix for CDF support:
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=6025
+
+        Updated test: svg/custom/simpleCDF.xml
+
+        Fix for filter updating:
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=6849
+
+        Testing blocked by: http://bugzilla.opendarwin.org/show_bug.cgi?id=6904
+
+        Also, as a side effect of 6849, fixed double-apply of filters, improving:
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=6713
+
+        Results updated for most tests, pixel results improved for filter tests.
+
+        * kcanvas/KCanvasFilters.cpp:
+        (KCanvasFilter::filterBBoxForItemBBox): moved into baseclass
+        * kcanvas/KCanvasFilters.h:
+        * kcanvas/RenderSVGImage.cpp:
+        (RenderSVGImage::paint): use relativeBBox
+        (RenderSVGImage::relativeBBox): added
+        (RenderSVGImage::imageChanged): added
+        (RenderSVGImage::getAbsoluteRepaintRect): fixed
+        * kcanvas/RenderSVGImage.h:
+        (KSVG::RenderSVGImage::imageChanged): added.
+        * kcanvas/device/quartz/KCanvasFilterQuartz.h:
+        * kcanvas/device/quartz/KCanvasFilterQuartz.mm:
+        (KCanvasFilterQuartz::applyFilter): use new baseclass method
+        (KCanvasFEFloodQuartz::getCIFilter): fixed.
+        * kcanvas/device/quartz/KCanvasItemQuartz.h:
+        * kcanvas/device/quartz/KCanvasItemQuartz.mm:
+        (KCanvasItemQuartz::layout): update width/height
+        (KCanvasItemQuartz::getAbsoluteRepaintRect): fixed.
+        (KCanvasItemQuartz::requiresLayer): moved to .cpp
+        (KCanvasItemQuartz::lineHeight): added.
+        (KCanvasItemQuartz::baselinePosition): added.
+        * kcanvas/device/quartz/KCanvasResourcesQuartz.h:
+        * kcanvas/device/quartz/KCanvasResourcesQuartz.mm:
+        (KCanvasContainerQuartz::canHaveChildren): moved to .cpp
+        (KCanvasContainerQuartz::requiresLayer): moved to .cpp
+        (KCanvasContainerQuartz::lineHeight): added.
+        (KCanvasContainerQuartz::baselinePosition): added.
+        (KCanvasContainerQuartz::paint): fixed.
+        (KCanvasContainerQuartz::viewportTransform): fixed.
+        (KCanvasContainerQuartz::getAbsoluteRepaintRect): fixed.
+        (KCanvasContainerQuartz::absoluteTransform): fixed.
+        * rendering/render_object.cpp:
+        (WebCore::RenderObject::absoluteTransform): fixed apply order.
+
 2006-01-29  Eric Seidel  <eseidel@apple.com>
 
         Reviewed by hyatt.

diff --git a/WebCore/kcanvas/KCanvasFilters.cpp b/WebCore/kcanvas/KCanvasFilters.cpp
index 2640f50a51d2cc5bfe629ffedc712b39001547f5..fa346f45f6775a3fd5d568248a1dad3ebadad6d2 100644 (file)
--- a/WebCore/kcanvas/KCanvasFilters.cpp
+++ b/WebCore/kcanvas/KCanvasFilters.cpp
@@ -39,6 +39,11 @@ void KCanvasPoint3F::normalize()
 
 // Filters
 
+void KCanvasFilter::clearEffects()
+{
+    m_effects.clear();
+}
+
 void KCanvasFilter::addFilterEffect(KCanvasFilterEffect *effect)
 {
     ASSERT(effect);
@@ -46,6 +51,17 @@ void KCanvasFilter::addFilterEffect(KCanvasFilterEffect *effect)
         m_effects.append(effect);
 }
 
+FloatRect KCanvasFilter::filterBBoxForItemBBox(FloatRect itemBBox) const
+{
+    FloatRect filterBBox = filterRect();
+    if (filterBoundingBoxMode())
+        filterBBox = FloatRect(filterBBox.x() * itemBBox.width(),
+                               filterBBox.y() * itemBBox.height(),
+                               filterBBox.width() * itemBBox.width(),
+                               filterBBox.height() * itemBBox.height());
+    return filterBBox;
+}
+
 QTextStream &KCanvasFilter::externalRepresentation(QTextStream &ts) const
 {
     ts << "[type=FILTER] "

diff --git a/WebCore/kcanvas/KCanvasFilters.h b/WebCore/kcanvas/KCanvasFilters.h
index 137acf001981cc1062ec301d05f3319ae0eff2f3..f0d284861a909e44db696f6116ffee838f7c2308 100644 (file)
--- a/WebCore/kcanvas/KCanvasFilters.h
+++ b/WebCore/kcanvas/KCanvasFilters.h
@@ -103,7 +103,10 @@ public:
 
     FloatRect filterRect() const { return m_filterRect; }
     void setFilterRect(const FloatRect &rect) { m_filterRect = rect; }
+    
+    FloatRect filterBBoxForItemBBox(FloatRect itemBBox) const;
 
+    void clearEffects();
     void addFilterEffect(KCanvasFilterEffect *effect);
 
     virtual void prepareFilter(const FloatRect &bbox) = 0;

diff --git a/WebCore/kcanvas/RenderSVGImage.cpp b/WebCore/kcanvas/RenderSVGImage.cpp
index aaa7952c1d7e963cda33b2004687d9e1ecfa5dd0..0e422a2745d3cdc9df2724dc6d2784744317ad36 100644 (file)
--- a/WebCore/kcanvas/RenderSVGImage.cpp
+++ b/WebCore/kcanvas/RenderSVGImage.cpp
@@ -69,7 +69,7 @@ void RenderSVGImage::paint(PaintInfo& paintInfo, int parentX, int parentY)
     context->concatCTM(localTransform());
     translateForAttributes();
     
-    FloatRect boundingBox(0, 0, width(), height());
+    FloatRect boundingBox = relativeBBox(true);
     const KSVG::SVGRenderStyle *svgStyle = style()->svgStyle();
             
     if (KCanvasClipper *clipper = getClipperById(document(), svgStyle->clipPath().mid(1)))
@@ -95,6 +95,30 @@ void RenderSVGImage::paint(PaintInfo& paintInfo, int parentX, int parentY)
         paintInfo.p->restore();
 }
 
+FloatRect RenderSVGImage::relativeBBox(bool includeStroke) const
+{
+    return FloatRect(0, 0, width(), height());
+}
+
+void RenderSVGImage::imageChanged(CachedImage* image, const IntRect& rect)
+{
+    RenderImage::imageChanged(image, rect);
+    // We override to invalidate a larger rect, since SVG images can draw outside their "bounds"
+    repaintRectangle(getAbsoluteRepaintRect());
+}
+
+IntRect RenderSVGImage::getAbsoluteRepaintRect()
+{
+    FloatRect repaintRect = absoluteTransform().mapRect(relativeBBox(true));
+
+    // Filters can expand the bounding box
+    KCanvasFilter *filter = getFilterById(document(), style()->svgStyle()->filter().mid(1));
+    if (filter)
+        repaintRect = repaintRect.unite(filter->filterBBoxForItemBBox(repaintRect));
+
+    return enclosingIntRect(repaintRect);
+}
+
 void RenderSVGImage::translateForAttributes()
 {
     KRenderingDeviceContext *context = QPainter::renderingDevice()->currentContext();
@@ -103,5 +127,5 @@ void RenderSVGImage::translateForAttributes()
     float yOffset = image->y()->baseVal() ? image->y()->baseVal()->value() : 0;
     context->concatCTM(QMatrix().translate(xOffset, yOffset));
 }
-#endif // SVG_SUPPORT
 
+#endif // SVG_SUPPORT

diff --git a/WebCore/kcanvas/RenderSVGImage.h b/WebCore/kcanvas/RenderSVGImage.h
index e919fdd7a8889f194f96f18de6e5d657ed27a22b..f70dfb6d048e894102cd314d99b900024a62889f 100644 (file)
--- a/WebCore/kcanvas/RenderSVGImage.h
+++ b/WebCore/kcanvas/RenderSVGImage.h
@@ -38,6 +38,11 @@ namespace KSVG
         virtual QMatrix localTransform() const { return m_transform; }
         virtual void setLocalTransform(const QMatrix& transform) { m_transform = transform; }
         
+        virtual FloatRect relativeBBox(bool includeStroke = true) const;
+        virtual IntRect getAbsoluteRepaintRect();
+        
+        virtual void imageChanged(CachedImage*, const IntRect&);
+        
         virtual void paint(PaintInfo& paintInfo, int parentX, int parentY);
     private:
         void translateForAttributes();

diff --git a/WebCore/kcanvas/device/quartz/KCanvasFilterQuartz.h b/WebCore/kcanvas/device/quartz/KCanvasFilterQuartz.h
index db883a9fefeb1f546f65518aab2ce48c1d4c09a0..d1d36251f75594d4f7e3bc79f7fe15e4a81c7e24 100644 (file)
--- a/WebCore/kcanvas/device/quartz/KCanvasFilterQuartz.h
+++ b/WebCore/kcanvas/device/quartz/KCanvasFilterQuartz.h
@@ -53,8 +53,6 @@ public:
     
 private:
     NSArray *getCIFilterStack(CIImage *inputImage);
-    
-    CGRect filterBBoxForItemBBox(CGRect itemBBox) const;
 
     CIContext *m_filterCIContext;
     CGLayerRef m_filterCGLayer;

diff --git a/WebCore/kcanvas/device/quartz/KCanvasFilterQuartz.mm b/WebCore/kcanvas/device/quartz/KCanvasFilterQuartz.mm
index 294962f892e1538535274f85e0f255f152a37564..a17353466999ae9bd0298acc59212b0b9d07a61e 100644 (file)
--- a/WebCore/kcanvas/device/quartz/KCanvasFilterQuartz.mm
+++ b/WebCore/kcanvas/device/quartz/KCanvasFilterQuartz.mm
@@ -116,7 +116,7 @@ void KCanvasFilterQuartz::applyFilter(const FloatRect &bbox)
     if ([filterStack count]) {
         CIImage *outputImage = [[filterStack lastObject] valueForKey:@"outputImage"];
         if (outputImage) {
-            CGRect filterRect = filterBBoxForItemBBox(CGRect(bbox));
+            CGRect filterRect = CGRect(filterBBoxForItemBBox(bbox));
             CGRect translated = filterRect;
             CGPoint bboxOrigin = CGRect(bbox).origin;
             CGRect sourceRect = CGRectIntersection(translated,[outputImage extent]);
@@ -133,18 +133,6 @@ void KCanvasFilterQuartz::applyFilter(const FloatRect &bbox)
     [m_filterCIContext release];
 }
 
-CGRect KCanvasFilterQuartz::filterBBoxForItemBBox(CGRect itemBBox) const
-{
-    // FIXME: hack for now
-    CGRect filterBBox = CGRect(filterRect());
-    if(filterBoundingBoxMode())
-        filterBBox = CGRectMake((filterBBox.origin.x/100.f * itemBBox.size.width), 
-                                (filterBBox.origin.y/100.f * itemBBox.size.height), 
-                                (filterBBox.size.width/100.f * itemBBox.size.width), 
-                                (filterBBox.size.height/100.f * itemBBox.size.height));
-    return filterBBox;
-}
-
 NSArray *KCanvasFilterQuartz::getCIFilterStack(CIImage *inputImage)
 {
     NSMutableArray *filterEffects = [NSMutableArray array];
@@ -542,7 +530,7 @@ CIFilter *KCanvasFEFloodQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilter) c
     CGColorRelease(withAlpha);
     [filter setValue:inputColor forKey:@"inputColor"];
     
-    CGRect cropRect = CGRectMake(0,0,1000,1000); // HACK
+    CGRect cropRect = CGRectMake(-100,-100,1000,1000); // HACK
     if (subRegion().isValid())
         cropRect = CGRect(subRegion());
     FE_QUARTZ_CROP_TO_RECT(cropRect);

diff --git a/WebCore/kcanvas/device/quartz/KCanvasItemQuartz.h b/WebCore/kcanvas/device/quartz/KCanvasItemQuartz.h
index 6387ada3b2558e1f1ab8bbf827f95c571c54adff..018662e12311ce5454cc68ab0446125b0007387f 100644 (file)
--- a/WebCore/kcanvas/device/quartz/KCanvasItemQuartz.h
+++ b/WebCore/kcanvas/device/quartz/KCanvasItemQuartz.h
@@ -37,7 +37,10 @@ public:
     
     virtual IntRect getAbsoluteRepaintRect();
     
-    virtual bool requiresLayer() { return false; }
+    virtual bool requiresLayer();
+    virtual short lineHeight(bool b, bool isRootLineBox = false) const;
+    virtual short baselinePosition(bool b, bool isRootLineBox = false) const;
+    
     virtual void layout();
     virtual void paint(PaintInfo&, int parentX, int parentY);
     virtual bool nodeAtPoint(NodeInfo&, int x, int y, int tx, int ty, WebCore::HitTestAction);

diff --git a/WebCore/kcanvas/device/quartz/KCanvasItemQuartz.mm b/WebCore/kcanvas/device/quartz/KCanvasItemQuartz.mm
index 615b4e43aad1592ba11de70a575222f4f05306e4..da95ec3f75acde58f0fda6a41d1cdda91c01b991 100644 (file)
--- a/WebCore/kcanvas/device/quartz/KCanvasItemQuartz.mm
+++ b/WebCore/kcanvas/device/quartz/KCanvasItemQuartz.mm
@@ -59,6 +59,9 @@ void KCanvasItemQuartz::layout()
     // pretend that one of the attributes of the element has changed on the DOM
     // to force the DOM object to update this render object with new aboslute position values.
     static_cast<KSVG::SVGStyledElementImpl*>(element())->notifyAttributeChange();
+    IntRect layoutRect = getAbsoluteRepaintRect();
+    setWidth(layoutRect.width());
+    setHeight(layoutRect.height());
     setNeedsLayout(false);
 }
 
@@ -196,7 +199,31 @@ void KCanvasItemQuartz::drawMarkersIfNeeded(const FloatRect& rect, const KCanvas
 
 IntRect KCanvasItemQuartz::getAbsoluteRepaintRect()
 {
-    return enclosingIntRect(absoluteTransform().mapRect(relativeBBox(true)));
+    FloatRect repaintRect = absoluteTransform().mapRect(relativeBBox(true));
+    
+    // Filters can expand the bounding box
+    KCanvasFilter *filter = getFilterById(document(), style()->svgStyle()->filter().mid(1));
+    if (filter)
+        repaintRect = repaintRect.unite(filter->filterBBoxForItemBBox(repaintRect));
+    
+    if (!repaintRect.isEmpty())
+        repaintRect.inflate(1); // inflate 1 pixel for antialiasing
+    return enclosingIntRect(repaintRect);
+}
+
+bool KCanvasItemQuartz::requiresLayer()
+{
+    return false;
+}
+
+short KCanvasItemQuartz::lineHeight(bool b, bool isRootLineBox) const
+{
+    return static_cast<short>(bboxForPath(true).height());
+}
+
+short KCanvasItemQuartz::baselinePosition(bool b, bool isRootLineBox) const
+{
+    return static_cast<short>(bboxForPath(true).height());
 }
 
 void KCanvasItemQuartz::paint(PaintInfo &paintInfo, int parentX, int parentY)

diff --git a/WebCore/kcanvas/device/quartz/KCanvasResourcesQuartz.h b/WebCore/kcanvas/device/quartz/KCanvasResourcesQuartz.h
index 3fd613aae18f8d7763b9595fc5d5562ddada9cbc..d55ce3ca1091182f1a8cf01d46a3bc12dc123670 100644 (file)
--- a/WebCore/kcanvas/device/quartz/KCanvasResourcesQuartz.h
+++ b/WebCore/kcanvas/device/quartz/KCanvasResourcesQuartz.h
@@ -35,14 +35,17 @@ class KCanvasContainerQuartz : public KCanvasContainer {
 public:
     KCanvasContainerQuartz(KSVG::SVGStyledElementImpl *node) : KCanvasContainer(node) { }
     
-    virtual bool canHaveChildren() const { return true; }
+    virtual bool canHaveChildren() const;
+    
+    virtual bool requiresLayer();
+    virtual short lineHeight(bool b, bool isRootLineBox = false) const;
+    virtual short baselinePosition(bool b, bool isRootLineBox = false) const;
     
-    virtual bool requiresLayer() { return false; }
     virtual void calcMinMaxWidth();
     virtual void layout();
     virtual void paint(PaintInfo &paintInfo, int parentX, int parentY);
     
-    virtual IntRect getAbsoluteRepaintRect() { return enclosingIntRect(absoluteTransform().mapRect(relativeBBox(true))); }
+    virtual IntRect getAbsoluteRepaintRect();
     virtual QMatrix absoluteTransform() const;
 
     virtual void setViewport(const FloatRect&);
@@ -55,6 +58,8 @@ public:
     virtual KCAlign align() const;
     
 private:
+    QMatrix viewportTransform() const;
+
     FloatRect m_viewport;
     FloatRect m_viewBox;
     KCAlign m_align;

diff --git a/WebCore/kcanvas/device/quartz/KCanvasResourcesQuartz.mm b/WebCore/kcanvas/device/quartz/KCanvasResourcesQuartz.mm
index 1f658a575d7705c581792c5bc65482c2f15bceda..55ee47f369cb08ec572817052a04e2ade7e044fb 100644 (file)
--- a/WebCore/kcanvas/device/quartz/KCanvasResourcesQuartz.mm
+++ b/WebCore/kcanvas/device/quartz/KCanvasResourcesQuartz.mm
@@ -41,6 +41,26 @@
 
 #import <kxmlcore/Assertions.h>
 
+bool KCanvasContainerQuartz::canHaveChildren() const
+{
+    return true;
+}
+    
+bool KCanvasContainerQuartz::requiresLayer()
+{
+    return false;
+}
+
+short KCanvasContainerQuartz::lineHeight(bool b, bool isRootLineBox) const
+{
+    return height() + marginTop() + marginBottom();
+}
+
+short KCanvasContainerQuartz::baselinePosition(bool b, bool isRootLineBox) const
+{
+    return height() + marginTop() + marginBottom();
+}
+
 void KCanvasContainerQuartz::calcMinMaxWidth()
 {
     KHTMLAssert( !minMaxKnown());
@@ -125,12 +145,8 @@ void KCanvasContainerQuartz::paint(PaintInfo &paintInfo, int parentX, int parent
     if (filter)
         filter->prepareFilter(relativeBBox(true));
     
-    if (!viewBox().isNull()) {
-        FloatRect viewportRect = viewport();
-        if (!parent()->isKCanvasContainer())
-            viewportRect = FloatRect(viewport().x(), viewport().y(), width(), height());
-        deviceContext->concatCTM(getAspectRatio(viewBox(), viewportRect));
-    }
+    if (!viewBox().isNull())
+        deviceContext->concatCTM(viewportTransform());
     
     RenderContainer::paint(paintInfo, 0, 0);
     
@@ -178,16 +194,35 @@ KCAlign KCanvasContainerQuartz::align() const
     return m_align;
 }
 
-QMatrix KCanvasContainerQuartz::absoluteTransform() const
+QMatrix KCanvasContainerQuartz::viewportTransform() const
 {
-    QMatrix transform = KCanvasContainer::absoluteTransform();
     if (!viewBox().isNull()) {
         FloatRect viewportRect = viewport();
         if (!parent()->isKCanvasContainer())
             viewportRect = FloatRect(viewport().x(), viewport().y(), width(), height());
-        transform *= getAspectRatio(viewBox(), viewportRect).qmatrix();
+        return getAspectRatio(viewBox(), viewportRect).qmatrix();
     }
-    return transform;
+    return QMatrix();
+}
+
+IntRect KCanvasContainerQuartz::getAbsoluteRepaintRect()
+{
+    IntRect repaintRect;
+    
+    for (WebCore::RenderObject *current = firstChild(); current != 0; current = current->nextSibling())
+        repaintRect = repaintRect.unite(current->getAbsoluteRepaintRect());
+    
+    // Filters can expand the bounding box
+    KCanvasFilter *filter = getFilterById(document(), style()->svgStyle()->filter().mid(1));
+    if (filter)
+        repaintRect = repaintRect.unite(enclosingIntRect(filter->filterBBoxForItemBBox(repaintRect)));
+
+    return repaintRect;
+}
+
+QMatrix KCanvasContainerQuartz::absoluteTransform() const
+{
+    return viewportTransform() * KCanvasContainer::absoluteTransform();
 }
 
 void KCanvasClipperQuartz::applyClip(const FloatRect& boundingBox) const

diff --git a/WebCore/ksvg2/svg/SVGFilterElementImpl.cpp b/WebCore/ksvg2/svg/SVGFilterElementImpl.cpp
index d7bc21775c9644318be39dbc6c63368ec433ed04..620aa093fef0a1290218b9118cecb3b46085be6f 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFilterElementImpl.cpp
+++ b/WebCore/ksvg2/svg/SVGFilterElementImpl.cpp
@@ -166,10 +166,10 @@ void SVGFilterElementImpl::parseMappedAttribute(KDOM::MappedAttributeImpl *attr)
 
 KCanvasFilter *SVGFilterElementImpl::canvasResource()
 {
-    if(!canvas())
+    if (!attached())
         return 0;
 
-    if(!m_filter)
+    if (!m_filter)
         m_filter = static_cast<KCanvasFilter *>(QPainter::renderingDevice()->createResource(RS_FILTER));
 
     bool filterBBoxMode = filterUnits()->baseVal() == SVG_UNIT_TYPE_OBJECTBOUNDINGBOX;
@@ -181,18 +181,15 @@ KCanvasFilter *SVGFilterElementImpl::canvasResource()
     height()->baseVal()->setBboxRelative(filterBBoxMode);
     float _x = x()->baseVal()->value(), _y = y()->baseVal()->value();
     float _width = width()->baseVal()->value(), _height = height()->baseVal()->value();
-    if(filterBBoxMode)
-        m_filter->setFilterRect(FloatRect(_x * 100.f, _y * 100.f, _width * 100.f, _height * 100.f));
-    else
-        m_filter->setFilterRect(FloatRect(_x, _y, _width, _height));
+    m_filter->setFilterRect(FloatRect(_x, _y, _width, _height));
     
     bool primitiveBBoxMode = primitiveUnits()->baseVal() == SVG_UNIT_TYPE_OBJECTBOUNDINGBOX;
     m_filter->setEffectBoundingBoxMode(primitiveBBoxMode);
     // FIXME: When does this info get passed to the filters elements?
 
     // TODO : use switch/case instead?
-    for(KDOM::NodeImpl *n = firstChild(); n != 0; n = n->nextSibling())
-    {
+    m_filter->clearEffects();
+    for (KDOM::NodeImpl *n = firstChild(); n != 0; n = n->nextSibling()) {
         SVGElementImpl *element = svg_dynamic_cast(n);
         if(element && element->isFilterEffect()) {
             SVGFilterPrimitiveStandardAttributesImpl *fe = static_cast<SVGFilterPrimitiveStandardAttributesImpl *>(element);

diff --git a/WebCore/rendering/render_object.cpp b/WebCore/rendering/render_object.cpp
index faeea8f0fc736976d3f14a4f48a89976189ef8f4..ac0922281a8c9a9af0db7beaa01a668f37c9c024 100644 (file)
--- a/WebCore/rendering/render_object.cpp
+++ b/WebCore/rendering/render_object.cpp
@@ -2614,7 +2614,7 @@ QMatrix RenderObject::localTransform() const
 QMatrix RenderObject::absoluteTransform() const
 {
     if (parent())
-        return parent()->absoluteTransform() * localTransform();
+        return localTransform() * parent()->absoluteTransform();
     return localTransform();
 }