Bug #: 5842
authoreseidel <eseidel@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 29 Nov 2005 11:20:57 +0000 (11:20 +0000)
committereseidel <eseidel@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 29 Nov 2005 11:20:57 +0000 (11:20 +0000)
Submitted by: eseidel
Reviewed by: mjs
        3 test cases added to cover CSS updates and CDF support.
        Updated all test results for absolute bbox change.

        Fixed in this patch:
        - CSS dynamic updates
        - dynamic path data updates
        - first pass at CDF support
        http://bugzilla.opendarwin.org/show_bug.cgi?id=5842

        * kcanvas/KCanvasContainer.cpp:
        (KCanvasContainer::KCanvasContainer): make "replaced" element
        * kcanvas/device/quartz/KCanvasItemQuartz.mm:
        (KCanvasItemQuartz::paint): added parent offset ASSERT
        * kcanvas/device/quartz/KCanvasResourcesQuartz.mm:
        (KCanvasContainerQuartz::paint): account for parent offset
        (KCanvasContainerQuartz::absoluteTransform): reflect viewport
        * khtml/css/css_valueimpl.cpp: remove HTML special case
        (DOM::CSSMutableStyleDeclarationImpl::setChanged):
        * khtml/css/cssstyleselector.cpp: remove HTML special case
        (khtml::CSSStyleSelector::locateCousinList):
        * khtml/rendering/render_object.cpp:
        (RenderObject::containingBlock): special case KCanvasContainer
        * khtml/rendering/render_style.cpp:
        (RenderStyle::operator==): fix call into SVGRenderStyle
        (RenderStyle::inheritedNotEqual): calls into SVGRenderStyle
        (RenderStyle::diff): calls into SVGRenderStyle
        * ksvg2/css/SVGRenderStyle.cpp:
        (SVGRenderStyle::equals): include flags in comparison
        (SVGRenderStyle::inheritedNotEqual): added
        * ksvg2/css/SVGRenderStyle.h:
        * ksvg2/svg/SVGPathElementImpl.cpp:
        (KSVG::SVGPathElementImpl::parseMappedAttribute): clear path first
        * ksvg2/svg/SVGStyledElementImpl.cpp:
        (SVGStyledElementImpl::attributeChanged): map to ksvg2 attributes
        * ksvg2/svg/SVGStyledElementImpl.h:

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

63 files changed:
LayoutTests/svg/W3C-SVG-1.1/animate-elem-04-t-expected.txt
LayoutTests/svg/W3C-SVG-1.1/animate-elem-05-t-expected.txt
LayoutTests/svg/W3C-SVG-1.1/animate-elem-06-t-expected.txt
LayoutTests/svg/W3C-SVG-1.1/animate-elem-07-t-expected.txt
LayoutTests/svg/W3C-SVG-1.1/coords-units-01-b-expected.txt
LayoutTests/svg/W3C-SVG-1.1/coords-units-02-b-expected.txt
LayoutTests/svg/W3C-SVG-1.1/coords-units-03-b-expected.txt
LayoutTests/svg/W3C-SVG-1.1/filters-blend-01-b-expected.txt
LayoutTests/svg/W3C-SVG-1.1/filters-color-01-b-expected.txt
LayoutTests/svg/W3C-SVG-1.1/filters-composite-02-b-expected.txt
LayoutTests/svg/W3C-SVG-1.1/filters-comptran-01-b-expected.txt
LayoutTests/svg/W3C-SVG-1.1/filters-diffuse-01-f-expected.checksum
LayoutTests/svg/W3C-SVG-1.1/filters-diffuse-01-f-expected.png
LayoutTests/svg/W3C-SVG-1.1/filters-diffuse-01-f-expected.txt
LayoutTests/svg/W3C-SVG-1.1/filters-example-01-b-expected.txt
LayoutTests/svg/W3C-SVG-1.1/filters-gauss-01-b-expected.txt
LayoutTests/svg/W3C-SVG-1.1/filters-light-01-f-expected.checksum
LayoutTests/svg/W3C-SVG-1.1/filters-light-01-f-expected.png
LayoutTests/svg/W3C-SVG-1.1/filters-light-01-f-expected.txt
LayoutTests/svg/W3C-SVG-1.1/filters-morph-01-f-expected.txt
LayoutTests/svg/W3C-SVG-1.1/filters-offset-01-b-expected.txt
LayoutTests/svg/W3C-SVG-1.1/filters-specular-01-f-expected.checksum
LayoutTests/svg/W3C-SVG-1.1/filters-specular-01-f-expected.png
LayoutTests/svg/W3C-SVG-1.1/filters-specular-01-f-expected.txt
LayoutTests/svg/W3C-SVG-1.1/filters-tile-01-b-expected.txt
LayoutTests/svg/W3C-SVG-1.1/interact-zoom-01-t-expected.txt
LayoutTests/svg/W3C-SVG-1.1/painting-marker-01-f-expected.checksum
LayoutTests/svg/W3C-SVG-1.1/painting-marker-01-f-expected.png
LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f-expected.checksum
LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f-expected.png
LayoutTests/svg/W3C-SVG-1.1/struct-image-05-b-expected.txt
LayoutTests/svg/W3C-SVG-1.1/struct-symbol-01-b-expected.txt
LayoutTests/svg/W3C-SVG-1.1/text-path-01-b-expected.txt
LayoutTests/svg/W3C-SVG-1.1/text-spacing-01-b-expected.txt
LayoutTests/svg/W3C-SVG-1.1/text-text-01-b-expected.txt
LayoutTests/svg/custom/fill-update-expected.checksum [new file with mode: 0644]
LayoutTests/svg/custom/fill-update-expected.png [new file with mode: 0644]
LayoutTests/svg/custom/fill-update-expected.txt [new file with mode: 0644]
LayoutTests/svg/custom/fill-update.svg [new file with mode: 0644]
LayoutTests/svg/custom/path-bad-data-expected.txt
LayoutTests/svg/custom/path-update-expected.checksum [new file with mode: 0644]
LayoutTests/svg/custom/path-update-expected.png [new file with mode: 0644]
LayoutTests/svg/custom/path-update-expected.txt [new file with mode: 0644]
LayoutTests/svg/custom/path-update.svg [new file with mode: 0644]
LayoutTests/svg/custom/simpleCDF-expected.checksum [new file with mode: 0644]
LayoutTests/svg/custom/simpleCDF-expected.png [new file with mode: 0644]
LayoutTests/svg/custom/simpleCDF-expected.txt [new file with mode: 0644]
LayoutTests/svg/custom/simpleCDF.xml [new file with mode: 0644]
LayoutTests/svg/custom/use-forward-refs-expected.txt
WebCore/ChangeLog-2005-12-19
WebCore/kcanvas/KCanvasContainer.cpp
WebCore/kcanvas/device/quartz/KCanvasItemQuartz.mm
WebCore/kcanvas/device/quartz/KCanvasResourcesQuartz.mm
WebCore/khtml/css/css_valueimpl.cpp
WebCore/khtml/css/cssstyleselector.cpp
WebCore/khtml/rendering/render_object.cpp
WebCore/khtml/rendering/render_style.cpp
WebCore/ksvg2/css/SVGRenderStyle.cpp
WebCore/ksvg2/css/SVGRenderStyle.h
WebCore/ksvg2/svg/SVGFEFloodElementImpl.cpp
WebCore/ksvg2/svg/SVGPathElementImpl.cpp
WebCore/ksvg2/svg/SVGStyledElementImpl.cpp
WebCore/ksvg2/svg/SVGStyledElementImpl.h

index 956f8590ace7e8cc7d3cefa5ebfed33bf0444a08..041c29662477e835148e5fe1136d28961e548fba 100644 (file)
@@ -1,10 +1,10 @@
 layer at (0,0) size 480x360
   RenderCanvas at (0,0) size 480x360
-    KCanvasContainer {svg} at (-5,-11) size 84x70
-      KCanvasContainer {g} at (-5,-11) size 75x54
-        KCanvasContainer {g} at (-5,-11) size 75x54
-          KCanvasItem {path} at (14,29) size 50x13 [stroke={[type=SOLID] [color=#000000]}] [data="M15.00,43.00L65.00,30.00"]
-          KCanvasItem {rect} at (9,32) size 11x11 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FFCCCC]}] [data="M10.00,33.00L20.00,33.00L20.00,43.00L10.00,43.00"]
-          KCanvasItem {rect} at (59,19) size 11x11 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FFCCCC]}] [data="M60.00,20.00L70.00,20.00L70.00,30.00L60.00,30.00"]
-          KCanvasItem {path} at (-5,-11) size 11x11 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#0000FF]}] [data="M-5.00,0.00L0.00,-10.00L5.00,0.00"]
-      KCanvasItem {rect} at (0,0) size 79x59 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L79.00,1.00L79.00,59.00L1.00,59.00"]
+    KCanvasContainer {svg} at (-30,-66) size 504x420
+      KCanvasContainer {g} at (-30,-66) size 450x324
+        KCanvasContainer {g} at (-30,-66) size 450x324
+          KCanvasItem {path} at (84,174) size 300x78 [stroke={[type=SOLID] [color=#000000]}] [data="M15.00,43.00L65.00,30.00"]
+          KCanvasItem {rect} at (54,192) size 66x66 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FFCCCC]}] [data="M10.00,33.00L20.00,33.00L20.00,43.00L10.00,43.00"]
+          KCanvasItem {rect} at (354,114) size 66x66 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FFCCCC]}] [data="M60.00,20.00L70.00,20.00L70.00,30.00L60.00,30.00"]
+          KCanvasItem {path} at (-30,-66) size 66x66 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#0000FF]}] [data="M-5.00,0.00L0.00,-10.00L5.00,0.00"]
+      KCanvasItem {rect} at (0,0) size 474x354 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L79.00,1.00L79.00,59.00L1.00,59.00"]
index 4ae7a742be16423249b617a07b88d6655cf7d474..32519d57d42bded84bebb78f7d01411dc335e2ac 100644 (file)
@@ -1,11 +1,11 @@
 layer at (0,0) size 480x360
   RenderCanvas at (0,0) size 480x360
-    KCanvasContainer {svg} at (-5,-11) size 84x70
-      KCanvasContainer {g} at (-5,-11) size 75x54
-        KCanvasContainer {g} at (-5,-11) size 75x54
-          KCanvasItem {path} at (14,29) size 50x13 [stroke={[type=SOLID] [color=#000000]}] [data="M15.00,43.00L40.00,30.00L65.00,30.00"]
-          KCanvasItem {rect} at (9,32) size 11x11 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FFCCCC]}] [data="M10.00,33.00L20.00,33.00L20.00,43.00L10.00,43.00"]
-          KCanvasItem {rect} at (34,19) size 11x11 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FFCCCC]}] [data="M35.00,20.00L45.00,20.00L45.00,30.00L35.00,30.00"]
-          KCanvasItem {rect} at (59,19) size 11x11 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FFCCCC]}] [data="M60.00,20.00L70.00,20.00L70.00,30.00L60.00,30.00"]
-          KCanvasItem {path} at (-5,-11) size 11x11 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#0000FF]}] [data="M-5.00,0.00L0.00,-10.00L5.00,0.00"]
-      KCanvasItem {rect} at (0,0) size 79x59 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L79.00,1.00L79.00,59.00L1.00,59.00"]
+    KCanvasContainer {svg} at (-30,-66) size 504x420
+      KCanvasContainer {g} at (-30,-66) size 450x324
+        KCanvasContainer {g} at (-30,-66) size 450x324
+          KCanvasItem {path} at (84,174) size 300x78 [stroke={[type=SOLID] [color=#000000]}] [data="M15.00,43.00L40.00,30.00L65.00,30.00"]
+          KCanvasItem {rect} at (54,192) size 66x66 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FFCCCC]}] [data="M10.00,33.00L20.00,33.00L20.00,43.00L10.00,43.00"]
+          KCanvasItem {rect} at (204,114) size 66x66 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FFCCCC]}] [data="M35.00,20.00L45.00,20.00L45.00,30.00L35.00,30.00"]
+          KCanvasItem {rect} at (354,114) size 66x66 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FFCCCC]}] [data="M60.00,20.00L70.00,20.00L70.00,30.00L60.00,30.00"]
+          KCanvasItem {path} at (-30,-66) size 66x66 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#0000FF]}] [data="M-5.00,0.00L0.00,-10.00L5.00,0.00"]
+      KCanvasItem {rect} at (0,0) size 474x354 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L79.00,1.00L79.00,59.00L1.00,59.00"]
index c5428a7fe0de05f37c9596dd3d05609ee976d37a..e4b90d1b1c44df394bf3972ac852907bf09430af 100644 (file)
@@ -1,10 +1,10 @@
 layer at (0,0) size 480x360
   RenderCanvas at (0,0) size 480x360
-    KCanvasContainer {svg} at (-5,-11) size 84x70
-      KCanvasContainer {g} at (-5,-11) size 75x54
-        KCanvasContainer {g} at (-5,-11) size 75x54
-          KCanvasItem {path} at (14,26) size 50x16 [stroke={[type=SOLID] [color=#000000]}] [data="M15.00,43.00C15.00,43.00,36.00,20.00,65.00,33.00"]
-          KCanvasItem {rect} at (9,32) size 11x11 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FFCCCC]}] [data="M10.00,33.00L20.00,33.00L20.00,43.00L10.00,43.00"]
-          KCanvasItem {rect} at (59,22) size 11x11 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FFCCCC]}] [data="M60.00,23.00L70.00,23.00L70.00,33.00L60.00,33.00"]
-          KCanvasItem {path} at (-5,-11) size 11x11 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#0000FF]}] [data="M-5.00,0.00L0.00,-10.00L5.00,0.00"]
-      KCanvasItem {rect} at (0,0) size 79x59 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L79.00,1.00L79.00,59.00L1.00,59.00"]
+    KCanvasContainer {svg} at (-30,-66) size 504x420
+      KCanvasContainer {g} at (-30,-66) size 450x324
+        KCanvasContainer {g} at (-30,-66) size 450x324
+          KCanvasItem {path} at (84,156) size 300x96 [stroke={[type=SOLID] [color=#000000]}] [data="M15.00,43.00C15.00,43.00,36.00,20.00,65.00,33.00"]
+          KCanvasItem {rect} at (54,192) size 66x66 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FFCCCC]}] [data="M10.00,33.00L20.00,33.00L20.00,43.00L10.00,43.00"]
+          KCanvasItem {rect} at (354,132) size 66x66 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FFCCCC]}] [data="M60.00,23.00L70.00,23.00L70.00,33.00L60.00,33.00"]
+          KCanvasItem {path} at (-30,-66) size 66x66 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#0000FF]}] [data="M-5.00,0.00L0.00,-10.00L5.00,0.00"]
+      KCanvasItem {rect} at (0,0) size 474x354 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L79.00,1.00L79.00,59.00L1.00,59.00"]
index c5428a7fe0de05f37c9596dd3d05609ee976d37a..e4b90d1b1c44df394bf3972ac852907bf09430af 100644 (file)
@@ -1,10 +1,10 @@
 layer at (0,0) size 480x360
   RenderCanvas at (0,0) size 480x360
-    KCanvasContainer {svg} at (-5,-11) size 84x70
-      KCanvasContainer {g} at (-5,-11) size 75x54
-        KCanvasContainer {g} at (-5,-11) size 75x54
-          KCanvasItem {path} at (14,26) size 50x16 [stroke={[type=SOLID] [color=#000000]}] [data="M15.00,43.00C15.00,43.00,36.00,20.00,65.00,33.00"]
-          KCanvasItem {rect} at (9,32) size 11x11 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FFCCCC]}] [data="M10.00,33.00L20.00,33.00L20.00,43.00L10.00,43.00"]
-          KCanvasItem {rect} at (59,22) size 11x11 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FFCCCC]}] [data="M60.00,23.00L70.00,23.00L70.00,33.00L60.00,33.00"]
-          KCanvasItem {path} at (-5,-11) size 11x11 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#0000FF]}] [data="M-5.00,0.00L0.00,-10.00L5.00,0.00"]
-      KCanvasItem {rect} at (0,0) size 79x59 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L79.00,1.00L79.00,59.00L1.00,59.00"]
+    KCanvasContainer {svg} at (-30,-66) size 504x420
+      KCanvasContainer {g} at (-30,-66) size 450x324
+        KCanvasContainer {g} at (-30,-66) size 450x324
+          KCanvasItem {path} at (84,156) size 300x96 [stroke={[type=SOLID] [color=#000000]}] [data="M15.00,43.00C15.00,43.00,36.00,20.00,65.00,33.00"]
+          KCanvasItem {rect} at (54,192) size 66x66 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FFCCCC]}] [data="M10.00,33.00L20.00,33.00L20.00,43.00L10.00,43.00"]
+          KCanvasItem {rect} at (354,132) size 66x66 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FFCCCC]}] [data="M60.00,23.00L70.00,23.00L70.00,33.00L60.00,33.00"]
+          KCanvasItem {path} at (-30,-66) size 66x66 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#0000FF]}] [data="M-5.00,0.00L0.00,-10.00L5.00,0.00"]
+      KCanvasItem {rect} at (0,0) size 474x354 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L79.00,1.00L79.00,59.00L1.00,59.00"]
index c2011e2b63b51b365e25ca7bee8cfb25d14485c6..6e29bdfe5ce85d1f53593a9ab8b62a07a26c8df4 100644 (file)
@@ -1,28 +1,38 @@
-KCanvasRegistry: 
-  KRenderingPaintServer {id="patternBoundingBoxFraction" [type=PATTERN] [x=0.00 y=0.00 w=0.00 h=0.00]}
-  KRenderingPaintServer {id="linearUserSpace" [type=LINEAR-GRADIENT] [stops=[(0.00,#FF0000), (1.00,#0000FF)]] [start=(0,0)] [end=(0,0)]}
-  KRenderingPaintServer {id="linearBoundingBoxFraction" [type=LINEAR-GRADIENT] [stops=[(0.00,#FF0000), (1.00,#0000FF)]] [start=(0,0)] [end=(0,0)]}
-  KRenderingPaintServer {id="radialBoundingBoxFraction" [type=RADIAL-GRADIENT] [stops=[(0.00,#FF0000), (1.00,#0000FF)]] [center=(0,0)] [focal=(0,0)] [radius=0.00]}
-  KRenderingPaintServer {id="radialBoundingBoxPercentage" [type=RADIAL-GRADIENT] [stops=[(0.00,#FF0000), (1.00,#0000FF)]] [center=(0,0)] [focal=(0,0)] [radius=0.00]}
-  KRenderingPaintServer {id="linearBoundingBoxPercentage" [type=LINEAR-GRADIENT] [stops=[(0.00,#FF0000), (1.00,#0000FF)]] [start=(0,0)] [end=(0,0)]}
-  KRenderingPaintServer {id="patternUserSpace" [type=PATTERN] [x=0.00 y=0.00 w=0.00 h=0.00]}
-  KRenderingPaintServer {id="radialUserSpace" [type=RADIAL-GRADIENT] [stops=[(0.00,#FF0000), (1.00,#0000FF)]] [center=(0,0)] [focal=(0,0)] [radius=0.00]}
-  KRenderingPaintServer {id="patternBoundingBoxPercentage" [type=PATTERN] [x=0.00 y=0.00 w=0.00 h=0.00]}
-KCanvasContainer at (0,0) size 479x359
-  KCanvasContainer at (0,0) size 479x359 [fill={[type=SOLID] [color=#000000]}]
-    KCanvasContainer at (30,40) size 50x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,40.00)}] [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem {rect} at (30,40) size 50x20 [fill={[id="linearBoundingBoxPercentage"]}] [data="M0.00,0.00L50.00,0.00L50.00,20.00L0.00,20.00"]
-      KCanvasItem {rect} at (30,60) size 50x20 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,60.00)}] [fill={[id="linearBoundingBoxFraction"]}] [data="M0.00,0.00L50.00,0.00L50.00,20.00L0.00,20.00"]
-      KCanvasItem {rect} at (30,80) size 50x20 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,80.00)}] [fill={[id="linearUserSpace"]}] [data="M0.00,0.00L50.00,0.00L50.00,20.00L0.00,20.00"]
-      KCanvasItem {line} at (30,59) size 50x1 [stroke={[type=SOLID] [color=#CCCCCC]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,20.00L50.00,20.00"]
-      KCanvasItem {line} at (30,79) size 50x1 [stroke={[type=SOLID] [color=#CCCCCC]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,40.00L50.00,40.00"]
-    KCanvasContainer at (30,140) size 182x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,140.00)}] [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem {rect} at (30,140) size 60x60 [fill={[id="radialBoundingBoxPercentage"]}] [data="M0.00,0.00L60.00,0.00L60.00,60.00L0.00,60.00"]
-      KCanvasItem {rect} at (91,140) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(91.00,140.00)}] [fill={[id="radialBoundingBoxFraction"]}] [data="M0.00,0.00L60.00,0.00L60.00,60.00L0.00,60.00"]
-      KCanvasItem {rect} at (152,140) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(152.00,140.00)}] [fill={[id="radialUserSpace"]}] [data="M0.00,0.00L60.00,0.00L60.00,60.00L0.00,60.00"]
-    KCanvasContainer at (29,249) size 351x31 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,250.00)}] [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem {rect} at (29,249) size 51x31 [stroke={[type=SOLID] [color=#000000]}] [fill={[id="patternBoundingBoxPercentage"]}] [data="M0.00,0.00L50.00,0.00L50.00,30.00L0.00,30.00"]
-      KCanvasItem {rect} at (179,249) size 51x31 [transform={m=((1.00,0.00)(0.00,1.00)) t=(180.00,250.00)}] [stroke={[type=SOLID] [color=#000000]}] [fill={[id="patternBoundingBoxFraction"]}] [data="M0.00,0.00L50.00,0.00L50.00,30.00L0.00,30.00"]
-      KCanvasItem {rect} at (329,249) size 51x31 [transform={m=((1.00,0.00)(0.00,1.00)) t=(330.00,250.00)}] [stroke={[type=SOLID] [color=#000000]}] [fill={[id="patternUserSpace"]}] [data="M0.00,0.00L50.00,0.00L50.00,30.00L0.00,30.00"]
-    KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
-  KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
+KRenderingPaintServer {id="linearBoundingBoxPercentage" [type=LINEAR-GRADIENT] [stops=[]] [start=(0,0)] [end=(100,0)]}
+KRenderingPaintServer {id="linearBoundingBoxFraction" [type=LINEAR-GRADIENT] [stops=[]] [start=(0,0)] [end=(100,0)]}
+KRenderingPaintServer {id="linearUserSpace" [type=LINEAR-GRADIENT] [stops=[]] [bounding box mode=0] [start=(0,0)] [end=(50,0)]}
+KRenderingPaintServer {id="radialBoundingBoxPercentage" [type=RADIAL-GRADIENT] [stops=[]] [center=(25,25)] [focal=(25,25)] [radius=25.00]}
+KRenderingPaintServer {id="radialBoundingBoxFraction" [type=RADIAL-GRADIENT] [stops=[]] [center=(25,25)] [focal=(25,25)] [radius=25.00]}
+KRenderingPaintServer {id="radialUserSpace" [type=RADIAL-GRADIENT] [stops=[]] [bounding box mode=0] [center=(15,15)] [focal=(15,15)] [radius=15.00]}
+KRenderingPaintServer {id="patternBoundingBoxPercentage" [type=PATTERN] [x=0.00 y=0.00 w=0.00 h=0.00]}
+KRenderingPaintServer {id="patternBoundingBoxFraction" [type=PATTERN] [x=0.00 y=0.00 w=0.00 h=0.00]}
+KRenderingPaintServer {id="patternUserSpace" [type=PATTERN] [x=0.00 y=0.00 w=0.00 h=0.00]}
+layer at (0,0) size 480x360
+  RenderCanvas at (0,0) size 480x360
+    KCanvasContainer {svg} at (0,0) size 479x359
+      KCanvasContainer {g} at (0,0) size 479x359
+        KCanvasContainer {g} at (30,40) size 50x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,40.00)}]
+          KCanvasItem {rect} at (30,40) size 50x20 [fill={[type=LINEAR-GRADIENT] [stops=[]] [start=(0,0)] [end=(100,0)]}] [data="M0.00,0.00L50.00,0.00L50.00,20.00L0.00,20.00"]
+          KCanvasItem {rect} at (30,60) size 50x20 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,20.00)}] [fill={[type=LINEAR-GRADIENT] [stops=[]] [start=(0,0)] [end=(100,0)]}] [data="M0.00,0.00L50.00,0.00L50.00,20.00L0.00,20.00"]
+          KCanvasItem {rect} at (30,80) size 50x20 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,40.00)}] [fill={[type=LINEAR-GRADIENT] [stops=[]] [bounding box mode=0] [start=(0,0)] [end=(50,0)]}] [data="M0.00,0.00L50.00,0.00L50.00,20.00L0.00,20.00"]
+          KCanvasItem {line} at (30,59) size 50x1 [stroke={[type=SOLID] [color=#CCCCCC]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,20.00L50.00,20.00"]
+          KCanvasItem {line} at (30,79) size 50x1 [stroke={[type=SOLID] [color=#CCCCCC]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,40.00L50.00,40.00"]
+        KCanvasContainer {g} at (30,140) size 182x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,140.00)}]
+          KCanvasItem {rect} at (30,140) size 60x60 [fill={[type=RADIAL-GRADIENT] [stops=[]] [center=(25,25)] [focal=(25,25)] [radius=25.00]}] [data="M0.00,0.00L60.00,0.00L60.00,60.00L0.00,60.00"]
+          KCanvasItem {rect} at (91,140) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(61.00,0.00)}] [fill={[type=RADIAL-GRADIENT] [stops=[]] [center=(25,25)] [focal=(25,25)] [radius=25.00]}] [data="M0.00,0.00L60.00,0.00L60.00,60.00L0.00,60.00"]
+          KCanvasItem {rect} at (152,140) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(122.00,0.00)}] [fill={[type=RADIAL-GRADIENT] [stops=[]] [bounding box mode=0] [center=(15,15)] [focal=(15,15)] [radius=15.00]}] [data="M0.00,0.00L60.00,0.00L60.00,60.00L0.00,60.00"]
+        KCanvasContainer {pattern} at (0,0) size 0x0
+          KCanvasItem {circle} at (0,0) size 0x0 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.75,0.50L0.75,0.52L0.75,0.53L0.75,0.55L0.74,0.56L0.74,0.58L0.73,0.59L0.73,0.61L0.72,0.62L0.71,0.63L0.70,0.65L0.69,0.66L0.68,0.67L0.67,0.68L0.66,0.69L0.65,0.70L0.63,0.71L0.62,0.72L0.61,0.73L0.59,0.73L0.58,0.74L0.56,0.74L0.55,0.75L0.53,0.75L0.52,0.75L0.50,0.75L0.48,0.75L0.47,0.75L0.45,0.75L0.44,0.74L0.42,0.74L0.41,0.73L0.39,0.73L0.38,0.72L0.37,0.71L0.35,0.70L0.34,0.69L0.33,0.68L0.32,0.67L0.31,0.66L0.30,0.65L0.29,0.63L0.28,0.62L0.27,0.61L0.27,0.59L0.26,0.58L0.26,0.56L0.25,0.55L0.25,0.53L0.25,0.52L0.25,0.50L0.25,0.48L0.25,0.47L0.25,0.45L0.26,0.44L0.26,0.42L0.27,0.41L0.27,0.39L0.28,0.38L0.29,0.37L0.30,0.35L0.31,0.34L0.32,0.33L0.33,0.32L0.34,0.31L0.35,0.30L0.37,0.29L0.38,0.28L0.39,0.27L0.41,0.27L0.42,0.26L0.44,0.26L0.45,0.25L0.47,0.25L0.48,0.25L0.50,0.25L0.52,0.25L0.53,0.25L0.55,0.25L0.56,0.26L0.58,0.26L0.59,0.27L0.61,0.27L0.62,0.28L0.63,0.29L0.65,0.30L0.66,0.31L0.67,0.32L0.68,0.33L0.69,0.34L0.70,0.35L0.71,0.37L0.72,0.38L0.73,0.39L0.73,0.41L0.74,0.42L0.74,0.44L0.75,0.45L0.75,0.47L0.75,0.48"]
+          KCanvasItem {rect} at (0,0) size 0x0 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.40,0.40L0.60,0.40L0.60,0.60L0.40,0.60"]
+        KCanvasContainer {pattern} at (0,0) size 0x0
+          KCanvasItem {circle} at (0,0) size 0x0 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.75,0.50L0.75,0.52L0.75,0.53L0.75,0.55L0.74,0.56L0.74,0.58L0.73,0.59L0.73,0.61L0.72,0.62L0.71,0.63L0.70,0.65L0.69,0.66L0.68,0.67L0.67,0.68L0.66,0.69L0.65,0.70L0.63,0.71L0.62,0.72L0.61,0.73L0.59,0.73L0.58,0.74L0.56,0.74L0.55,0.75L0.53,0.75L0.52,0.75L0.50,0.75L0.48,0.75L0.47,0.75L0.45,0.75L0.44,0.74L0.42,0.74L0.41,0.73L0.39,0.73L0.38,0.72L0.37,0.71L0.35,0.70L0.34,0.69L0.33,0.68L0.32,0.67L0.31,0.66L0.30,0.65L0.29,0.63L0.28,0.62L0.27,0.61L0.27,0.59L0.26,0.58L0.26,0.56L0.25,0.55L0.25,0.53L0.25,0.52L0.25,0.50L0.25,0.48L0.25,0.47L0.25,0.45L0.26,0.44L0.26,0.42L0.27,0.41L0.27,0.39L0.28,0.38L0.29,0.37L0.30,0.35L0.31,0.34L0.32,0.33L0.33,0.32L0.34,0.31L0.35,0.30L0.37,0.29L0.38,0.28L0.39,0.27L0.41,0.27L0.42,0.26L0.44,0.26L0.45,0.25L0.47,0.25L0.48,0.25L0.50,0.25L0.52,0.25L0.53,0.25L0.55,0.25L0.56,0.26L0.58,0.26L0.59,0.27L0.61,0.27L0.62,0.28L0.63,0.29L0.65,0.30L0.66,0.31L0.67,0.32L0.68,0.33L0.69,0.34L0.70,0.35L0.71,0.37L0.72,0.38L0.73,0.39L0.73,0.41L0.74,0.42L0.74,0.44L0.75,0.45L0.75,0.47L0.75,0.48"]
+          KCanvasItem {rect} at (0,0) size 0x0 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.40,0.40L0.60,0.40L0.60,0.60L0.40,0.60"]
+        KCanvasContainer {pattern} at (15,5) size 20x20
+          KCanvasItem {circle} at (15,5) size 20x20 [fill={[type=SOLID] [color=#FF0000]}] [data="M35.00,15.00L34.98,15.63L34.92,16.25L34.82,16.87L34.69,17.49L34.51,18.09L34.30,18.68L34.05,19.26L33.76,19.82L33.44,20.36L33.09,20.88L32.71,21.37L32.29,21.85L31.85,22.29L31.37,22.71L30.88,23.09L30.36,23.44L29.82,23.76L29.26,24.05L28.68,24.30L28.09,24.51L27.49,24.69L26.87,24.82L26.25,24.92L25.63,24.98L25.00,25.00L24.37,24.98L23.75,24.92L23.13,24.82L22.51,24.69L21.91,24.51L21.32,24.30L20.74,24.05L20.18,23.76L19.64,23.44L19.12,23.09L18.63,22.71L18.15,22.29L17.71,21.85L17.29,21.37L16.91,20.88L16.56,20.36L16.24,19.82L15.95,19.26L15.70,18.68L15.49,18.09L15.31,17.49L15.18,16.87L15.08,16.25L15.02,15.63L15.00,15.00L15.02,14.37L15.08,13.75L15.18,13.13L15.31,12.51L15.49,11.91L15.70,11.32L15.95,10.74L16.24,10.18L16.56,9.64L16.91,9.12L17.29,8.63L17.71,8.15L18.15,7.71L18.63,7.29L19.12,6.91L19.64,6.56L20.18,6.24L20.74,5.95L21.32,5.70L21.91,5.49L22.51,5.31L23.13,5.18L23.75,5.08L24.37,5.02L25.00,5.00L25.63,5.02L26.25,5.08L26.87,5.18L27.49,5.31L28.09,5.49L28.68,5.70L29.26,5.95L29.82,6.24L30.36,6.56L30.88,6.91L31.37,7.29L31.85,7.71L32.29,8.15L32.71,8.63L33.09,9.12L33.44,9.64L33.76,10.18L34.05,10.74L34.30,11.32L34.51,11.91L34.69,12.51L34.82,13.13L34.92,13.75L34.98,14.37"]
+          KCanvasItem {rect} at (20,12) size 10x6 [fill={[type=SOLID] [color=#0000FF]}] [data="M20.00,12.00L30.00,12.00L30.00,18.00L20.00,18.00"]
+        KCanvasContainer {g} at (30,250) size 351x31 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,250.00)}]
+          KCanvasItem {rect} at (30,250) size 51x31 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=PATTERN] [x=0.00 y=0.00 w=0.00 h=0.00]}] [data="M0.00,0.00L50.00,0.00L50.00,30.00L0.00,30.00"]
+          KCanvasItem {rect} at (180,250) size 51x31 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,0.00)}] [stroke={[type=SOLID] [color=#000000]}] [fill={[type=PATTERN] [x=0.00 y=0.00 w=0.00 h=0.00]}] [data="M0.00,0.00L50.00,0.00L50.00,30.00L0.00,30.00"]
+          KCanvasItem {rect} at (330,250) size 51x31 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,0.00)}] [stroke={[type=SOLID] [color=#000000]}] [fill={[type=PATTERN] [x=0.00 y=0.00 w=0.00 h=0.00]}] [data="M0.00,0.00L50.00,0.00L50.00,30.00L0.00,30.00"]
+        KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
+      KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
index 9e230b6bd5803c7a96bf4c144378047fa7a30513..8e0f77c53f44fa4c4c648f263f6f450214f0b32e 100644 (file)
@@ -1,22 +1,20 @@
-KCanvasRegistry: empty
-KCanvasContainer at (0,0) size 479x359
-  KCanvasContainer at (0,20) size 145x255 [fill={[type=SOLID] [color=#000000]}]
-    KCanvasContainer at (25,20) size 20x20 [transform={m=((4.00,0.00)(0.00,4.00)) t=(5.00,0.00)}] [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem {circle} at (25,20) size 20x20 [fill={[type=SOLID] [color=#000000]}] [data="M10.00,7.50L10.00,7.66L9.98,7.81L9.96,7.97L9.92,8.12L9.88,8.27L9.82,8.42L9.76,8.56L9.69,8.70L9.61,8.84L9.52,8.97L9.43,9.09L9.32,9.21L9.21,9.32L9.09,9.43L8.97,9.52L8.84,9.61L8.70,9.69L8.56,9.76L8.42,9.82L8.27,9.88L8.12,9.92L7.97,9.96L7.81,9.98L7.66,10.00L7.50,10.00L7.34,10.00L7.19,9.98L7.03,9.96L6.88,9.92L6.73,9.88L6.58,9.82L6.44,9.76L6.30,9.69L6.16,9.61L6.03,9.52L5.91,9.43L5.79,9.32L5.68,9.21L5.57,9.09L5.48,8.97L5.39,8.84L5.31,8.70L5.24,8.56L5.18,8.42L5.12,8.27L5.08,8.12L5.04,7.97L5.02,7.81L5.00,7.66L5.00,7.50L5.00,7.34L5.02,7.19L5.04,7.03L5.08,6.88L5.12,6.73L5.18,6.58L5.24,6.44L5.31,6.30L5.39,6.16L5.48,6.03L5.57,5.91L5.68,5.79L5.79,5.68L5.91,5.57L6.03,5.48L6.16,5.39L6.30,5.31L6.44,5.24L6.58,5.18L6.73,5.12L6.88,5.08L7.03,5.04L7.19,5.02L7.34,5.00L7.50,5.00L7.66,5.00L7.81,5.02L7.97,5.04L8.12,5.08L8.27,5.12L8.42,5.18L8.56,5.24L8.70,5.31L8.84,5.39L8.97,5.48L9.09,5.57L9.21,5.68L9.32,5.79L9.43,5.91L9.52,6.03L9.61,6.16L9.69,6.30L9.76,6.44L9.82,6.58L9.88,6.73L9.92,6.88L9.96,7.03L9.98,7.19L10.00,7.34"]
-      KCanvasItem {circle} at (29,24) size 12x12 [fill={[type=SOLID] [color=#FF0000]}] [data="M9.00,7.50L9.00,7.59L8.99,7.69L8.97,7.78L8.95,7.87L8.93,7.96L8.89,8.05L8.86,8.14L8.81,8.22L8.77,8.30L8.71,8.38L8.66,8.46L8.59,8.53L8.53,8.59L8.46,8.66L8.38,8.71L8.30,8.77L8.22,8.81L8.14,8.86L8.05,8.89L7.96,8.93L7.87,8.95L7.78,8.97L7.69,8.99L7.59,9.00L7.50,9.00L7.41,9.00L7.31,8.99L7.22,8.97L7.13,8.95L7.04,8.93L6.95,8.89L6.86,8.86L6.78,8.81L6.70,8.77L6.62,8.71L6.54,8.66L6.47,8.59L6.41,8.53L6.34,8.46L6.29,8.38L6.23,8.30L6.19,8.22L6.14,8.14L6.11,8.05L6.07,7.96L6.05,7.87L6.03,7.78L6.01,7.69L6.00,7.59L6.00,7.50L6.00,7.41L6.01,7.31L6.03,7.22L6.05,7.13L6.07,7.04L6.11,6.95L6.14,6.86L6.19,6.78L6.23,6.70L6.29,6.62L6.34,6.54L6.41,6.47L6.47,6.41L6.54,6.34L6.62,6.29L6.70,6.23L6.78,6.19L6.86,6.14L6.95,6.11L7.04,6.07L7.13,6.05L7.22,6.03L7.31,6.01L7.41,6.00L7.50,6.00L7.59,6.00L7.69,6.01L7.78,6.03L7.87,6.05L7.96,6.07L8.05,6.11L8.14,6.14L8.22,6.19L8.30,6.23L8.38,6.29L8.46,6.34L8.53,6.41L8.59,6.47L8.66,6.54L8.71,6.62L8.77,6.70L8.81,6.78L8.86,6.86L8.89,6.95L8.93,7.04L8.95,7.13L8.97,7.22L8.99,7.31L9.00,7.41"]
-    KCanvasContainer at (25,70) size 20x20 [transform={m=((4.00,0.00)(0.00,4.00)) t=(5.00,50.00)}] [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem {circle} at (25,70) size 20x20 [fill={[type=SOLID] [color=#000000]}] [data="M10.00,7.50L10.00,7.66L9.98,7.81L9.96,7.97L9.92,8.12L9.88,8.27L9.82,8.42L9.76,8.56L9.69,8.70L9.61,8.84L9.52,8.97L9.43,9.09L9.32,9.21L9.21,9.32L9.09,9.43L8.97,9.52L8.84,9.61L8.70,9.69L8.56,9.76L8.42,9.82L8.27,9.88L8.12,9.92L7.97,9.96L7.81,9.98L7.66,10.00L7.50,10.00L7.34,10.00L7.19,9.98L7.03,9.96L6.88,9.92L6.73,9.88L6.58,9.82L6.44,9.76L6.30,9.69L6.16,9.61L6.03,9.52L5.91,9.43L5.79,9.32L5.68,9.21L5.57,9.09L5.48,8.97L5.39,8.84L5.31,8.70L5.24,8.56L5.18,8.42L5.12,8.27L5.08,8.12L5.04,7.97L5.02,7.81L5.00,7.66L5.00,7.50L5.00,7.34L5.02,7.19L5.04,7.03L5.08,6.88L5.12,6.73L5.18,6.58L5.24,6.44L5.31,6.30L5.39,6.16L5.48,6.03L5.57,5.91L5.68,5.79L5.79,5.68L5.91,5.57L6.03,5.48L6.16,5.39L6.30,5.31L6.44,5.24L6.58,5.18L6.73,5.12L6.88,5.08L7.03,5.04L7.19,5.02L7.34,5.00L7.50,5.00L7.66,5.00L7.81,5.02L7.97,5.04L8.12,5.08L8.27,5.12L8.42,5.18L8.56,5.24L8.70,5.31L8.84,5.39L8.97,5.48L9.09,5.57L9.21,5.68L9.32,5.79L9.43,5.91L9.52,6.03L9.61,6.16L9.69,6.30L9.76,6.44L9.82,6.58L9.88,6.73L9.92,6.88L9.96,7.03L9.98,7.19L10.00,7.34"]
-      KCanvasItem {circle} at (29,73) size 11x11 [fill={[type=SOLID] [color=#FF0000]}] [data="M9.00,7.50L9.00,7.59L8.99,7.69L8.98,7.78L8.96,7.87L8.93,7.96L8.90,8.05L8.86,8.14L8.82,8.22L8.77,8.30L8.72,8.38L8.66,8.45L8.60,8.53L8.53,8.59L8.46,8.65L8.38,8.71L8.31,8.77L8.22,8.81L8.14,8.86L8.05,8.89L7.97,8.93L7.88,8.95L7.78,8.97L7.69,8.99L7.60,9.00L7.50,9.00L7.41,9.00L7.31,8.99L7.22,8.97L7.13,8.95L7.04,8.93L6.95,8.89L6.86,8.86L6.78,8.81L6.70,8.77L6.62,8.71L6.55,8.65L6.48,8.59L6.41,8.53L6.35,8.45L6.29,8.38L6.24,8.30L6.19,8.22L6.15,8.14L6.11,8.05L6.08,7.96L6.05,7.87L6.03,7.78L6.01,7.69L6.01,7.59L6.00,7.50L6.01,7.40L6.01,7.31L6.03,7.22L6.05,7.13L6.08,7.04L6.11,6.95L6.15,6.86L6.19,6.78L6.24,6.70L6.29,6.62L6.35,6.54L6.41,6.47L6.48,6.41L6.55,6.34L6.62,6.29L6.70,6.23L6.78,6.18L6.86,6.14L6.95,6.10L7.04,6.07L7.13,6.05L7.22,6.03L7.31,6.01L7.41,6.00L7.50,6.00L7.60,6.00L7.69,6.01L7.78,6.03L7.88,6.05L7.97,6.07L8.05,6.10L8.14,6.14L8.22,6.18L8.31,6.23L8.38,6.29L8.46,6.34L8.53,6.41L8.60,6.47L8.66,6.54L8.72,6.62L8.77,6.70L8.82,6.78L8.86,6.86L8.90,6.95L8.93,7.04L8.96,7.13L8.98,7.22L8.99,7.31L9.00,7.40"]
-    KCanvasContainer at (10,115) size 40x40 [transform={m=((4.00,0.00)(0.00,4.00)) t=(30.00,115.00)}] [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem {rect} at (10,115) size 40x20 [fill={[type=SOLID] [color=#000000]}] [data="M-5.00,0.00L5.00,0.00L5.00,5.00L-5.00,5.00"]
-      KCanvasItem {rect} at (10,135) size 40x20 [fill={[type=SOLID] [color=#FF0000]}] [data="M-5.00,5.00L5.00,5.00L5.00,10.00L-5.00,10.00"]
-    KCanvasContainer at (10,175) size 40x40 [transform={m=((4.00,0.00)(0.00,4.00)) t=(30.00,175.00)}] [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem {rect} at (10,175) size 40x20 [fill={[type=SOLID] [color=#000000]}] [data="M-5.00,0.00L5.00,0.00L5.00,5.00L-5.00,5.00"]
-      KCanvasItem {rect} at (10,195) size 39x20 [fill={[type=SOLID] [color=#FF0000]}] [data="M-5.00,5.00L5.00,5.00L5.00,10.00L-5.00,10.00"]
-    KCanvasContainer at (0,244) size 145x31 [transform={m=((4.00,0.00)(4.00,4.00)) t=(30.00,260.00)}] [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem {circle} at (1,245) size 56x28 [fill={[type=SOLID] [color=#000000]}] [data="M3.54,0.00L3.53,0.22L3.51,0.44L3.47,0.66L3.42,0.88L3.36,1.09L3.29,1.30L3.20,1.51L3.10,1.70L2.99,1.89L2.86,2.08L2.72,2.25L2.58,2.42L2.42,2.58L2.25,2.72L2.08,2.86L1.89,2.99L1.70,3.10L1.51,3.20L1.30,3.29L1.09,3.36L0.88,3.42L0.66,3.47L0.44,3.51L0.22,3.53L0.00,3.54L-0.22,3.53L-0.44,3.51L-0.66,3.47L-0.88,3.42L-1.09,3.36L-1.30,3.29L-1.51,3.20L-1.70,3.10L-1.89,2.99L-2.08,2.86L-2.25,2.72L-2.42,2.58L-2.58,2.42L-2.72,2.25L-2.86,2.08L-2.99,1.89L-3.10,1.70L-3.20,1.51L-3.29,1.30L-3.36,1.09L-3.42,0.88L-3.47,0.66L-3.51,0.44L-3.53,0.22L-3.54,0.00L-3.53,-0.22L-3.51,-0.44L-3.47,-0.66L-3.42,-0.88L-3.36,-1.09L-3.29,-1.30L-3.20,-1.51L-3.10,-1.70L-2.99,-1.89L-2.86,-2.08L-2.72,-2.25L-2.58,-2.42L-2.42,-2.58L-2.25,-2.72L-2.08,-2.86L-1.89,-2.99L-1.70,-3.10L-1.51,-3.20L-1.30,-3.29L-1.09,-3.36L-0.88,-3.42L-0.66,-3.47L-0.44,-3.51L-0.22,-3.53L-0.00,-3.54L0.22,-3.53L0.44,-3.51L0.66,-3.47L0.88,-3.42L1.09,-3.36L1.30,-3.29L1.51,-3.20L1.70,-3.10L1.89,-2.99L2.08,-2.86L2.25,-2.72L2.42,-2.58L2.58,-2.42L2.72,-2.25L2.86,-2.08L2.99,-1.89L3.10,-1.70L3.20,-1.51L3.29,-1.30L3.36,-1.09L3.42,-0.88L3.47,-0.66L3.51,-0.44L3.53,-0.22"]
-      KCanvasItem {circle} at (41,245) size 56x28 [fill={[type=SOLID] [color=#FF0000]}] [data="M13.54,0.00L13.53,0.22L13.51,0.44L13.47,0.66L13.42,0.88L13.36,1.09L13.29,1.30L13.20,1.51L13.10,1.70L12.99,1.89L12.86,2.08L12.72,2.25L12.58,2.42L12.42,2.58L12.25,2.72L12.08,2.86L11.89,2.99L11.70,3.10L11.51,3.20L11.30,3.29L11.09,3.36L10.88,3.42L10.66,3.47L10.44,3.51L10.22,3.53L10.00,3.54L9.78,3.53L9.56,3.51L9.34,3.47L9.12,3.42L8.91,3.36L8.70,3.29L8.49,3.20L8.30,3.10L8.11,2.99L7.92,2.86L7.75,2.72L7.58,2.58L7.42,2.42L7.28,2.25L7.14,2.08L7.01,1.89L6.90,1.70L6.80,1.51L6.71,1.30L6.64,1.09L6.58,0.88L6.53,0.66L6.49,0.44L6.47,0.22L6.46,0.00L6.47,-0.22L6.49,-0.44L6.53,-0.66L6.58,-0.88L6.64,-1.09L6.71,-1.30L6.80,-1.51L6.90,-1.70L7.01,-1.89L7.14,-2.08L7.28,-2.25L7.42,-2.42L7.58,-2.58L7.75,-2.72L7.92,-2.86L8.11,-2.99L8.30,-3.10L8.49,-3.20L8.70,-3.29L8.91,-3.36L9.12,-3.42L9.34,-3.47L9.56,-3.51L9.78,-3.53L10.00,-3.54L10.22,-3.53L10.44,-3.51L10.66,-3.47L10.88,-3.42L11.09,-3.36L11.30,-3.29L11.51,-3.20L11.70,-3.10L11.89,-2.99L12.08,-2.86L12.25,-2.72L12.42,-2.58L12.58,-2.42L12.72,-2.25L12.86,-2.08L12.99,-1.89L13.10,-1.70L13.20,-1.51L13.29,-1.30L13.36,-1.09L13.42,-0.88L13.47,-0.66L13.51,-0.44L13.53,-0.22"]
-      KCanvasItem {circle} at (81,245) size 56x28 [fill={[type=SOLID] [color=#008000]}] [data="M23.54,0.00L23.53,0.22L23.51,0.44L23.47,0.66L23.42,0.88L23.36,1.09L23.29,1.30L23.20,1.51L23.10,1.70L22.99,1.89L22.86,2.08L22.72,2.25L22.58,2.42L22.42,2.58L22.25,2.72L22.08,2.86L21.89,2.99L21.70,3.10L21.51,3.20L21.30,3.29L21.09,3.36L20.88,3.42L20.66,3.47L20.44,3.51L20.22,3.53L20.00,3.54L19.78,3.53L19.56,3.51L19.34,3.47L19.12,3.42L18.91,3.36L18.70,3.29L18.49,3.20L18.30,3.10L18.11,2.99L17.92,2.86L17.75,2.72L17.58,2.58L17.42,2.42L17.28,2.25L17.14,2.08L17.01,1.89L16.90,1.70L16.80,1.51L16.71,1.30L16.64,1.09L16.58,0.88L16.53,0.66L16.49,0.44L16.47,0.22L16.46,0.00L16.47,-0.22L16.49,-0.44L16.53,-0.66L16.58,-0.88L16.64,-1.09L16.71,-1.30L16.80,-1.51L16.90,-1.70L17.01,-1.89L17.14,-2.08L17.28,-2.25L17.42,-2.42L17.58,-2.58L17.75,-2.72L17.92,-2.86L18.11,-2.99L18.30,-3.10L18.49,-3.20L18.70,-3.29L18.91,-3.36L19.12,-3.42L19.34,-3.47L19.56,-3.51L19.78,-3.53L20.00,-3.54L20.22,-3.53L20.44,-3.51L20.66,-3.47L20.88,-3.42L21.09,-3.36L21.30,-3.29L21.51,-3.20L21.70,-3.10L21.89,-2.99L22.08,-2.86L22.25,-2.72L22.42,-2.58L22.58,-2.42L22.72,-2.25L22.86,-2.08L22.99,-1.89L23.10,-1.70L23.20,-1.51L23.29,-1.30L23.36,-1.09L23.42,-0.88L23.47,-0.66L23.51,-0.44L23.53,-0.22"]
-      KCanvasItem {line} at (0,244) size 116x2 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=0.50]}] [data="M-3.54,-3.54L25.00,-3.54"]
-      KCanvasItem {line} at (29,273) size 116x2 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=0.50]}] [data="M-3.54,3.54L25.00,3.54"]
-  KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
+layer at (0,0) size 480x360
+  RenderCanvas at (0,0) size 480x360
+    KCanvasContainer {svg} at (0,0) size 479x359
+      KCanvasContainer {g} at (6,20) size 92x256
+        KCanvasContainer {g} at (25,20) size 20x20 [transform={m=((4.00,0.00)(0.00,4.00)) t=(5.00,0.00)}]
+          KCanvasItem {circle} at (25,20) size 20x20 [fill={[type=SOLID] [color=#000000]}] [data="M10.00,7.50L10.00,7.66L9.98,7.81L9.96,7.97L9.92,8.12L9.88,8.27L9.82,8.42L9.76,8.56L9.69,8.70L9.61,8.84L9.52,8.97L9.43,9.09L9.32,9.21L9.21,9.32L9.09,9.43L8.97,9.52L8.84,9.61L8.70,9.69L8.56,9.76L8.42,9.82L8.27,9.88L8.12,9.92L7.97,9.96L7.81,9.98L7.66,10.00L7.50,10.00L7.34,10.00L7.19,9.98L7.03,9.96L6.88,9.92L6.73,9.88L6.58,9.82L6.44,9.76L6.30,9.69L6.16,9.61L6.03,9.52L5.91,9.43L5.79,9.32L5.68,9.21L5.57,9.09L5.48,8.97L5.39,8.84L5.31,8.70L5.24,8.56L5.18,8.42L5.12,8.27L5.08,8.12L5.04,7.97L5.02,7.81L5.00,7.66L5.00,7.50L5.00,7.34L5.02,7.19L5.04,7.03L5.08,6.88L5.12,6.73L5.18,6.58L5.24,6.44L5.31,6.30L5.39,6.16L5.48,6.03L5.57,5.91L5.68,5.79L5.79,5.68L5.91,5.57L6.03,5.48L6.16,5.39L6.30,5.31L6.44,5.24L6.58,5.18L6.73,5.12L6.88,5.08L7.03,5.04L7.19,5.02L7.34,5.00L7.50,5.00L7.66,5.00L7.81,5.02L7.97,5.04L8.12,5.08L8.27,5.12L8.42,5.18L8.56,5.24L8.70,5.31L8.84,5.39L8.97,5.48L9.09,5.57L9.21,5.68L9.32,5.79L9.43,5.91L9.52,6.03L9.61,6.16L9.69,6.30L9.76,6.44L9.82,6.58L9.88,6.73L9.92,6.88L9.96,7.03L9.98,7.19L10.00,7.34"]
+          KCanvasItem {circle} at (29,24) size 12x12 [fill={[type=SOLID] [color=#FF0000]}] [data="M9.00,7.50L9.00,7.59L8.99,7.69L8.97,7.78L8.95,7.87L8.93,7.96L8.89,8.05L8.86,8.14L8.81,8.22L8.77,8.30L8.71,8.38L8.66,8.46L8.59,8.53L8.53,8.59L8.46,8.66L8.38,8.71L8.30,8.77L8.22,8.81L8.14,8.86L8.05,8.89L7.96,8.93L7.87,8.95L7.78,8.97L7.69,8.99L7.59,9.00L7.50,9.00L7.41,9.00L7.31,8.99L7.22,8.97L7.13,8.95L7.04,8.93L6.95,8.89L6.86,8.86L6.78,8.81L6.70,8.77L6.62,8.71L6.54,8.66L6.47,8.59L6.41,8.53L6.34,8.46L6.29,8.38L6.23,8.30L6.19,8.22L6.14,8.14L6.11,8.05L6.07,7.96L6.05,7.87L6.03,7.78L6.01,7.69L6.00,7.59L6.00,7.50L6.00,7.41L6.01,7.31L6.03,7.22L6.05,7.13L6.07,7.04L6.11,6.95L6.14,6.86L6.19,6.78L6.23,6.70L6.29,6.62L6.34,6.54L6.41,6.47L6.47,6.41L6.54,6.34L6.62,6.29L6.70,6.23L6.78,6.19L6.86,6.14L6.95,6.11L7.04,6.07L7.13,6.05L7.22,6.03L7.31,6.01L7.41,6.00L7.50,6.00L7.59,6.00L7.69,6.01L7.78,6.03L7.87,6.05L7.96,6.07L8.05,6.11L8.14,6.14L8.22,6.19L8.30,6.23L8.38,6.29L8.46,6.34L8.53,6.41L8.59,6.47L8.66,6.54L8.71,6.62L8.77,6.70L8.81,6.78L8.86,6.86L8.89,6.95L8.93,7.04L8.95,7.13L8.97,7.22L8.99,7.31L9.00,7.41"]
+        KCanvasContainer {g} at (25,70) size 20x20 [transform={m=((4.00,0.00)(0.00,4.00)) t=(5.00,50.00)}]
+          KCanvasItem {circle} at (25,70) size 20x20 [fill={[type=SOLID] [color=#000000]}] [data="M10.00,7.50L10.00,7.66L9.98,7.81L9.96,7.97L9.92,8.12L9.88,8.27L9.82,8.42L9.76,8.56L9.69,8.70L9.61,8.84L9.52,8.97L9.43,9.09L9.32,9.21L9.21,9.32L9.09,9.43L8.97,9.52L8.84,9.61L8.70,9.69L8.56,9.76L8.42,9.82L8.27,9.88L8.12,9.92L7.97,9.96L7.81,9.98L7.66,10.00L7.50,10.00L7.34,10.00L7.19,9.98L7.03,9.96L6.88,9.92L6.73,9.88L6.58,9.82L6.44,9.76L6.30,9.69L6.16,9.61L6.03,9.52L5.91,9.43L5.79,9.32L5.68,9.21L5.57,9.09L5.48,8.97L5.39,8.84L5.31,8.70L5.24,8.56L5.18,8.42L5.12,8.27L5.08,8.12L5.04,7.97L5.02,7.81L5.00,7.66L5.00,7.50L5.00,7.34L5.02,7.19L5.04,7.03L5.08,6.88L5.12,6.73L5.18,6.58L5.24,6.44L5.31,6.30L5.39,6.16L5.48,6.03L5.57,5.91L5.68,5.79L5.79,5.68L5.91,5.57L6.03,5.48L6.16,5.39L6.30,5.31L6.44,5.24L6.58,5.18L6.73,5.12L6.88,5.08L7.03,5.04L7.19,5.02L7.34,5.00L7.50,5.00L7.66,5.00L7.81,5.02L7.97,5.04L8.12,5.08L8.27,5.12L8.42,5.18L8.56,5.24L8.70,5.31L8.84,5.39L8.97,5.48L9.09,5.57L9.21,5.68L9.32,5.79L9.43,5.91L9.52,6.03L9.61,6.16L9.69,6.30L9.76,6.44L9.82,6.58L9.88,6.73L9.92,6.88L9.96,7.03L9.98,7.19L10.00,7.34"]
+        KCanvasContainer {g} at (10,115) size 40x40 [transform={m=((4.00,0.00)(0.00,4.00)) t=(30.00,115.00)}]
+          KCanvasItem {rect} at (10,115) size 40x20 [fill={[type=SOLID] [color=#000000]}] [data="M-5.00,0.00L5.00,0.00L5.00,5.00L-5.00,5.00"]
+          KCanvasItem {rect} at (10,135) size 40x20 [fill={[type=SOLID] [color=#FF0000]}] [data="M-5.00,5.00L5.00,5.00L5.00,10.00L-5.00,10.00"]
+        KCanvasContainer {g} at (10,175) size 40x20 [transform={m=((4.00,0.00)(0.00,4.00)) t=(30.00,175.00)}]
+          KCanvasItem {rect} at (10,175) size 40x20 [fill={[type=SOLID] [color=#000000]}] [data="M-5.00,0.00L5.00,0.00L5.00,5.00L-5.00,5.00"]
+        KCanvasContainer {g} at (6,248) size 92x28 [transform={m=((4.00,0.00)(4.00,4.00)) t=(30.00,260.00)}]
+          KCanvasItem {circle} at (6,248) size 56x28 [fill={[type=SOLID] [color=#000000]}] [data="M3.54,0.00L3.53,0.22L3.51,0.44L3.47,0.66L3.42,0.88L3.36,1.09L3.29,1.30L3.20,1.51L3.10,1.70L2.99,1.89L2.86,2.08L2.72,2.25L2.58,2.42L2.42,2.58L2.25,2.72L2.08,2.86L1.89,2.99L1.70,3.10L1.51,3.20L1.30,3.29L1.09,3.36L0.88,3.42L0.66,3.47L0.44,3.51L0.22,3.53L0.00,3.54L-0.22,3.53L-0.44,3.51L-0.66,3.47L-0.88,3.42L-1.09,3.36L-1.30,3.29L-1.51,3.20L-1.70,3.10L-1.89,2.99L-2.08,2.86L-2.25,2.72L-2.42,2.58L-2.58,2.42L-2.72,2.25L-2.86,2.08L-2.99,1.89L-3.10,1.70L-3.20,1.51L-3.29,1.30L-3.36,1.09L-3.42,0.88L-3.47,0.66L-3.51,0.44L-3.53,0.22L-3.54,0.00L-3.53,-0.22L-3.51,-0.44L-3.47,-0.66L-3.42,-0.88L-3.36,-1.09L-3.29,-1.30L-3.20,-1.51L-3.10,-1.70L-2.99,-1.89L-2.86,-2.08L-2.72,-2.25L-2.58,-2.42L-2.42,-2.58L-2.25,-2.72L-2.08,-2.86L-1.89,-2.99L-1.70,-3.10L-1.51,-3.20L-1.30,-3.29L-1.09,-3.36L-0.88,-3.42L-0.66,-3.47L-0.44,-3.51L-0.22,-3.53L-0.00,-3.54L0.22,-3.53L0.44,-3.51L0.66,-3.47L0.88,-3.42L1.09,-3.36L1.30,-3.29L1.51,-3.20L1.70,-3.10L1.89,-2.99L2.08,-2.86L2.25,-2.72L2.42,-2.58L2.58,-2.42L2.72,-2.25L2.86,-2.08L2.99,-1.89L3.10,-1.70L3.20,-1.51L3.29,-1.30L3.36,-1.09L3.42,-0.88L3.47,-0.66L3.51,-0.44L3.53,-0.22"]
+          KCanvasItem {circle} at (42,248) size 56x28 [fill={[type=SOLID] [color=#FF0000]}] [data="M13.54,0.00L13.53,0.22L13.51,0.44L13.47,0.66L13.42,0.88L13.36,1.09L13.29,1.30L13.20,1.51L13.10,1.70L12.99,1.89L12.86,2.08L12.72,2.25L12.58,2.42L12.42,2.58L12.25,2.72L12.08,2.86L11.89,2.99L11.70,3.10L11.51,3.20L11.30,3.29L11.09,3.36L10.88,3.42L10.66,3.47L10.44,3.51L10.22,3.53L10.00,3.54L9.78,3.53L9.56,3.51L9.34,3.47L9.12,3.42L8.91,3.36L8.70,3.29L8.49,3.20L8.30,3.10L8.11,2.99L7.92,2.86L7.75,2.72L7.58,2.58L7.42,2.42L7.28,2.25L7.14,2.08L7.01,1.89L6.90,1.70L6.80,1.51L6.71,1.30L6.64,1.09L6.58,0.88L6.53,0.66L6.49,0.44L6.47,0.22L6.46,0.00L6.47,-0.22L6.49,-0.44L6.53,-0.66L6.58,-0.88L6.64,-1.09L6.71,-1.30L6.80,-1.51L6.90,-1.70L7.01,-1.89L7.14,-2.08L7.28,-2.25L7.42,-2.42L7.58,-2.58L7.75,-2.72L7.92,-2.86L8.11,-2.99L8.30,-3.10L8.49,-3.20L8.70,-3.29L8.91,-3.36L9.12,-3.42L9.34,-3.47L9.56,-3.51L9.78,-3.53L10.00,-3.54L10.22,-3.53L10.44,-3.51L10.66,-3.47L10.88,-3.42L11.09,-3.36L11.30,-3.29L11.51,-3.20L11.70,-3.10L11.89,-2.99L12.08,-2.86L12.25,-2.72L12.42,-2.58L12.58,-2.42L12.72,-2.25L12.86,-2.08L12.99,-1.89L13.10,-1.70L13.20,-1.51L13.29,-1.30L13.36,-1.09L13.42,-0.88L13.47,-0.66L13.51,-0.44L13.53,-0.22"]
+          KCanvasItem {line} at (6,248) size 112x0 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=0.50]}] [data="M-3.54,-3.54L25.00,-3.54"]
+          KCanvasItem {line} at (30,272) size 112x0 [stroke={[type=SOLID] [color=#CCCCCC] [stroke width=0.50]}] [data="M-3.54,3.54L25.00,3.54"]
+      KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
index 2a3a29614cbcab2ff43690e9cee3b1eccb72fba1..ee652efb0bc8905ed430818890d9cb219b726fcd 100644 (file)
@@ -1,18 +1,18 @@
-KCanvasRegistry: empty
-KCanvasContainer at (0,0) size 2000x2000
-  KCanvasContainer at (0,0) size 2000x2000 [fill={[type=SOLID] [color=#000000]}]
-    KCanvasContainer at (0,0) size 2000x2000 [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem {rect} at (0,0) size 2000x2000 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L2000.00,0.00L2000.00,2000.00L0.00,2000.00"]
-      KCanvasItem {rect} at (0,0) size 480x360 [fill={[type=SOLID] [color=#FFFFFF]}] [data="M0.00,0.00L480.00,0.00L480.00,360.00L0.00,360.00"]
-    KCanvasContainer at (20,80) size 200x181 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,60.00)}] [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem {rect} at (20,80) size 200x1 [fill={[type=SOLID] [color=#000000]}] [data="M20.00,20.00L220.00,20.00L220.00,21.00L20.00,21.00"]
-      KCanvasItem {rect} at (20,100) size 200x1 [fill={[type=SOLID] [color=#000000]}] [data="M20.00,40.00L220.00,40.00L220.00,41.00L20.00,41.00"]
-      KCanvasContainer at (0,0) size 0x0 [fill={[type=SOLID] [color=#000000]}]
-      KCanvasContainer at (0,0) size 0x0 [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem {rect} at (20,160) size 200x1 [fill={[type=SOLID] [color=#000000]}] [data="M20.00,100.00L220.02,100.00L220.02,101.00L20.00,101.00"]
-      KCanvasItem {rect} at (20,180) size 90x1 [fill={[type=SOLID] [color=#000000]}] [data="M20.00,120.00L110.00,120.00L110.00,121.00L20.00,121.00"]
-      KCanvasItem {rect} at (20,200) size 90x1 [fill={[type=SOLID] [color=#000000]}] [data="M20.00,140.00L110.00,140.00L110.00,141.00L20.00,141.00"]
-      KCanvasItem {rect} at (20,220) size 90x1 [fill={[type=SOLID] [color=#000000]}] [data="M20.00,160.00L110.00,160.00L110.00,161.00L20.00,161.00"]
-      KCanvasItem {rect} at (20,240) size 90x1 [fill={[type=SOLID] [color=#000000]}] [data="M20.00,180.00L110.00,180.00L110.00,181.00L20.00,181.00"]
-      KCanvasItem {rect} at (20,260) size 90x1 [fill={[type=SOLID] [color=#000000]}] [data="M20.00,200.00L110.00,200.00L110.00,201.00L20.00,201.00"]
-  KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
+layer at (0,0) size 480x360
+  RenderCanvas at (0,0) size 480x360
+    KCanvasContainer {svg} at (0,0) size 2000x2000
+      KCanvasContainer {g} at (0,0) size 2000x2000
+        KCanvasContainer {g} at (0,0) size 2000x2000
+          KCanvasItem {rect} at (0,0) size 2000x2000 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L2000.00,0.00L2000.00,2000.00L0.00,2000.00"]
+          KCanvasItem {rect} at (0,0) size 480x360 [fill={[type=SOLID] [color=#FFFFFF]}] [data="M0.00,0.00L480.00,0.00L480.00,360.00L0.00,360.00"]
+        KCanvasContainer {g} at (20,80) size 200x181 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,60.00)}]
+          KCanvasItem {rect} at (20,80) size 200x1 [fill={[type=SOLID] [color=#000000]}] [data="M20.00,20.00L220.00,20.00L220.00,21.00L20.00,21.00"]
+          KCanvasItem {rect} at (20,100) size 200x1 [fill={[type=SOLID] [color=#000000]}] [data="M20.00,40.00L220.00,40.00L220.00,41.00L20.00,41.00"]
+          KCanvasContainer {g} at (0,60) size 0x0
+          KCanvasContainer {g} at (0,60) size 0x0
+          KCanvasItem {rect} at (20,180) size 90x1 [fill={[type=SOLID] [color=#000000]}] [data="M20.00,120.00L110.00,120.00L110.00,121.00L20.00,121.00"]
+          KCanvasItem {rect} at (20,200) size 90x1 [fill={[type=SOLID] [color=#000000]}] [data="M20.00,140.00L110.00,140.00L110.00,141.00L20.00,141.00"]
+          KCanvasItem {rect} at (20,220) size 90x1 [fill={[type=SOLID] [color=#000000]}] [data="M20.00,160.00L110.00,160.00L110.00,161.00L20.00,161.00"]
+          KCanvasItem {rect} at (20,240) size 90x1 [fill={[type=SOLID] [color=#000000]}] [data="M20.00,180.00L110.00,180.00L110.00,181.00L20.00,181.00"]
+          KCanvasItem {rect} at (20,260) size 90x1 [fill={[type=SOLID] [color=#000000]}] [data="M20.00,200.00L110.00,200.00L110.00,201.00L20.00,201.00"]
+      KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
index 24e44208a307c6cd538e38daf6f1796bbd258218..ed10be1f3e695d72529306e0b708115c20e8f58e 100644 (file)
@@ -5,16 +5,16 @@ KCanvasResource {id="BlendDarken" [type=FILTER]  [bounding box=at (0,0) size 100
 KCanvasResource {id="BlendLighten" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=FLOOD] [in="SourceGraphic"] [result="img2"] [color=#00FF00] [opacity=0.50], [type=BLEND] [in="SourceGraphic"] [in2="img2"] [blend mode=LIGHTEN]]]}
 layer at (0,0) size 480x360
   RenderCanvas at (0,0) size 480x360
-    KCanvasContainer {svg} at (0,0) size 158x118
-      KCanvasContainer {g} at (30,5) size 120x98
-        KCanvasItem {image} at (40,5) size 100x98 [fill={[type=IMAGE] [bounding box=at (0,0) size 100x1]}] [data="M40.00,5.00L140.00,5.00L140.00,103.00L40.00,103.00"]
-        KCanvasItem {rect} at (30,10) size 120x10 [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 (30,23) size 120x10 [opacity=0.50] [fill={[type=SOLID] [color=#0000FF]}] [filter=#BlendMultiply] [data="M30.00,23.00L150.00,23.00L150.00,33.00L30.00,33.00"]
-        KCanvasContainer {g} at (30,36) size 120x23 [filter=#BlendMultiply]
-          KCanvasItem {rect} at (30,36) size 120x10 [opacity=0.50] [fill={[type=SOLID] [color=#0000FF]}] [data="M30.00,36.00L150.00,36.00L150.00,46.00L30.00,46.00"]
-          KCanvasItem {rect} at (30,49) size 120x10 [opacity=0.50] [fill={[type=SOLID] [color=#FFFF00]}] [data="M30.00,49.00L150.00,49.00L150.00,59.00L30.00,59.00"]
-        KCanvasItem {rect} at (30,62) size 120x10 [opacity=0.50] [fill={[type=SOLID] [color=#0000FF]}] [filter=#BlendScreen] [data="M30.00,62.00L150.00,62.00L150.00,72.00L30.00,72.00"]
-        KCanvasItem {rect} at (30,75) size 120x10 [opacity=0.50] [fill={[type=SOLID] [color=#0000FF]}] [filter=#BlendDarken] [data="M30.00,75.00L150.00,75.00L150.00,85.00L30.00,85.00"]
-        KCanvasItem {rect} at (30,88) size 120x10 [opacity=0.50] [fill={[type=SOLID] [color=#0000FF]}] [filter=#BlendLighten] [data="M30.00,88.00L150.00,88.00L150.00,98.00L30.00,98.00"]
+    KCanvasContainer {svg} at (0,0) size 474x354
+      KCanvasContainer {g} at (90,15) size 360x294
+        KCanvasItem {image} at (120,15) size 300x294 [fill={[type=IMAGE] [bounding box=at (0,0) size 100x1]}] [data="M40.00,5.00L140.00,5.00L140.00,103.00L40.00,103.00"]
+        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"]
+        KCanvasContainer {g} at (90,108) size 360x69 [filter=#BlendMultiply]
+          KCanvasItem {rect} at (90,108) size 360x30 [opacity=0.50] [fill={[type=SOLID] [color=#0000FF]}] [data="M30.00,36.00L150.00,36.00L150.00,46.00L30.00,46.00"]
+          KCanvasItem {rect} at (90,147) size 360x30 [opacity=0.50] [fill={[type=SOLID] [color=#FFFF00]}] [data="M30.00,49.00L150.00,49.00L150.00,59.00L30.00,59.00"]
+        KCanvasItem {rect} at (90,186) size 360x30 [opacity=0.50] [fill={[type=SOLID] [color=#0000FF]}] [filter=#BlendScreen] [data="M30.00,62.00L150.00,62.00L150.00,72.00L30.00,72.00"]
+        KCanvasItem {rect} at (90,225) size 360x30 [opacity=0.50] [fill={[type=SOLID] [color=#0000FF]}] [filter=#BlendDarken] [data="M30.00,75.00L150.00,75.00L150.00,85.00L30.00,85.00"]
+        KCanvasItem {rect} at (90,264) size 360x30 [opacity=0.50] [fill={[type=SOLID] [color=#0000FF]}] [filter=#BlendLighten] [data="M30.00,88.00L150.00,88.00L150.00,98.00L30.00,98.00"]
         KCanvasContainer {g} at (0,0) size 0x0
-      KCanvasItem {rect} at (0,0) size 158x118 [stroke={[type=SOLID] [color=#000000] [stroke width=0.50]}] [data="M1.00,1.00L159.00,1.00L159.00,119.00L1.00,119.00"]
+      KCanvasItem {rect} at (0,0) size 474x354 [stroke={[type=SOLID] [color=#000000] [stroke width=0.50]}] [data="M1.00,1.00L159.00,1.00L159.00,119.00L1.00,119.00"]
index a875ee81dbd428d63311ba1cd08ced982a5766db..ec8148acc46d608011b78b5b6ac43fc2df087125 100644 (file)
@@ -7,12 +7,12 @@ layer at (0,0) size 480x360
   RenderCanvas at (0,0) size 480x360
     KCanvasContainer {svg} at (0,0) size 799x499
       KCanvasContainer {g} at (0,0) size 799x499
-        KCanvasContainer {svg} at (0,0) size 799x499
-          KCanvasContainer {g} at (0,0) size 799x499
-            KCanvasItem {rect} at (0,0) size 799x499 [stroke={[type=SOLID] [color=#0000FF]}] [data="M1.00,1.00L799.00,1.00L799.00,499.00L1.00,499.00"]
-            KCanvasItem {rect} at (20,20) size 760x40 [fill={[type=LINEAR-GRADIENT] [stops=[]] [bounding box mode=0] [start=(20,0)] [end=(760,0)]}] [data="M20.00,20.00L780.00,20.00L780.00,60.00L20.00,60.00"]
-            KCanvasItem {rect} at (20,120) size 760x40 [fill={[type=LINEAR-GRADIENT] [stops=[]] [bounding box mode=0] [start=(20,0)] [end=(760,0)]}] [filter=#Matrix] [data="M20.00,120.00L780.00,120.00L780.00,160.00L20.00,160.00"]
-            KCanvasItem {rect} at (20,220) size 760x40 [fill={[type=LINEAR-GRADIENT] [stops=[]] [bounding box mode=0] [start=(20,0)] [end=(760,0)]}] [filter=#Saturate40] [data="M20.00,220.00L780.00,220.00L780.00,260.00L20.00,260.00"]
-            KCanvasItem {rect} at (20,320) size 760x40 [fill={[type=LINEAR-GRADIENT] [stops=[]] [bounding box mode=0] [start=(20,0)] [end=(760,0)]}] [filter=#HueRotate90] [data="M20.00,320.00L780.00,320.00L780.00,360.00L20.00,360.00"]
-            KCanvasItem {rect} at (20,420) size 760x40 [fill={[type=LINEAR-GRADIENT] [stops=[]] [bounding box mode=0] [start=(20,0)] [end=(760,0)]}] [filter=#LuminanceToAlpha] [data="M20.00,420.00L780.00,420.00L780.00,460.00L20.00,460.00"]
+        KCanvasContainer {svg} at (18,0) size 463x289
+          KCanvasContainer {g} at (18,0) size 463x289
+            KCanvasItem {rect} at (18,0) size 463x289 [stroke={[type=SOLID] [color=#0000FF]}] [data="M1.00,1.00L799.00,1.00L799.00,499.00L1.00,499.00"]
+            KCanvasItem {rect} at (29,11) size 440x23 [fill={[type=LINEAR-GRADIENT] [stops=[]] [bounding box mode=0] [start=(20,0)] [end=(760,0)]}] [data="M20.00,20.00L780.00,20.00L780.00,60.00L20.00,60.00"]
+            KCanvasItem {rect} at (29,69) size 440x23 [fill={[type=LINEAR-GRADIENT] [stops=[]] [bounding box mode=0] [start=(20,0)] [end=(760,0)]}] [filter=#Matrix] [data="M20.00,120.00L780.00,120.00L780.00,160.00L20.00,160.00"]
+            KCanvasItem {rect} at (29,127) size 440x23 [fill={[type=LINEAR-GRADIENT] [stops=[]] [bounding box mode=0] [start=(20,0)] [end=(760,0)]}] [filter=#Saturate40] [data="M20.00,220.00L780.00,220.00L780.00,260.00L20.00,260.00"]
+            KCanvasItem {rect} at (29,185) size 440x23 [fill={[type=LINEAR-GRADIENT] [stops=[]] [bounding box mode=0] [start=(20,0)] [end=(760,0)]}] [filter=#HueRotate90] [data="M20.00,320.00L780.00,320.00L780.00,360.00L20.00,360.00"]
+            KCanvasItem {rect} at (29,243) size 440x23 [fill={[type=LINEAR-GRADIENT] [stops=[]] [bounding box mode=0] [start=(20,0)] [end=(760,0)]}] [filter=#LuminanceToAlpha] [data="M20.00,420.00L780.00,420.00L780.00,460.00L20.00,460.00"]
       KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
index 20ca27487f72624695bf32a2b33ed91fb0ec933a..a423b73a5af73e2c54959db562918c5cf5b5899f 100644 (file)
@@ -1,42 +1,43 @@
-KCanvasRegistry: 
-  KCanvasResource {id="arithmetic50" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="blue"], [type=IMAGE]  [result="red"], [type=COMPOSITE] [in="red"] [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"], [type=IMAGE]  [result="red"], [type=COMPOSITE] [in="red"] [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"], [type=IMAGE]  [result="red"], [type=COMPOSITE] [in="red"] [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"], [type=IMAGE]  [result="red"], [type=COMPOSITE] [in="red"] [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"], [type=IMAGE]  [result="red"], [type=COMPOSITE] [in="red"] [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"], [type=IMAGE]  [result="red"], [type=COMPOSITE] [in="red"] [in2="blue"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00]]]}
-  KCanvasResource {id="over" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="blue"], [type=IMAGE]  [result="red"], [type=COMPOSITE] [in="red"] [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"], [type=IMAGE]  [result="red"], [type=COMPOSITE] [in="red"] [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"], [type=IMAGE]  [result="red"], [type=COMPOSITE] [in="red"] [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"], [type=IMAGE]  [result="red"], [type=COMPOSITE] [in="red"] [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"], [type=IMAGE]  [result="red"], [type=COMPOSITE] [in="red"] [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"], [type=IMAGE]  [result="red"], [type=COMPOSITE] [in="red"] [in2="blue"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00]]]}
-KCanvasContainer at (0,0) size 479x359
-  KCanvasContainer at (20,10) size 439x289 [transform={m=((1.00,0.00)(0.00,1.00)) t=(15.00,-60.00)}] [fill={[type=SOLID] [color=#000000]}]
-    KCanvasContainer at (20,10) size 439x289 [transform={m=((0.40,0.00)(0.00,0.40)) t=(20.00,10.00)}] [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem {rect} at (20,10) size 439x289 [stroke={[type=SOLID] [color=#0000FF]}] [data="M1.00,1.00L1099.00,1.00L1099.00,724.00L1.00,724.00"]
-      KCanvasContainer at (26,102) size 60x60 [transform={m=((0.40,0.00)(0.00,0.40)) t=(26.00,102.00)}] [fill={[type=SOLID] [color=#000000]}]
-        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"]
-      KCanvasContainer at (26,182) size 60x60 [transform={m=((0.40,0.00)(0.00,0.40)) t=(26.00,182.00)}] [fill={[type=SOLID] [color=#000000]}]
-        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 at (98,102) size 60x60 [transform={m=((0.40,0.00)(0.00,0.40)) t=(98.00,102.00)}] [fill={[type=SOLID] [color=#000000]}]
-        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"]
-      KCanvasContainer at (98,182) size 60x60 [transform={m=((0.40,0.00)(0.00,0.40)) t=(98.00,182.00)}] [fill={[type=SOLID] [color=#000000]}]
-        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 at (170,102) size 60x60 [transform={m=((0.40,0.00)(0.00,0.40)) t=(170.00,102.00)}] [fill={[type=SOLID] [color=#000000]}]
-        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"]
-      KCanvasContainer at (170,182) size 60x60 [transform={m=((0.40,0.00)(0.00,0.40)) t=(170.00,182.00)}] [fill={[type=SOLID] [color=#000000]}]
-        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 at (242,102) size 60x60 [transform={m=((0.40,0.00)(0.00,0.40)) t=(242.00,102.00)}] [fill={[type=SOLID] [color=#000000]}]
-        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"]
-      KCanvasContainer at (242,182) size 60x60 [transform={m=((0.40,0.00)(0.00,0.40)) t=(242.00,182.00)}] [fill={[type=SOLID] [color=#000000]}]
-        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 at (314,102) size 60x60 [transform={m=((0.40,0.00)(0.00,0.40)) t=(314.00,102.00)}] [fill={[type=SOLID] [color=#000000]}]
-        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"]
-      KCanvasContainer at (314,182) size 60x60 [transform={m=((0.40,0.00)(0.00,0.40)) t=(314.00,182.00)}] [fill={[type=SOLID] [color=#000000]}]
-        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 at (386,102) size 60x60 [transform={m=((0.40,0.00)(0.00,0.40)) t=(386.00,102.00)}] [fill={[type=SOLID] [color=#000000]}]
-        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"]
-      KCanvasContainer at (386,182) size 60x60 [transform={m=((0.40,0.00)(0.00,0.40)) t=(386.00,182.00)}] [fill={[type=SOLID] [color=#000000]}]
-        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"]
-  KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
+KCanvasResource {id="over" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="blue"], [type=IMAGE]  [result="red"], [type=COMPOSITE] [in="red"] [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"], [type=IMAGE]  [result="red"], [type=COMPOSITE] [in="red"] [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"], [type=IMAGE]  [result="red"], [type=COMPOSITE] [in="red"] [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"], [type=IMAGE]  [result="red"], [type=COMPOSITE] [in="red"] [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"], [type=IMAGE]  [result="red"], [type=COMPOSITE] [in="red"] [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"], [type=IMAGE]  [result="red"], [type=COMPOSITE] [in="red"] [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"], [type=IMAGE]  [result="red"], [type=COMPOSITE] [in="red"] [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"], [type=IMAGE]  [result="red"], [type=COMPOSITE] [in="red"] [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"], [type=IMAGE]  [result="red"], [type=COMPOSITE] [in="red"] [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"], [type=IMAGE]  [result="red"], [type=COMPOSITE] [in="red"] [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"], [type=IMAGE]  [result="red"], [type=COMPOSITE] [in="red"] [in2="blue"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00]]]}
+KCanvasResource {id="arithmetic50" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=IMAGE]  [result="blue"], [type=IMAGE]  [result="red"], [type=COMPOSITE] [in="red"] [in2="blue"] [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,0) size 479x359
+      KCanvasContainer {g} at (20,10) size 439x289 [transform={m=((1.00,0.00)(0.00,1.00)) t=(15.00,-60.00)}]
+        KCanvasContainer {g} at (11,46) size 439x289 [transform={m=((0.40,0.00)(0.00,0.40)) t=(5.00,70.00)}]
+          KCanvasItem {rect} at (11,46) size 439x289 [stroke={[type=SOLID] [color=#0000FF]}] [data="M1.00,1.00L1099.00,1.00L1099.00,724.00L1.00,724.00"]
+          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,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 (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 (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 (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 (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 (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"]
+      KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
index 87dadd4171b8222c12b2fec32dd354e7604a9fee..e9ee5a81314d269fbb4713ddaaf3965278840d90 100644 (file)
@@ -7,12 +7,12 @@ layer at (0,0) size 480x360
   RenderCanvas at (0,0) size 480x360
     KCanvasContainer {svg} at (0,0) size 629x419
       KCanvasContainer {g} at (0,0) size 629x419
-        KCanvasContainer {svg} at (0,0) size 629x419
-          KCanvasItem {rect} at (0,0) size 629x419 [stroke={[type=SOLID] [color=#0000FF]}] [data="M1.00,1.00L629.00,1.00L629.00,419.00L1.00,419.00"]
-          KCanvasContainer {g} at (0,0) size 629x419
-            KCanvasItem {rect} at (0,0) size 629x419 [stroke={[type=SOLID] [color=#0000FF]}] [data="M1.00,1.00L629.00,1.00L629.00,419.00L1.00,419.00"]
-            KCanvasItem {rect} at (10,10) size 580x40 [fill={[type=LINEAR-GRADIENT] [stops=[]] [bounding box mode=0] [start=(10,0)] [end=(590,0)]}] [filter=#Identity] [data="M10.00,10.00L590.00,10.00L590.00,50.00L10.00,50.00"]
-            KCanvasItem {rect} at (10,110) size 580x40 [fill={[type=LINEAR-GRADIENT] [stops=[]] [bounding box mode=0] [start=(10,0)] [end=(590,0)]}] [filter=#Table] [data="M10.00,110.00L590.00,110.00L590.00,150.00L10.00,150.00"]
-            KCanvasItem {rect} at (10,210) size 580x40 [fill={[type=LINEAR-GRADIENT] [stops=[]] [bounding box mode=0] [start=(10,0)] [end=(590,0)]}] [filter=#Linear] [data="M10.00,210.00L590.00,210.00L590.00,250.00L10.00,250.00"]
-            KCanvasItem {rect} at (10,310) size 580x40 [fill={[type=LINEAR-GRADIENT] [stops=[]] [bounding box mode=0] [start=(10,0)] [end=(590,0)]}] [filter=#Gamma] [data="M10.00,310.00L590.00,310.00L590.00,350.00L10.00,350.00"]
+        KCanvasContainer {svg} at (0,0) size 449x299
+          KCanvasItem {rect} at (0,0) size 449x299 [stroke={[type=SOLID] [color=#0000FF]}] [data="M1.00,1.00L629.00,1.00L629.00,419.00L1.00,419.00"]
+          KCanvasContainer {g} at (0,0) size 449x299
+            KCanvasItem {rect} at (0,0) size 449x299 [stroke={[type=SOLID] [color=#0000FF]}] [data="M1.00,1.00L629.00,1.00L629.00,419.00L1.00,419.00"]
+            KCanvasItem {rect} at (7,7) size 414x28 [fill={[type=LINEAR-GRADIENT] [stops=[]] [bounding box mode=0] [start=(10,0)] [end=(590,0)]}] [filter=#Identity] [data="M10.00,10.00L590.00,10.00L590.00,50.00L10.00,50.00"]
+            KCanvasItem {rect} at (7,78) size 414x28 [fill={[type=LINEAR-GRADIENT] [stops=[]] [bounding box mode=0] [start=(10,0)] [end=(590,0)]}] [filter=#Table] [data="M10.00,110.00L590.00,110.00L590.00,150.00L10.00,150.00"]
+            KCanvasItem {rect} at (7,150) size 414x28 [fill={[type=LINEAR-GRADIENT] [stops=[]] [bounding box mode=0] [start=(10,0)] [end=(590,0)]}] [filter=#Linear] [data="M10.00,210.00L590.00,210.00L590.00,250.00L10.00,250.00"]
+            KCanvasItem {rect} at (7,221) size 414x28 [fill={[type=LINEAR-GRADIENT] [stops=[]] [bounding box mode=0] [start=(10,0)] [end=(590,0)]}] [filter=#Gamma] [data="M10.00,310.00L590.00,310.00L590.00,350.00L10.00,350.00"]
       KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
index 8a71cb458a7d9db47aea35a2f4ca11ea8e52b3d7..5056d071b1c46becda71040abb95759cc941eb3e 100644 (file)
@@ -1 +1 @@
-84046a649700a49db08f7e7472427efa
\ No newline at end of file
+510a30735e5d44db841989a607369d16
\ No newline at end of file
index 1d931a49dc57babbb8710af14ec12ab76a5ddb1a..84d919c634f9c43cd6e65017b23595518f921d51 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/filters-diffuse-01-f-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/filters-diffuse-01-f-expected.png differ
index a2e6e454ce8e19c11358eee4f9c636adf17ed2fb..a3d783e275993f3558986a7de9c48b2ba2a21ddb 100644 (file)
@@ -1,12 +1,12 @@
-KCanvasResource {id="surfaceScaleA" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-KCanvasResource {id="surfaceScaleB" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-KCanvasResource {id="surfaceScaleC" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-KCanvasResource {id="diffuseConstantA" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-KCanvasResource {id="diffuseConstantB" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-KCanvasResource {id="diffuseConstantC" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-KCanvasResource {id="lightingColorA" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-KCanvasResource {id="lightingColorB" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-KCanvasResource {id="lightingColorC" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
+KCanvasResource {id="surfaceScaleA" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=DIFFUSE-LIGHTING] [in="SourceGraphic"] [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"] [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"] [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"] [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"] [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"] [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"] [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"] [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"] [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,0) size 479x359
index 26ee1c4b939b25835c997d76c98fb76f56b8a491..f00dab3ea3d9d1c43bb197e85fa22fb3ae56b9aa 100644 (file)
@@ -3,11 +3,11 @@ layer at (0,0) size 480x360
   RenderCanvas at (0,0) size 480x360
     KCanvasContainer {svg} at (-6,0) size 485x359
       KCanvasContainer {g} at (-6,0) size 213x119
-        KCanvasContainer {svg} at (-6,0) size 213x119
-          KCanvasItem {rect} at (0,0) size 199x119 [stroke={[type=SOLID] [color=#0000FF]}] [fill={[type=SOLID] [color=#888888]}] [data="M1.00,1.00L199.00,1.00L199.00,119.00L1.00,119.00"]
-          KCanvasContainer {g} at (-6,25) size 213x70 [filter=#MyFilter]
-            KCanvasContainer {g} at (-6,25) size 213x70
-              KCanvasItem {path} at (-6,25) size 213x70 [stroke={[type=SOLID] [color=#D90000] [stroke width=10.00]}] [data="M50.00,90.00C0.00,90.00,0.00,30.00,50.00,30.00L150.00,30.00C200.00,30.00,200.00,90.00,150.00,90.00"]
-              KCanvasItem {path} at (30,40) size 140x40 [fill={[type=SOLID] [color=#D90000]}] [data="M60.00,80.00C30.00,80.00,30.00,40.00,60.00,40.00L140.00,40.00C170.00,40.00,170.00,80.00,140.00,80.00"]
+        KCanvasContainer {svg} at (-9,0) size 319x178
+          KCanvasItem {rect} at (0,0) size 298x178 [stroke={[type=SOLID] [color=#0000FF]}] [fill={[type=SOLID] [color=#888888]}] [data="M1.00,1.00L199.00,1.00L199.00,119.00L1.00,119.00"]
+          KCanvasContainer {g} at (-9,37) size 319x105 [filter=#MyFilter]
+            KCanvasContainer {g} at (-9,37) size 319x105
+              KCanvasItem {path} at (-9,37) size 319x105 [stroke={[type=SOLID] [color=#D90000] [stroke width=10.00]}] [data="M50.00,90.00C0.00,90.00,0.00,30.00,50.00,30.00L150.00,30.00C200.00,30.00,200.00,90.00,150.00,90.00"]
+              KCanvasItem {path} at (45,60) size 210x60 [fill={[type=SOLID] [color=#D90000]}] [data="M60.00,80.00C30.00,80.00,30.00,40.00,60.00,40.00L140.00,40.00C170.00,40.00,170.00,80.00,140.00,80.00"]
               KCanvasContainer {g} at (0,0) size 0x0
       KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
index 7c92054990a6b569efc68278d7e9e3eda161c10d..c517df55a48160cffa109a943beb0f49303bd9f0 100644 (file)
@@ -1,33 +1,14 @@
-KCanvasRegistry: 
-  KCanvasResource {id="blurxy" [type=FILTER]  [bounding box=at (-10,-10) size 120x120] [effect bounding box mode=0] [effects=[[type=GAUSSIAN-BLUR]  [std dev. x=20.00 y=1.00]]]}
-  KCanvasResource {id="blur" [type=FILTER]  [bounding box=at (-10,-10) size 120x120] [effect bounding box mode=0] [effects=[[type=GAUSSIAN-BLUR]  [std dev. x=10.00 y=10.00]]]}
-KCanvasContainer at (0,0) size 479x359
-  KCanvasContainer at (0,0) size 458x348 [fill={[type=SOLID] [color=#000000]}]
-    KCanvasContainer at (0,0) size 135x135 [fill={[type=SOLID] [color=#000000]}]
-      KCanvasContainer at (0,0) size 135x135 [fill={[type=SOLID] [color=#000000]}]
-        KCanvasContainer at (0,0) size 135x135 [fill={[type=SOLID] [color=#000000]}]
-          KCanvasItem {rect} at (0,0) size 90x90 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L90.00,0.00L90.00,90.00L0.00,90.00"]
-          KCanvasItem {rect} at (45,45) size 90x90 [fill={[type=SOLID] [color=#FFFF00]}] [data="M45.00,45.00L135.00,45.00L135.00,135.00L45.00,135.00"]
-    KCanvasContainer at (296,1) size 162x162 [transform={m=((1.00,0.00)(0.00,1.00)) t=(310.00,15.00)}] [fill={[type=SOLID] [color=#000000]}]
-      KCanvasContainer at (310,15) size 135x135 [fill={[type=SOLID] [color=#000000]}] [filter="blur"]
-        KCanvasContainer at (310,15) size 135x135 [fill={[type=SOLID] [color=#000000]}]
-          KCanvasContainer at (310,15) size 135x135 [fill={[type=SOLID] [color=#000000]}]
-            KCanvasItem {rect} at (310,15) size 90x90 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L90.00,0.00L90.00,90.00L0.00,90.00"]
-            KCanvasItem {rect} at (355,60) size 90x90 [fill={[type=SOLID] [color=#FFFF00]}] [data="M45.00,45.00L135.00,45.00L135.00,135.00L45.00,135.00"]
-      KCanvasContainer at (296,1) size 162x162 [fill={[type=SOLID] [color=#000000]}]
-        KCanvasContainer at (296,1) size 162x162 [fill={[type=SOLID] [color=#000000]}]
-          KCanvasContainer at (296,1) size 162x162 [fill={[type=SOLID] [color=#000000]}]
-            KCanvasItem {rect} at (309,14) size 135x135 [stroke={[type=SOLID] [color=#0000FF] [stroke width=0.50]}] [data="M0.00,0.00L135.00,0.00L135.00,135.00L0.00,135.00"]
-            KCanvasItem {rect} at (296,1) size 162x162 [stroke={[type=SOLID] [color=#0000FF] [stroke width=0.50]}] [data="M-13.50,-13.50L148.50,-13.50L148.50,148.50L-13.50,148.50"]
-    KCanvasContainer at (296,186) size 162x162 [transform={m=((1.00,0.00)(0.00,1.00)) t=(310.00,200.00)}] [fill={[type=SOLID] [color=#000000]}]
-      KCanvasContainer at (310,200) size 135x135 [fill={[type=SOLID] [color=#000000]}] [filter="blurxy"]
-        KCanvasContainer at (310,200) size 135x135 [fill={[type=SOLID] [color=#000000]}]
-          KCanvasContainer at (310,200) size 135x135 [fill={[type=SOLID] [color=#000000]}]
-            KCanvasItem {rect} at (310,200) size 90x90 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L90.00,0.00L90.00,90.00L0.00,90.00"]
-            KCanvasItem {rect} at (355,245) size 90x90 [fill={[type=SOLID] [color=#FFFF00]}] [data="M45.00,45.00L135.00,45.00L135.00,135.00L45.00,135.00"]
-      KCanvasContainer at (296,186) size 162x162 [fill={[type=SOLID] [color=#000000]}]
-        KCanvasContainer at (296,186) size 162x162 [fill={[type=SOLID] [color=#000000]}]
-          KCanvasContainer at (296,186) size 162x162 [fill={[type=SOLID] [color=#000000]}]
-            KCanvasItem {rect} at (309,199) size 135x135 [stroke={[type=SOLID] [color=#0000FF] [stroke width=0.50]}] [data="M0.00,0.00L135.00,0.00L135.00,135.00L0.00,135.00"]
-            KCanvasItem {rect} at (296,186) size 162x162 [stroke={[type=SOLID] [color=#0000FF] [stroke width=0.50]}] [data="M-13.50,-13.50L148.50,-13.50L148.50,148.50L-13.50,148.50"]
-  KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
+KCanvasResource {id="blur" [type=FILTER]  [bounding box=at (-10,-10) size 120x120] [effect bounding box mode=0] [effects=[[type=GAUSSIAN-BLUR]  [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]  [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 479x359
+      KCanvasContainer {g} at (0,0) size 0x0
+        KCanvasContainer {use} at (0,0) size 0x0
+        KCanvasContainer {g} at (310,15) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(310.00,15.00)}]
+          KCanvasContainer {use} at (310,15) size 0x0 [filter=#blur]
+          KCanvasContainer {use} at (310,15) size 0x0
+        KCanvasContainer {g} at (310,200) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(310.00,200.00)}]
+          KCanvasContainer {use} at (310,200) size 0x0 [filter=#blurxy]
+          KCanvasContainer {use} at (310,200) size 0x0
+      KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
index 282410ac1241d48ab2692a3ec212d72fb242402e..49cce8b88061c6cf224df792a99c917e690c329a 100644 (file)
@@ -1 +1 @@
-6653bbfc316547e6c29c3622d9ff9621
\ No newline at end of file
+0d36de097b324007c3a312edea550c5e
\ No newline at end of file
index 9ade52a11dcd2b05eafbd6e98d4b7451db44a6a2..26584331a546929432940c6e82609d9e8b1845ef 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/filters-light-01-f-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/filters-light-01-f-expected.png differ
index 4dce2447468e2cd0776af08768be183a0b4c0c2e..78ba639280ad711e2f8ea70ef7f5f42cb4737892 100644 (file)
@@ -1,33 +1,34 @@
-KCanvasRegistry: 
-  KCanvasResource {id="spotLightB" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-  KCanvasResource {id="pointLightA" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-  KCanvasResource {id="spotLightD" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-  KCanvasResource {id="pointLightB" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-  KCanvasResource {id="pointLightC" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-  KCanvasResource {id="distantLightA" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-  KCanvasResource {id="pointLightD" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-  KCanvasResource {id="spotLightA" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-  KCanvasResource {id="distantLightB" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-  KCanvasResource {id="spotLightC" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-  KCanvasResource {id="distantLightC" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-  KCanvasResource {id="distantLightD" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-KCanvasContainer at (0,0) size 479x359
-  KCanvasContainer at (70,70) size 335x205 [fill={[type=SOLID] [color=#000000]}]
-    KCanvasContainer at (70,70) size 335x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,40.00)}] [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem at (70,70) size 50x30 [fill={[type=IMAGE]}] [filter="distantLightA"] [data="M70.00,30.00L120.00,30.00L120.00,60.00L70.00,60.00"]
-      KCanvasItem at (165,70) size 50x30 [fill={[type=IMAGE]}] [filter="distantLightB"] [data="M165.00,30.00L215.00,30.00L215.00,60.00L165.00,60.00"]
-      KCanvasItem at (260,70) size 50x30 [fill={[type=IMAGE]}] [filter="distantLightC"] [data="M260.00,30.00L310.00,30.00L310.00,60.00L260.00,60.00"]
-      KCanvasItem at (355,70) size 50x30 [fill={[type=IMAGE]}] [filter="distantLightD"] [data="M355.00,30.00L405.00,30.00L405.00,60.00L355.00,60.00"]
-    KCanvasContainer at (0,0) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,120.00)}] [fill={[type=SOLID] [color=#000000]}]
-    KCanvasContainer at (70,150) size 335x30 [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem at (70,150) size 50x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(70.00,150.00)}] [fill={[type=IMAGE]}] [filter="pointLightA"] [data="M0.00,0.00L50.00,0.00L50.00,30.00L0.00,30.00"]
-      KCanvasItem at (165,150) size 50x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(165.00,150.00)}] [fill={[type=IMAGE]}] [filter="pointLightB"] [data="M0.00,0.00L50.00,0.00L50.00,30.00L0.00,30.00"]
-      KCanvasItem at (260,150) size 50x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(260.00,150.00)}] [fill={[type=IMAGE]}] [filter="pointLightC"] [data="M0.00,0.00L50.00,0.00L50.00,30.00L0.00,30.00"]
-      KCanvasItem at (355,150) size 50x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(355.00,150.00)}] [fill={[type=IMAGE]}] [filter="pointLightD"] [data="M0.00,0.00L50.00,0.00L50.00,30.00L0.00,30.00"]
-    KCanvasContainer at (0,0) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,210.00)}] [fill={[type=SOLID] [color=#000000]}]
-    KCanvasContainer at (70,245) size 335x30 [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem {rect} at (70,245) size 50x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(70.00,245.00)}] [fill={[type=SOLID] [color=#000000]}] [filter="spotLightA"] [data="M0.00,0.00L50.00,0.00L50.00,30.00L0.00,30.00"]
-      KCanvasItem {rect} at (165,245) size 50x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(165.00,245.00)}] [fill={[type=SOLID] [color=#000000]}] [filter="spotLightB"] [data="M0.00,0.00L50.00,0.00L50.00,30.00L0.00,30.00"]
-      KCanvasItem {rect} at (260,245) size 50x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(260.00,245.00)}] [fill={[type=SOLID] [color=#000000]}] [filter="spotLightC"] [data="M0.00,0.00L50.00,0.00L50.00,30.00L0.00,30.00"]
-      KCanvasItem {rect} at (355,245) size 50x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(355.00,245.00)}] [fill={[type=SOLID] [color=#000000]}] [filter="spotLightD"] [data="M0.00,0.00L50.00,0.00L50.00,30.00L0.00,30.00"]
-  KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
+KCanvasResource {id="distantLightA" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=DIFFUSE-LIGHTING] [in="SourceGraphic"] [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"] [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"] [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"] [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"] [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"] [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"] [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"] [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"] [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"] [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"] [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"] [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,0) size 479x359
+      KCanvasContainer {g} at (70,70) size 335x205
+        KCanvasContainer {g} at (70,70) size 335x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,40.00)}]
+          KCanvasItem {image} at (70,70) size 50x30 [fill={[type=SOLID] [color=#000000]}] [filter=#distantLightA] [data="M70.00,30.00L120.00,30.00L120.00,60.00L70.00,60.00"]
+          KCanvasItem {image} at (165,70) size 50x30 [fill={[type=SOLID] [color=#000000]}] [filter=#distantLightB] [data="M165.00,30.00L215.00,30.00L215.00,60.00L165.00,60.00"]
+          KCanvasItem {image} at (260,70) size 50x30 [fill={[type=SOLID] [color=#000000]}] [filter=#distantLightC] [data="M260.00,30.00L310.00,30.00L310.00,60.00L260.00,60.00"]
+          KCanvasItem {image} at (355,70) size 50x30 [fill={[type=SOLID] [color=#000000]}] [filter=#distantLightD] [data="M355.00,30.00L405.00,30.00L405.00,60.00L355.00,60.00"]
+        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 (70,150) size 335x30
+          KCanvasItem {image} at (70,150) size 50x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(70.00,150.00)}] [fill={[type=SOLID] [color=#000000]}] [filter=#pointLightA] [data="M0.00,0.00L50.00,0.00L50.00,30.00L0.00,30.00"]
+          KCanvasItem {image} at (165,150) size 50x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(165.00,150.00)}] [fill={[type=SOLID] [color=#000000]}] [filter=#pointLightB] [data="M0.00,0.00L50.00,0.00L50.00,30.00L0.00,30.00"]
+          KCanvasItem {image} at (260,150) size 50x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(260.00,150.00)}] [fill={[type=SOLID] [color=#000000]}] [filter=#pointLightC] [data="M0.00,0.00L50.00,0.00L50.00,30.00L0.00,30.00"]
+          KCanvasItem {image} at (355,150) size 50x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(355.00,150.00)}] [fill={[type=SOLID] [color=#000000]}] [filter=#pointLightD] [data="M0.00,0.00L50.00,0.00L50.00,30.00L0.00,30.00"]
+        KCanvasContainer {g} at (0,210) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,210.00)}]
+        KCanvasContainer {g} at (70,245) size 335x30
+          KCanvasItem {rect} at (70,245) size 50x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(70.00,245.00)}] [fill={[type=SOLID] [color=#000000]}] [filter=#spotLightA] [data="M0.00,0.00L50.00,0.00L50.00,30.00L0.00,30.00"]
+          KCanvasItem {rect} at (165,245) size 50x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(165.00,245.00)}] [fill={[type=SOLID] [color=#000000]}] [filter=#spotLightB] [data="M0.00,0.00L50.00,0.00L50.00,30.00L0.00,30.00"]
+          KCanvasItem {rect} at (260,245) size 50x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(260.00,245.00)}] [fill={[type=SOLID] [color=#000000]}] [filter=#spotLightC] [data="M0.00,0.00L50.00,0.00L50.00,30.00L0.00,30.00"]
+          KCanvasItem {rect} at (355,245) size 50x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(355.00,245.00)}] [fill={[type=SOLID] [color=#000000]}] [filter=#spotLightD] [data="M0.00,0.00L50.00,0.00L50.00,30.00L0.00,30.00"]
+      KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
index 4be2e156c040631cb4476fa4cb282401b927d3e6..a6c016e7577d036a7ecc104d5b9e8bcd3953a7d9 100644 (file)
@@ -1,50 +1,19 @@
-KCanvasRegistry: 
-  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 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]}
-KCanvasContainer at (0,0) size 479x359
-  KCanvasContainer at (34,18) size 404x263 [fill={[type=SOLID] [color=#000000]}]
-    KCanvasContainer at (34,18) size 404x263 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,-6.00)}] [fill={[type=SOLID] [color=#000000]}]
-      KCanvasContainer at (34,18) size 404x263 [fill={[type=SOLID] [color=#000000]}]
-        KCanvasContainer at (34,18) size 149x123 [fill={[type=SOLID] [color=#000000]}]
-          KCanvasContainer at (34,18) size 149x123 [fill={[type=SOLID] [color=#000000]}] [filter="erode1"]
-            KCanvasContainer at (34,18) size 149x123 [transform={m=((1.00,0.00)(0.00,1.00)) t=(35.00,19.00)}] [fill={[type=SOLID] [color=#000000]}]
-              KCanvasContainer at (34,18) size 149x123 [fill={[type=SOLID] [color=#000000]}]
-                KCanvasContainer at (34,18) size 149x123 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#000000]}]
-                  KCanvasContainer at (34,18) size 149x123 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#000000]}]
-                    KCanvasItem {path} at (34,28) size 84x71 [stroke={[type=SOLID] [color=#6666FF] [stroke width=7.17]}] [fill={[type=SOLID] [color=#FFFFFF]}] [data="M81.40,78.29L3.59,78.29L3.59,13.54L81.40,13.54L81.40,78.29"]
-                    KCanvasItem {path} at (41,50) size 90x91 [stroke={[type=SOLID] [color=#00FF00] [stroke width=7.17]}] [data="M93.26,77.54C93.26,100.82,74.68,119.70,51.76,119.70C28.84,119.70,10.26,100.82,10.26,77.54C10.26,54.25,28.84,35.37,51.76,35.37C74.68,35.37,93.26,54.25,93.26,77.54"]
-                    KCanvasItem {path} at (82,39) size 101x97 [stroke={[type=SOLID] [color=#FF0000] [stroke width=7.17]}] [data="M98.31,28.44L111.60,55.80L141.31,60.18L119.81,81.48L124.89,111.54L98.31,97.35L71.73,111.54L76.81,81.48L55.31,60.18L85.02,55.80L98.31,28.44"]
-                    KCanvasItem {path} at (71,18) size 98x81 [stroke={[type=SOLID] [color=#FFFF00] [stroke width=7.17]}] [data="M131.56,26.34C131.56,54.90,108.77,78.05,80.66,78.05C58.17,78.05,39.94,59.53,39.94,36.68C39.94,18.40,54.53,3.59,72.52,3.59C86.91,3.59,98.58,15.44,98.58,30.06C98.58,41.76,89.25,51.24,77.73,51.24C68.52,51.24,61.05,43.65,61.05,34.30C61.05,26.81,67.03,20.74,74.39,20.74C80.29,20.74,85.07,25.60,85.07,31.59C85.07,36.38,81.25,40.26,76.53,40.26C72.75,40.26,69.70,37.15,69.70,33.32"]
-        KCanvasContainer at (289,18) size 149x123 [transform={m=((1.00,0.00)(0.00,1.00)) t=(255.00,-6.00)}] [fill={[type=SOLID] [color=#000000]}]
-          KCanvasContainer at (289,18) size 149x123 [fill={[type=SOLID] [color=#000000]}] [filter="erode2"]
-            KCanvasContainer at (289,18) size 149x123 [transform={m=((1.00,0.00)(0.00,1.00)) t=(290.00,19.00)}] [fill={[type=SOLID] [color=#000000]}]
-              KCanvasContainer at (289,18) size 149x123 [fill={[type=SOLID] [color=#000000]}]
-                KCanvasContainer at (289,18) size 149x123 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#000000]}]
-                  KCanvasContainer at (289,18) size 149x123 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#000000]}]
-                    KCanvasItem {path} at (289,28) size 84x71 [stroke={[type=SOLID] [color=#6666FF] [stroke width=7.17]}] [fill={[type=SOLID] [color=#FFFFFF]}] [data="M81.40,78.29L3.59,78.29L3.59,13.54L81.40,13.54L81.40,78.29"]
-                    KCanvasItem {path} at (296,50) size 90x91 [stroke={[type=SOLID] [color=#00FF00] [stroke width=7.17]}] [data="M93.26,77.54C93.26,100.82,74.68,119.70,51.76,119.70C28.84,119.70,10.26,100.82,10.26,77.54C10.26,54.25,28.84,35.37,51.76,35.37C74.68,35.37,93.26,54.25,93.26,77.54"]
-                    KCanvasItem {path} at (337,39) size 101x97 [stroke={[type=SOLID] [color=#FF0000] [stroke width=7.17]}] [data="M98.31,28.44L111.60,55.80L141.31,60.18L119.81,81.48L124.89,111.54L98.31,97.35L71.73,111.54L76.81,81.48L55.31,60.18L85.02,55.80L98.31,28.44"]
-                    KCanvasItem {path} at (326,18) size 98x81 [stroke={[type=SOLID] [color=#FFFF00] [stroke width=7.17]}] [data="M131.56,26.34C131.56,54.90,108.77,78.05,80.66,78.05C58.17,78.05,39.94,59.53,39.94,36.68C39.94,18.40,54.53,3.59,72.52,3.59C86.91,3.59,98.58,15.44,98.58,30.06C98.58,41.76,89.25,51.24,77.73,51.24C68.52,51.24,61.05,43.65,61.05,34.30C61.05,26.81,67.03,20.74,74.39,20.74C80.29,20.74,85.07,25.60,85.07,31.59C85.07,36.38,81.25,40.26,76.53,40.26C72.75,40.26,69.70,37.15,69.70,33.32"]
-        KCanvasContainer at (34,158) size 149x123 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,134.00)}] [fill={[type=SOLID] [color=#000000]}]
-          KCanvasContainer at (34,158) size 149x123 [fill={[type=SOLID] [color=#000000]}] [filter="dilate1"]
-            KCanvasContainer at (34,158) size 149x123 [transform={m=((1.00,0.00)(0.00,1.00)) t=(35.00,159.00)}] [fill={[type=SOLID] [color=#000000]}]
-              KCanvasContainer at (34,158) size 149x123 [fill={[type=SOLID] [color=#000000]}]
-                KCanvasContainer at (34,158) size 149x123 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#000000]}]
-                  KCanvasContainer at (34,158) size 149x123 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#000000]}]
-                    KCanvasItem {path} at (34,168) size 84x71 [stroke={[type=SOLID] [color=#6666FF] [stroke width=7.17]}] [fill={[type=SOLID] [color=#FFFFFF]}] [data="M81.40,78.29L3.59,78.29L3.59,13.54L81.40,13.54L81.40,78.29"]
-                    KCanvasItem {path} at (41,190) size 90x91 [stroke={[type=SOLID] [color=#00FF00] [stroke width=7.17]}] [data="M93.26,77.54C93.26,100.82,74.68,119.70,51.76,119.70C28.84,119.70,10.26,100.82,10.26,77.54C10.26,54.25,28.84,35.37,51.76,35.37C74.68,35.37,93.26,54.25,93.26,77.54"]
-                    KCanvasItem {path} at (82,179) size 101x97 [stroke={[type=SOLID] [color=#FF0000] [stroke width=7.17]}] [data="M98.31,28.44L111.60,55.80L141.31,60.18L119.81,81.48L124.89,111.54L98.31,97.35L71.73,111.54L76.81,81.48L55.31,60.18L85.02,55.80L98.31,28.44"]
-                    KCanvasItem {path} at (71,158) size 98x81 [stroke={[type=SOLID] [color=#FFFF00] [stroke width=7.17]}] [data="M131.56,26.34C131.56,54.90,108.77,78.05,80.66,78.05C58.17,78.05,39.94,59.53,39.94,36.68C39.94,18.40,54.53,3.59,72.52,3.59C86.91,3.59,98.58,15.44,98.58,30.06C98.58,41.76,89.25,51.24,77.73,51.24C68.52,51.24,61.05,43.65,61.05,34.30C61.05,26.81,67.03,20.74,74.39,20.74C80.29,20.74,85.07,25.60,85.07,31.59C85.07,36.38,81.25,40.26,76.53,40.26C72.75,40.26,69.70,37.15,69.70,33.32"]
-        KCanvasContainer at (289,158) size 149x123 [transform={m=((1.00,0.00)(0.00,1.00)) t=(255.00,134.00)}] [fill={[type=SOLID] [color=#000000]}]
-          KCanvasContainer at (289,158) size 149x123 [fill={[type=SOLID] [color=#000000]}] [filter="dilate2"]
-            KCanvasContainer at (289,158) size 149x123 [transform={m=((1.00,0.00)(0.00,1.00)) t=(290.00,159.00)}] [fill={[type=SOLID] [color=#000000]}]
-              KCanvasContainer at (289,158) size 149x123 [fill={[type=SOLID] [color=#000000]}]
-                KCanvasContainer at (289,158) size 149x123 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#000000]}]
-                  KCanvasContainer at (289,158) size 149x123 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#000000]}]
-                    KCanvasItem {path} at (289,168) size 84x71 [stroke={[type=SOLID] [color=#6666FF] [stroke width=7.17]}] [fill={[type=SOLID] [color=#FFFFFF]}] [data="M81.40,78.29L3.59,78.29L3.59,13.54L81.40,13.54L81.40,78.29"]
-                    KCanvasItem {path} at (296,190) size 90x91 [stroke={[type=SOLID] [color=#00FF00] [stroke width=7.17]}] [data="M93.26,77.54C93.26,100.82,74.68,119.70,51.76,119.70C28.84,119.70,10.26,100.82,10.26,77.54C10.26,54.25,28.84,35.37,51.76,35.37C74.68,35.37,93.26,54.25,93.26,77.54"]
-                    KCanvasItem {path} at (337,179) size 101x97 [stroke={[type=SOLID] [color=#FF0000] [stroke width=7.17]}] [data="M98.31,28.44L111.60,55.80L141.31,60.18L119.81,81.48L124.89,111.54L98.31,97.35L71.73,111.54L76.81,81.48L55.31,60.18L85.02,55.80L98.31,28.44"]
-                    KCanvasItem {path} at (326,158) size 98x81 [stroke={[type=SOLID] [color=#FFFF00] [stroke width=7.17]}] [data="M131.56,26.34C131.56,54.90,108.77,78.05,80.66,78.05C58.17,78.05,39.94,59.53,39.94,36.68C39.94,18.40,54.53,3.59,72.52,3.59C86.91,3.59,98.58,15.44,98.58,30.06C98.58,41.76,89.25,51.24,77.73,51.24C68.52,51.24,61.05,43.65,61.05,34.30C61.05,26.81,67.03,20.74,74.39,20.74C80.29,20.74,85.07,25.60,85.07,31.59C85.07,36.38,81.25,40.26,76.53,40.26C72.75,40.26,69.70,37.15,69.70,33.32"]
-  KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
+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]}
+layer at (0,0) size 480x360
+  RenderCanvas at (0,0) size 480x360
+    KCanvasContainer {svg} at (0,0) size 479x359
+      KCanvasContainer {g} at (0,0) size 0x0
+        KCanvasContainer {g} at (0,-6) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,-6.00)}]
+          KCanvasContainer {g} at (0,-6) size 0x0
+            KCanvasContainer {g} at (0,-6) size 0x0
+              KCanvasContainer {use} at (0,-6) size 0x0 [filter=#erode1]
+            KCanvasContainer {g} at (255,-6) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(255.00,0.00)}]
+              KCanvasContainer {use} at (255,-6) size 0x0 [filter=#erode2]
+            KCanvasContainer {g} at (0,134) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,140.00)}]
+              KCanvasContainer {use} at (0,134) size 0x0 [filter=#dilate1]
+            KCanvasContainer {g} at (255,134) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(255.00,140.00)}]
+              KCanvasContainer {use} at (255,134) size 0x0 [filter=#dilate2]
+      KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
index 5bff2759ebb532763403ade2c8157ed5be1119aa..8e1b961a97218da02c03d73e9016e4d7692e18d0 100644 (file)
@@ -1,10 +1,11 @@
-KCanvasRegistry: 
-  KCanvasResource {id="FOMTest" [type=FILTER]  [bounding box=at (0,0) size 250x400] [effect bounding box mode=0] [effects=[[type=OFFSET]  [result="Off1"] [dx=40.00 dy=30.00], [type=FLOOD]  [result="F1"] [color=#408000] [opacity=0.80], [type=COMPOSITE]  [result="C1"] [in2="Off1"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00], [type=OFFSET] [in="SourceGraphic"] [result="Off2"] [dx=80.00 dy=60.00], [type=FLOOD]  [result="F2"] [color=#408000] [opacity=0.60], [type=COMPOSITE]  [result="C2"] [in2="Off2"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00], [type=OFFSET] [in="SourceGraphic"] [result="Off3"] [dx=120.00 dy=90.00], [type=FLOOD]  [result="F3"] [color=#408000] [opacity=0.40], [type=COMPOSITE]  [result="C3"] [in2="Off3"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00], [type=MERGE] [merge inputs=[C3, C2, C1, SourceGraphic]]]]}
-KCanvasContainer at (0,0) size 479x359
-  KCanvasContainer at (109,10) size 142x181 [fill={[type=SOLID] [color=#000000]}]
-    KCanvasItem {circle} at (120,10) size 80x80 [fill={[type=SOLID] [color=#000000]}] [filter="FOMTest"] [data="M200.00,50.00L199.92,52.51L199.68,55.01L199.29,57.50L198.74,59.95L198.04,62.36L197.19,64.72L196.19,67.03L195.05,69.27L193.77,71.43L192.36,73.51L190.82,75.50L189.16,77.38L187.38,79.16L185.50,80.82L183.51,82.36L181.43,83.77L179.27,85.05L177.03,86.19L174.72,87.19L172.36,88.04L169.95,88.74L167.50,89.29L165.01,89.68L162.51,89.92L160.00,90.00L157.49,89.92L154.99,89.68L152.50,89.29L150.05,88.74L147.64,88.04L145.28,87.19L142.97,86.19L140.73,85.05L138.57,83.77L136.49,82.36L134.50,80.82L132.62,79.16L130.84,77.38L129.18,75.50L127.64,73.51L126.23,71.43L124.95,69.27L123.81,67.03L122.81,64.72L121.96,62.36L121.26,59.95L120.71,57.50L120.32,55.01L120.08,52.51L120.00,50.00L120.08,47.49L120.32,44.99L120.71,42.50L121.26,40.05L121.96,37.64L122.81,35.28L123.81,32.97L124.95,30.73L126.23,28.57L127.64,26.49L129.18,24.50L130.84,22.62L132.62,20.84L134.50,19.18L136.49,17.64L138.57,16.23L140.73,14.95L142.97,13.81L145.28,12.81L147.64,11.96L150.05,11.26L152.50,10.71L154.99,10.32L157.49,10.08L160.00,10.00L162.51,10.08L165.01,10.32L167.50,10.71L169.95,11.26L172.36,11.96L174.72,12.81L177.03,13.81L179.27,14.95L181.43,16.23L183.51,17.64L185.50,19.18L187.38,20.84L189.16,22.62L190.82,24.50L192.36,26.49L193.77,28.57L195.05,30.73L196.19,32.97L197.19,35.28L198.04,37.64L198.74,40.05L199.29,42.50L199.68,44.99L199.92,47.49"]
-    KCanvasItem {path} at (109,79) size 22x22 [transform={m=((1.00,0.00)(0.00,1.00)) t=(120.00,90.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M-1.00,-11.00L1.00,-11.00L1.00,-1.00L11.00,-1.00L11.00,1.00L1.00,1.00L1.00,11.00L-1.00,11.00L-1.00,1.00L-11.00,1.00L-11.00,-1.00L-1.00,-1.00L-1.00,-11.00"]
-    KCanvasItem {path} at (149,109) size 22x22 [transform={m=((1.00,0.00)(0.00,1.00)) t=(160.00,120.00)}] [fill={[type=SOLID] [color=#408000] [opacity=0.80]}] [data="M-1.00,-11.00L1.00,-11.00L1.00,-1.00L11.00,-1.00L11.00,1.00L1.00,1.00L1.00,11.00L-1.00,11.00L-1.00,1.00L-11.00,1.00L-11.00,-1.00L-1.00,-1.00L-1.00,-11.00"]
-    KCanvasItem {path} at (189,139) size 22x22 [transform={m=((1.00,0.00)(0.00,1.00)) t=(200.00,150.00)}] [fill={[type=SOLID] [color=#408000] [opacity=0.60]}] [data="M-1.00,-11.00L1.00,-11.00L1.00,-1.00L11.00,-1.00L11.00,1.00L1.00,1.00L1.00,11.00L-1.00,11.00L-1.00,1.00L-11.00,1.00L-11.00,-1.00L-1.00,-1.00L-1.00,-11.00"]
-    KCanvasItem {path} at (229,169) size 22x22 [transform={m=((1.00,0.00)(0.00,1.00)) t=(240.00,180.00)}] [fill={[type=SOLID] [color=#408000] [opacity=0.40]}] [data="M-1.00,-11.00L1.00,-11.00L1.00,-1.00L11.00,-1.00L11.00,1.00L1.00,1.00L1.00,11.00L-1.00,11.00L-1.00,1.00L-11.00,1.00L-11.00,-1.00L-1.00,-1.00L-1.00,-11.00"]
-  KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
+KCanvasResource {id="FOMTest" [type=FILTER]  [bounding box=at (0,0) size 250x400] [effect bounding box mode=0] [effects=[[type=OFFSET]  [result="Off1"] [dx=40.00 dy=30.00], [type=FLOOD]  [result="F1"] [color=#408000] [opacity=0.80], [type=COMPOSITE]  [result="C1"] [in2="Off1"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00], [type=OFFSET] [in="SourceGraphic"] [result="Off2"] [dx=80.00 dy=60.00], [type=FLOOD]  [result="F2"] [color=#408000] [opacity=0.60], [type=COMPOSITE]  [result="C2"] [in2="Off2"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00], [type=OFFSET] [in="SourceGraphic"] [result="Off3"] [dx=120.00 dy=90.00], [type=FLOOD]  [result="F3"] [color=#408000] [opacity=0.40], [type=COMPOSITE]  [result="C3"] [in2="Off3"] [k1=0.00 k2=0.00 k3=0.00 k4=0.00], [type=MERGE] [merge inputs=[C3, C2, C1, SourceGraphic]]]]}
+layer at (0,0) size 480x360
+  RenderCanvas at (0,0) size 480x360
+    KCanvasContainer {svg} at (0,0) size 479x359
+      KCanvasContainer {g} at (109,10) size 142x181
+        KCanvasItem {circle} at (120,10) size 80x80 [fill={[type=SOLID] [color=#000000]}] [filter=#FOMTest] [data="M200.00,50.00L199.92,52.51L199.68,55.01L199.29,57.50L198.74,59.95L198.04,62.36L197.19,64.72L196.19,67.03L195.05,69.27L193.77,71.43L192.36,73.51L190.82,75.50L189.16,77.38L187.38,79.16L185.50,80.82L183.51,82.36L181.43,83.77L179.27,85.05L177.03,86.19L174.72,87.19L172.36,88.04L169.95,88.74L167.50,89.29L165.01,89.68L162.51,89.92L160.00,90.00L157.49,89.92L154.99,89.68L152.50,89.29L150.05,88.74L147.64,88.04L145.28,87.19L142.97,86.19L140.73,85.05L138.57,83.77L136.49,82.36L134.50,80.82L132.62,79.16L130.84,77.38L129.18,75.50L127.64,73.51L126.23,71.43L124.95,69.27L123.81,67.03L122.81,64.72L121.96,62.36L121.26,59.95L120.71,57.50L120.32,55.01L120.08,52.51L120.00,50.00L120.08,47.49L120.32,44.99L120.71,42.50L121.26,40.05L121.96,37.64L122.81,35.28L123.81,32.97L124.95,30.73L126.23,28.57L127.64,26.49L129.18,24.50L130.84,22.62L132.62,20.84L134.50,19.18L136.49,17.64L138.57,16.23L140.73,14.95L142.97,13.81L145.28,12.81L147.64,11.96L150.05,11.26L152.50,10.71L154.99,10.32L157.49,10.08L160.00,10.00L162.51,10.08L165.01,10.32L167.50,10.71L169.95,11.26L172.36,11.96L174.72,12.81L177.03,13.81L179.27,14.95L181.43,16.23L183.51,17.64L185.50,19.18L187.38,20.84L189.16,22.62L190.82,24.50L192.36,26.49L193.77,28.57L195.05,30.73L196.19,32.97L197.19,35.28L198.04,37.64L198.74,40.05L199.29,42.50L199.68,44.99L199.92,47.49"]
+        KCanvasItem {path} at (109,79) size 22x22 [transform={m=((1.00,0.00)(0.00,1.00)) t=(120.00,90.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M-1.00,-11.00L1.00,-11.00L1.00,-1.00L11.00,-1.00L11.00,1.00L1.00,1.00L1.00,11.00L-1.00,11.00L-1.00,1.00L-11.00,1.00L-11.00,-1.00L-1.00,-1.00L-1.00,-11.00"]
+        KCanvasItem {path} at (149,109) size 22x22 [transform={m=((1.00,0.00)(0.00,1.00)) t=(160.00,120.00)}] [fill={[type=SOLID] [color=#408000] [opacity=0.80]}] [data="M-1.00,-11.00L1.00,-11.00L1.00,-1.00L11.00,-1.00L11.00,1.00L1.00,1.00L1.00,11.00L-1.00,11.00L-1.00,1.00L-11.00,1.00L-11.00,-1.00L-1.00,-1.00L-1.00,-11.00"]
+        KCanvasItem {path} at (189,139) size 22x22 [transform={m=((1.00,0.00)(0.00,1.00)) t=(200.00,150.00)}] [fill={[type=SOLID] [color=#408000] [opacity=0.60]}] [data="M-1.00,-11.00L1.00,-11.00L1.00,-1.00L11.00,-1.00L11.00,1.00L1.00,1.00L1.00,11.00L-1.00,11.00L-1.00,1.00L-11.00,1.00L-11.00,-1.00L-1.00,-1.00L-1.00,-11.00"]
+        KCanvasItem {path} at (229,169) size 22x22 [transform={m=((1.00,0.00)(0.00,1.00)) t=(240.00,180.00)}] [fill={[type=SOLID] [color=#408000] [opacity=0.40]}] [data="M-1.00,-11.00L1.00,-11.00L1.00,-1.00L11.00,-1.00L11.00,1.00L1.00,1.00L1.00,11.00L-1.00,11.00L-1.00,1.00L-11.00,1.00L-11.00,-1.00L-1.00,-1.00L-1.00,-11.00"]
+      KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
index 2b1a980258218c34ffd92282cd6cdaf183abd230..b3f16f1a32a7d8e55e5bef00fcbeed95fac61a0c 100644 (file)
@@ -1 +1 @@
-7b75c4fbedbb610190f03d6e2a5ccc1a
\ No newline at end of file
+1f3ae85d315d69eb2b307ab39b185ec6
\ No newline at end of file
index a421347f13184c13c37411dc907042eeefb179b2..603d3c69dfbf5638c610ecb9c4bec07b25856067 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/filters-specular-01-f-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/filters-specular-01-f-expected.png differ
index 8a453ed047f2de5fdfcc552999820c31e95a8c49..841bb1830bf49aef95e6f21e7cf1d9631f82e06f 100644 (file)
@@ -1,48 +1,49 @@
-KCanvasRegistry: 
-  KCanvasResource {id="specularConstantC" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-  KCanvasResource {id="lightingColorB" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-  KCanvasResource {id="surfaceScaleA" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-  KCanvasResource {id="specularConstantB" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-  KCanvasResource {id="specularExponentC" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-  KCanvasResource {id="surfaceScaleB" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-  KCanvasResource {id="specularConstantA" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-  KCanvasResource {id="lightingColorC" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-  KCanvasResource {id="specularExponentB" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-  KCanvasResource {id="surfaceScaleC" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-  KCanvasResource {id="lightingColorA" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-  KCanvasResource {id="specularExponentA" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0]}
-KCanvasContainer at (0,0) size 479x359
-  KCanvasContainer at (90,50) size 280x240 [fill={[type=SOLID] [color=#000000]}]
-    KCanvasContainer at (90,50) size 280x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,20.00)}] [fill={[type=SOLID] [color=#000000]}]
-      KCanvasContainer at (90,50) size 280x30 [fill={[type=SOLID] [color=#000000]}]
-        KCanvasItem {rect} at (90,50) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M90.00,30.00L140.00,30.00L140.00,60.00L90.00,60.00"]
-        KCanvasItem {rect} at (205,50) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M205.00,30.00L255.00,30.00L255.00,60.00L205.00,60.00"]
-        KCanvasItem {rect} at (320,50) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M320.00,30.00L370.00,30.00L370.00,60.00L320.00,60.00"]
-      KCanvasItem at (90,50) size 50x30 [fill={[type=IMAGE]}] [filter="surfaceScaleA"] [data="M90.00,30.00L140.00,30.00L140.00,60.00L90.00,60.00"]
-      KCanvasItem at (205,50) size 50x30 [fill={[type=IMAGE]}] [filter="surfaceScaleB"] [data="M205.00,30.00L255.00,30.00L255.00,60.00L205.00,60.00"]
-      KCanvasItem at (320,50) size 50x30 [fill={[type=IMAGE]}] [filter="surfaceScaleC"] [data="M320.00,30.00L370.00,30.00L370.00,60.00L320.00,60.00"]
-    KCanvasContainer at (90,120) size 280x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,90.00)}] [fill={[type=SOLID] [color=#000000]}]
-      KCanvasContainer at (90,120) size 280x30 [fill={[type=SOLID] [color=#000000]}]
-        KCanvasItem {rect} at (90,120) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M90.00,30.00L140.00,30.00L140.00,60.00L90.00,60.00"]
-        KCanvasItem {rect} at (205,120) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M205.00,30.00L255.00,30.00L255.00,60.00L205.00,60.00"]
-        KCanvasItem {rect} at (320,120) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M320.00,30.00L370.00,30.00L370.00,60.00L320.00,60.00"]
-      KCanvasItem at (90,120) size 50x30 [fill={[type=IMAGE]}] [filter="specularConstantA"] [data="M90.00,30.00L140.00,30.00L140.00,60.00L90.00,60.00"]
-      KCanvasItem at (205,120) size 50x30 [fill={[type=IMAGE]}] [filter="specularConstantB"] [data="M205.00,30.00L255.00,30.00L255.00,60.00L205.00,60.00"]
-      KCanvasItem at (320,120) size 50x30 [fill={[type=IMAGE]}] [filter="specularConstantC"] [data="M320.00,30.00L370.00,30.00L370.00,60.00L320.00,60.00"]
-    KCanvasContainer at (90,190) size 280x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,160.00)}] [fill={[type=SOLID] [color=#000000]}]
-      KCanvasContainer at (90,190) size 280x30 [fill={[type=SOLID] [color=#000000]}]
-        KCanvasItem {rect} at (90,190) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M90.00,30.00L140.00,30.00L140.00,60.00L90.00,60.00"]
-        KCanvasItem {rect} at (205,190) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M205.00,30.00L255.00,30.00L255.00,60.00L205.00,60.00"]
-        KCanvasItem {rect} at (320,190) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M320.00,30.00L370.00,30.00L370.00,60.00L320.00,60.00"]
-      KCanvasItem at (90,190) size 50x30 [fill={[type=IMAGE]}] [filter="specularExponentA"] [data="M90.00,30.00L140.00,30.00L140.00,60.00L90.00,60.00"]
-      KCanvasItem at (205,190) size 50x30 [fill={[type=IMAGE]}] [filter="specularExponentB"] [data="M205.00,30.00L255.00,30.00L255.00,60.00L205.00,60.00"]
-      KCanvasItem at (320,190) size 50x30 [fill={[type=IMAGE]}] [filter="specularExponentC"] [data="M320.00,30.00L370.00,30.00L370.00,60.00L320.00,60.00"]
-    KCanvasContainer at (90,260) size 280x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,230.00)}] [fill={[type=SOLID] [color=#000000]}]
-      KCanvasContainer at (90,260) size 280x30 [fill={[type=SOLID] [color=#000000]}]
-        KCanvasItem {rect} at (90,260) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M90.00,30.00L140.00,30.00L140.00,60.00L90.00,60.00"]
-        KCanvasItem {rect} at (205,260) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M205.00,30.00L255.00,30.00L255.00,60.00L205.00,60.00"]
-        KCanvasItem {rect} at (320,260) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M320.00,30.00L370.00,30.00L370.00,60.00L320.00,60.00"]
-      KCanvasItem at (90,260) size 50x30 [fill={[type=IMAGE]}] [filter="lightingColorA"] [data="M90.00,30.00L140.00,30.00L140.00,60.00L90.00,60.00"]
-      KCanvasItem at (205,260) size 50x30 [fill={[type=IMAGE]}] [filter="lightingColorB"] [data="M205.00,30.00L255.00,30.00L255.00,60.00L205.00,60.00"]
-      KCanvasItem at (320,260) size 50x30 [fill={[type=IMAGE]}] [filter="lightingColorC"] [data="M320.00,30.00L370.00,30.00L370.00,60.00L320.00,60.00"]
-  KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
+KCanvasResource {id="surfaceScaleA" [type=FILTER]  [bounding box=at (0,0) size 100x100] [effect bounding box mode=0] [effects=[[type=SPECULAR-LIGHTING] [in="SourceGraphic"] [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"] [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"] [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"] [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"] [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"] [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"] [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"] [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"] [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"] [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"] [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"] [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,0) size 479x359
+      KCanvasContainer {g} at (90,50) size 280x240
+        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 (90,50) size 280x30
+            KCanvasItem {rect} at (90,50) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M90.00,30.00L140.00,30.00L140.00,60.00L90.00,60.00"]
+            KCanvasItem {rect} at (205,50) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M205.00,30.00L255.00,30.00L255.00,60.00L205.00,60.00"]
+            KCanvasItem {rect} at (320,50) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M320.00,30.00L370.00,30.00L370.00,60.00L320.00,60.00"]
+          KCanvasItem {image} at (90,50) size 50x30 [fill={[type=SOLID] [color=#000000]}] [filter=#surfaceScaleA] [data="M90.00,30.00L140.00,30.00L140.00,60.00L90.00,60.00"]
+          KCanvasItem {image} at (205,50) size 50x30 [fill={[type=SOLID] [color=#000000]}] [filter=#surfaceScaleB] [data="M205.00,30.00L255.00,30.00L255.00,60.00L205.00,60.00"]
+          KCanvasItem {image} at (320,50) size 50x30 [fill={[type=SOLID] [color=#000000]}] [filter=#surfaceScaleC] [data="M320.00,30.00L370.00,30.00L370.00,60.00L320.00,60.00"]
+        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 (90,120) size 280x30
+            KCanvasItem {rect} at (90,120) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M90.00,30.00L140.00,30.00L140.00,60.00L90.00,60.00"]
+            KCanvasItem {rect} at (205,120) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M205.00,30.00L255.00,30.00L255.00,60.00L205.00,60.00"]
+            KCanvasItem {rect} at (320,120) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M320.00,30.00L370.00,30.00L370.00,60.00L320.00,60.00"]
+          KCanvasItem {image} at (90,120) size 50x30 [fill={[type=SOLID] [color=#000000]}] [filter=#specularConstantA] [data="M90.00,30.00L140.00,30.00L140.00,60.00L90.00,60.00"]
+          KCanvasItem {image} at (205,120) size 50x30 [fill={[type=SOLID] [color=#000000]}] [filter=#specularConstantB] [data="M205.00,30.00L255.00,30.00L255.00,60.00L205.00,60.00"]
+          KCanvasItem {image} at (320,120) size 50x30 [fill={[type=SOLID] [color=#000000]}] [filter=#specularConstantC] [data="M320.00,30.00L370.00,30.00L370.00,60.00L320.00,60.00"]
+        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 (90,190) size 280x30
+            KCanvasItem {rect} at (90,190) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M90.00,30.00L140.00,30.00L140.00,60.00L90.00,60.00"]
+            KCanvasItem {rect} at (205,190) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M205.00,30.00L255.00,30.00L255.00,60.00L205.00,60.00"]
+            KCanvasItem {rect} at (320,190) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M320.00,30.00L370.00,30.00L370.00,60.00L320.00,60.00"]
+          KCanvasItem {image} at (90,190) size 50x30 [fill={[type=SOLID] [color=#000000]}] [filter=#specularExponentA] [data="M90.00,30.00L140.00,30.00L140.00,60.00L90.00,60.00"]
+          KCanvasItem {image} at (205,190) size 50x30 [fill={[type=SOLID] [color=#000000]}] [filter=#specularExponentB] [data="M205.00,30.00L255.00,30.00L255.00,60.00L205.00,60.00"]
+          KCanvasItem {image} at (320,190) size 50x30 [fill={[type=SOLID] [color=#000000]}] [filter=#specularExponentC] [data="M320.00,30.00L370.00,30.00L370.00,60.00L320.00,60.00"]
+        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 (90,260) size 280x30
+            KCanvasItem {rect} at (90,260) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M90.00,30.00L140.00,30.00L140.00,60.00L90.00,60.00"]
+            KCanvasItem {rect} at (205,260) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M205.00,30.00L255.00,30.00L255.00,60.00L205.00,60.00"]
+            KCanvasItem {rect} at (320,260) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M320.00,30.00L370.00,30.00L370.00,60.00L320.00,60.00"]
+          KCanvasItem {image} at (90,260) size 50x30 [fill={[type=SOLID] [color=#000000]}] [filter=#lightingColorA] [data="M90.00,30.00L140.00,30.00L140.00,60.00L90.00,60.00"]
+          KCanvasItem {image} at (205,260) size 50x30 [fill={[type=SOLID] [color=#000000]}] [filter=#lightingColorB] [data="M205.00,30.00L255.00,30.00L255.00,60.00L205.00,60.00"]
+          KCanvasItem {image} at (320,260) size 50x30 [fill={[type=SOLID] [color=#000000]}] [filter=#lightingColorC] [data="M320.00,30.00L370.00,30.00L370.00,60.00L320.00,60.00"]
+      KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
index d0f376134e8f5be2ea9721fbe06219a098bcf53f..ec9a881e672b7b27ffc6721a2f6ee581422d9325 100644 (file)
@@ -1,8 +1,9 @@
-KCanvasRegistry: 
-  KCanvasResource {id="feTileFilter" [type=FILTER]  [bounding box=at (115,40) size 250x250] [bounding box mode=0] [effect bounding box mode=0] [effects=[[type=FLOOD]  [subregion="at (115,40) size 54x19"] [color=#FF0000] [opacity=1.00], [type=OFFSET]  [result="offset"] [subregion="at (115,40) size 50x25"] [dx=6.00 dy=6.00]]]}
-KCanvasContainer at (0,0) size 479x359
-  KCanvasContainer at (114,39) size 252x252 [fill={[type=SOLID] [color=#000000]}]
-    KCanvasContainer at (0,0) size 0x0 [fill={[type=SOLID] [color=#000000]}] [filter="feTileFilter"]
-    KCanvasItem {rect} at (114,39) size 252x252 [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M115.00,40.00L365.00,40.00L365.00,290.00L115.00,290.00"]
-    KCanvasItem {rect} at (214,114) size 51x26 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#0000FF] [opacity=0.50]}] [data="M215.00,115.00L265.00,115.00L265.00,140.00L215.00,140.00"]
-  KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
+KCanvasResource {id="feTileFilter" [type=FILTER]  [bounding box=at (115,40) size 250x250] [bounding box mode=0] [effect bounding box mode=0] [effects=[[type=FLOOD]  [subregion="at (115,40) size 54x19"] [color=#FF0000] [opacity=1.00], [type=OFFSET]  [result="offset"] [subregion="at (115,40) size 50x25"] [dx=6.00 dy=6.00], ]]}
+layer at (0,0) size 480x360
+  RenderCanvas at (0,0) size 480x360
+    KCanvasContainer {svg} at (0,0) size 479x359
+      KCanvasContainer {g} at (114,39) size 252x252
+        KCanvasContainer {g} at (0,0) size 0x0 [filter=#feTileFilter]
+        KCanvasItem {rect} at (114,39) size 252x252 [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M115.00,40.00L365.00,40.00L365.00,290.00L115.00,290.00"]
+        KCanvasItem {rect} at (214,114) size 51x26 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#0000FF] [opacity=0.50]}] [data="M215.00,115.00L265.00,115.00L265.00,140.00L215.00,140.00"]
+      KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
index 693ebc4f55500d62d6ed5fd1eaf492c15e98a3b2..e31f38b6b090accafa2806784fe82eb3c83e5501 100644 (file)
@@ -1,11 +1,11 @@
 layer at (0,0) size 480x360
   RenderCanvas at (0,0) size 480x360
-    KCanvasContainer {svg} at (0,0) size 80x60
-      KCanvasContainer {g} at (9,21) size 60x20
-        KCanvasContainer {g} at (9,21) size 60x20
-          KCanvasItem {circle} at (9,21) size 20x20 [stroke={[type=SOLID] [color=#0000FF]}] [fill={[type=SOLID] [color=#000000]}] [data="M30.00,32.00L29.98,32.63L29.92,33.25L29.82,33.87L29.69,34.49L29.51,35.09L29.30,35.68L29.05,36.26L28.76,36.82L28.44,37.36L28.09,37.88L27.71,38.37L27.29,38.85L26.85,39.29L26.37,39.71L25.88,40.09L25.36,40.44L24.82,40.76L24.26,41.05L23.68,41.30L23.09,41.51L22.49,41.69L21.87,41.82L21.25,41.92L20.63,41.98L20.00,42.00L19.37,41.98L18.75,41.92L18.13,41.82L17.51,41.69L16.91,41.51L16.32,41.30L15.74,41.05L15.18,40.76L14.64,40.44L14.12,40.09L13.63,39.71L13.15,39.29L12.71,38.85L12.29,38.37L11.91,37.88L11.56,37.36L11.24,36.82L10.95,36.26L10.70,35.68L10.49,35.09L10.31,34.49L10.18,33.87L10.08,33.25L10.02,32.63L10.00,32.00L10.02,31.37L10.08,30.75L10.18,30.13L10.31,29.51L10.49,28.91L10.70,28.32L10.95,27.74L11.24,27.18L11.56,26.64L11.91,26.12L12.29,25.63L12.71,25.15L13.15,24.71L13.63,24.29L14.12,23.91L14.64,23.56L15.18,23.24L15.74,22.95L16.32,22.70L16.91,22.49L17.51,22.31L18.13,22.18L18.75,22.08L19.37,22.02L20.00,22.00L20.63,22.02L21.25,22.08L21.87,22.18L22.49,22.31L23.09,22.49L23.68,22.70L24.26,22.95L24.82,23.24L25.36,23.56L25.88,23.91L26.37,24.29L26.85,24.71L27.29,25.15L27.71,25.63L28.09,26.12L28.44,26.64L28.76,27.18L29.05,27.74L29.30,28.32L29.51,28.91L29.69,29.51L29.82,30.13L29.92,30.75L29.98,31.37"]
-          KCanvasItem {circle} at (19,21) size 20x20 [stroke={[type=SOLID] [color=#0000FF]}] [fill={[type=SOLID] [color=#000000]}] [data="M40.00,32.00L39.98,32.63L39.92,33.25L39.82,33.87L39.69,34.49L39.51,35.09L39.30,35.68L39.05,36.26L38.76,36.82L38.44,37.36L38.09,37.88L37.71,38.37L37.29,38.85L36.85,39.29L36.37,39.71L35.88,40.09L35.36,40.44L34.82,40.76L34.26,41.05L33.68,41.30L33.09,41.51L32.49,41.69L31.87,41.82L31.25,41.92L30.63,41.98L30.00,42.00L29.37,41.98L28.75,41.92L28.13,41.82L27.51,41.69L26.91,41.51L26.32,41.30L25.74,41.05L25.18,40.76L24.64,40.44L24.12,40.09L23.63,39.71L23.15,39.29L22.71,38.85L22.29,38.37L21.91,37.88L21.56,37.36L21.24,36.82L20.95,36.26L20.70,35.68L20.49,35.09L20.31,34.49L20.18,33.87L20.08,33.25L20.02,32.63L20.00,32.00L20.02,31.37L20.08,30.75L20.18,30.13L20.31,29.51L20.49,28.91L20.70,28.32L20.95,27.74L21.24,27.18L21.56,26.64L21.91,26.12L22.29,25.63L22.71,25.15L23.15,24.71L23.63,24.29L24.12,23.91L24.64,23.56L25.18,23.24L25.74,22.95L26.32,22.70L26.91,22.49L27.51,22.31L28.13,22.18L28.75,22.08L29.37,22.02L30.00,22.00L30.63,22.02L31.25,22.08L31.87,22.18L32.49,22.31L33.09,22.49L33.68,22.70L34.26,22.95L34.82,23.24L35.36,23.56L35.88,23.91L36.37,24.29L36.85,24.71L37.29,25.15L37.71,25.63L38.09,26.12L38.44,26.64L38.76,27.18L39.05,27.74L39.30,28.32L39.51,28.91L39.69,29.51L39.82,30.13L39.92,30.75L39.98,31.37"]
-          KCanvasItem {circle} at (49,21) size 20x20 [stroke={[type=SOLID] [color=#0000FF]}] [fill={[type=SOLID] [color=#000000]}] [data="M70.00,32.00L69.98,32.63L69.92,33.25L69.82,33.87L69.69,34.49L69.51,35.09L69.30,35.68L69.05,36.26L68.76,36.82L68.44,37.36L68.09,37.88L67.71,38.37L67.29,38.85L66.85,39.29L66.37,39.71L65.88,40.09L65.36,40.44L64.82,40.76L64.26,41.05L63.68,41.30L63.09,41.51L62.49,41.69L61.87,41.82L61.25,41.92L60.63,41.98L60.00,42.00L59.37,41.98L58.75,41.92L58.13,41.82L57.51,41.69L56.91,41.51L56.32,41.30L55.74,41.05L55.18,40.76L54.64,40.44L54.12,40.09L53.63,39.71L53.15,39.29L52.71,38.85L52.29,38.37L51.91,37.88L51.56,37.36L51.24,36.82L50.95,36.26L50.70,35.68L50.49,35.09L50.31,34.49L50.18,33.87L50.08,33.25L50.02,32.63L50.00,32.00L50.02,31.37L50.08,30.75L50.18,30.13L50.31,29.51L50.49,28.91L50.70,28.32L50.95,27.74L51.24,27.18L51.56,26.64L51.91,26.12L52.29,25.63L52.71,25.15L53.15,24.71L53.63,24.29L54.12,23.91L54.64,23.56L55.18,23.24L55.74,22.95L56.32,22.70L56.91,22.49L57.51,22.31L58.13,22.18L58.75,22.08L59.37,22.02L60.00,22.00L60.63,22.02L61.25,22.08L61.87,22.18L62.49,22.31L63.09,22.49L63.68,22.70L64.26,22.95L64.82,23.24L65.36,23.56L65.88,23.91L66.37,24.29L66.85,24.71L67.29,25.15L67.71,25.63L68.09,26.12L68.44,26.64L68.76,27.18L69.05,27.74L69.30,28.32L69.51,28.91L69.69,29.51L69.82,30.13L69.92,30.75L69.98,31.37"]
-          KCanvasItem {circle} at (39,21) size 20x20 [stroke={[type=SOLID] [color=#0000FF]}] [fill={[type=SOLID] [color=#000000]}] [data="M60.00,32.00L59.98,32.63L59.92,33.25L59.82,33.87L59.69,34.49L59.51,35.09L59.30,35.68L59.05,36.26L58.76,36.82L58.44,37.36L58.09,37.88L57.71,38.37L57.29,38.85L56.85,39.29L56.37,39.71L55.88,40.09L55.36,40.44L54.82,40.76L54.26,41.05L53.68,41.30L53.09,41.51L52.49,41.69L51.87,41.82L51.25,41.92L50.63,41.98L50.00,42.00L49.37,41.98L48.75,41.92L48.13,41.82L47.51,41.69L46.91,41.51L46.32,41.30L45.74,41.05L45.18,40.76L44.64,40.44L44.12,40.09L43.63,39.71L43.15,39.29L42.71,38.85L42.29,38.37L41.91,37.88L41.56,37.36L41.24,36.82L40.95,36.26L40.70,35.68L40.49,35.09L40.31,34.49L40.18,33.87L40.08,33.25L40.02,32.63L40.00,32.00L40.02,31.37L40.08,30.75L40.18,30.13L40.31,29.51L40.49,28.91L40.70,28.32L40.95,27.74L41.24,27.18L41.56,26.64L41.91,26.12L42.29,25.63L42.71,25.15L43.15,24.71L43.63,24.29L44.12,23.91L44.64,23.56L45.18,23.24L45.74,22.95L46.32,22.70L46.91,22.49L47.51,22.31L48.13,22.18L48.75,22.08L49.37,22.02L50.00,22.00L50.63,22.02L51.25,22.08L51.87,22.18L52.49,22.31L53.09,22.49L53.68,22.70L54.26,22.95L54.82,23.24L55.36,23.56L55.88,23.91L56.37,24.29L56.85,24.71L57.29,25.15L57.71,25.63L58.09,26.12L58.44,26.64L58.76,27.18L59.05,27.74L59.30,28.32L59.51,28.91L59.69,29.51L59.82,30.13L59.92,30.75L59.98,31.37"]
-          KCanvasItem {circle} at (29,21) size 20x20 [stroke={[type=SOLID] [color=#0000FF]}] [fill={[type=SOLID] [color=#000000]}] [data="M50.00,32.00L49.98,32.63L49.92,33.25L49.82,33.87L49.69,34.49L49.51,35.09L49.30,35.68L49.05,36.26L48.76,36.82L48.44,37.36L48.09,37.88L47.71,38.37L47.29,38.85L46.85,39.29L46.37,39.71L45.88,40.09L45.36,40.44L44.82,40.76L44.26,41.05L43.68,41.30L43.09,41.51L42.49,41.69L41.87,41.82L41.25,41.92L40.63,41.98L40.00,42.00L39.37,41.98L38.75,41.92L38.13,41.82L37.51,41.69L36.91,41.51L36.32,41.30L35.74,41.05L35.18,40.76L34.64,40.44L34.12,40.09L33.63,39.71L33.15,39.29L32.71,38.85L32.29,38.37L31.91,37.88L31.56,37.36L31.24,36.82L30.95,36.26L30.70,35.68L30.49,35.09L30.31,34.49L30.18,33.87L30.08,33.25L30.02,32.63L30.00,32.00L30.02,31.37L30.08,30.75L30.18,30.13L30.31,29.51L30.49,28.91L30.70,28.32L30.95,27.74L31.24,27.18L31.56,26.64L31.91,26.12L32.29,25.63L32.71,25.15L33.15,24.71L33.63,24.29L34.12,23.91L34.64,23.56L35.18,23.24L35.74,22.95L36.32,22.70L36.91,22.49L37.51,22.31L38.13,22.18L38.75,22.08L39.37,22.02L40.00,22.00L40.63,22.02L41.25,22.08L41.87,22.18L42.49,22.31L43.09,22.49L43.68,22.70L44.26,22.95L44.82,23.24L45.36,23.56L45.88,23.91L46.37,24.29L46.85,24.71L47.29,25.15L47.71,25.63L48.09,26.12L48.44,26.64L48.76,27.18L49.05,27.74L49.30,28.32L49.51,28.91L49.69,29.51L49.82,30.13L49.92,30.75L49.98,31.37"]
-      KCanvasItem {rect} at (0,0) size 80x60 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L80.00,1.00L80.00,60.00L1.00,60.00"]
+    KCanvasContainer {svg} at (0,0) size 480x360
+      KCanvasContainer {g} at (54,126) size 360x120
+        KCanvasContainer {g} at (54,126) size 360x120
+          KCanvasItem {circle} at (54,126) size 120x120 [stroke={[type=SOLID] [color=#0000FF]}] [fill={[type=SOLID] [color=#000000]}] [data="M30.00,32.00L29.98,32.63L29.92,33.25L29.82,33.87L29.69,34.49L29.51,35.09L29.30,35.68L29.05,36.26L28.76,36.82L28.44,37.36L28.09,37.88L27.71,38.37L27.29,38.85L26.85,39.29L26.37,39.71L25.88,40.09L25.36,40.44L24.82,40.76L24.26,41.05L23.68,41.30L23.09,41.51L22.49,41.69L21.87,41.82L21.25,41.92L20.63,41.98L20.00,42.00L19.37,41.98L18.75,41.92L18.13,41.82L17.51,41.69L16.91,41.51L16.32,41.30L15.74,41.05L15.18,40.76L14.64,40.44L14.12,40.09L13.63,39.71L13.15,39.29L12.71,38.85L12.29,38.37L11.91,37.88L11.56,37.36L11.24,36.82L10.95,36.26L10.70,35.68L10.49,35.09L10.31,34.49L10.18,33.87L10.08,33.25L10.02,32.63L10.00,32.00L10.02,31.37L10.08,30.75L10.18,30.13L10.31,29.51L10.49,28.91L10.70,28.32L10.95,27.74L11.24,27.18L11.56,26.64L11.91,26.12L12.29,25.63L12.71,25.15L13.15,24.71L13.63,24.29L14.12,23.91L14.64,23.56L15.18,23.24L15.74,22.95L16.32,22.70L16.91,22.49L17.51,22.31L18.13,22.18L18.75,22.08L19.37,22.02L20.00,22.00L20.63,22.02L21.25,22.08L21.87,22.18L22.49,22.31L23.09,22.49L23.68,22.70L24.26,22.95L24.82,23.24L25.36,23.56L25.88,23.91L26.37,24.29L26.85,24.71L27.29,25.15L27.71,25.63L28.09,26.12L28.44,26.64L28.76,27.18L29.05,27.74L29.30,28.32L29.51,28.91L29.69,29.51L29.82,30.13L29.92,30.75L29.98,31.37"]
+          KCanvasItem {circle} at (114,126) size 120x120 [stroke={[type=SOLID] [color=#0000FF]}] [fill={[type=SOLID] [color=#000000]}] [data="M40.00,32.00L39.98,32.63L39.92,33.25L39.82,33.87L39.69,34.49L39.51,35.09L39.30,35.68L39.05,36.26L38.76,36.82L38.44,37.36L38.09,37.88L37.71,38.37L37.29,38.85L36.85,39.29L36.37,39.71L35.88,40.09L35.36,40.44L34.82,40.76L34.26,41.05L33.68,41.30L33.09,41.51L32.49,41.69L31.87,41.82L31.25,41.92L30.63,41.98L30.00,42.00L29.37,41.98L28.75,41.92L28.13,41.82L27.51,41.69L26.91,41.51L26.32,41.30L25.74,41.05L25.18,40.76L24.64,40.44L24.12,40.09L23.63,39.71L23.15,39.29L22.71,38.85L22.29,38.37L21.91,37.88L21.56,37.36L21.24,36.82L20.95,36.26L20.70,35.68L20.49,35.09L20.31,34.49L20.18,33.87L20.08,33.25L20.02,32.63L20.00,32.00L20.02,31.37L20.08,30.75L20.18,30.13L20.31,29.51L20.49,28.91L20.70,28.32L20.95,27.74L21.24,27.18L21.56,26.64L21.91,26.12L22.29,25.63L22.71,25.15L23.15,24.71L23.63,24.29L24.12,23.91L24.64,23.56L25.18,23.24L25.74,22.95L26.32,22.70L26.91,22.49L27.51,22.31L28.13,22.18L28.75,22.08L29.37,22.02L30.00,22.00L30.63,22.02L31.25,22.08L31.87,22.18L32.49,22.31L33.09,22.49L33.68,22.70L34.26,22.95L34.82,23.24L35.36,23.56L35.88,23.91L36.37,24.29L36.85,24.71L37.29,25.15L37.71,25.63L38.09,26.12L38.44,26.64L38.76,27.18L39.05,27.74L39.30,28.32L39.51,28.91L39.69,29.51L39.82,30.13L39.92,30.75L39.98,31.37"]
+          KCanvasItem {circle} at (294,126) size 120x120 [stroke={[type=SOLID] [color=#0000FF]}] [fill={[type=SOLID] [color=#000000]}] [data="M70.00,32.00L69.98,32.63L69.92,33.25L69.82,33.87L69.69,34.49L69.51,35.09L69.30,35.68L69.05,36.26L68.76,36.82L68.44,37.36L68.09,37.88L67.71,38.37L67.29,38.85L66.85,39.29L66.37,39.71L65.88,40.09L65.36,40.44L64.82,40.76L64.26,41.05L63.68,41.30L63.09,41.51L62.49,41.69L61.87,41.82L61.25,41.92L60.63,41.98L60.00,42.00L59.37,41.98L58.75,41.92L58.13,41.82L57.51,41.69L56.91,41.51L56.32,41.30L55.74,41.05L55.18,40.76L54.64,40.44L54.12,40.09L53.63,39.71L53.15,39.29L52.71,38.85L52.29,38.37L51.91,37.88L51.56,37.36L51.24,36.82L50.95,36.26L50.70,35.68L50.49,35.09L50.31,34.49L50.18,33.87L50.08,33.25L50.02,32.63L50.00,32.00L50.02,31.37L50.08,30.75L50.18,30.13L50.31,29.51L50.49,28.91L50.70,28.32L50.95,27.74L51.24,27.18L51.56,26.64L51.91,26.12L52.29,25.63L52.71,25.15L53.15,24.71L53.63,24.29L54.12,23.91L54.64,23.56L55.18,23.24L55.74,22.95L56.32,22.70L56.91,22.49L57.51,22.31L58.13,22.18L58.75,22.08L59.37,22.02L60.00,22.00L60.63,22.02L61.25,22.08L61.87,22.18L62.49,22.31L63.09,22.49L63.68,22.70L64.26,22.95L64.82,23.24L65.36,23.56L65.88,23.91L66.37,24.29L66.85,24.71L67.29,25.15L67.71,25.63L68.09,26.12L68.44,26.64L68.76,27.18L69.05,27.74L69.30,28.32L69.51,28.91L69.69,29.51L69.82,30.13L69.92,30.75L69.98,31.37"]
+          KCanvasItem {circle} at (234,126) size 120x120 [stroke={[type=SOLID] [color=#0000FF]}] [fill={[type=SOLID] [color=#000000]}] [data="M60.00,32.00L59.98,32.63L59.92,33.25L59.82,33.87L59.69,34.49L59.51,35.09L59.30,35.68L59.05,36.26L58.76,36.82L58.44,37.36L58.09,37.88L57.71,38.37L57.29,38.85L56.85,39.29L56.37,39.71L55.88,40.09L55.36,40.44L54.82,40.76L54.26,41.05L53.68,41.30L53.09,41.51L52.49,41.69L51.87,41.82L51.25,41.92L50.63,41.98L50.00,42.00L49.37,41.98L48.75,41.92L48.13,41.82L47.51,41.69L46.91,41.51L46.32,41.30L45.74,41.05L45.18,40.76L44.64,40.44L44.12,40.09L43.63,39.71L43.15,39.29L42.71,38.85L42.29,38.37L41.91,37.88L41.56,37.36L41.24,36.82L40.95,36.26L40.70,35.68L40.49,35.09L40.31,34.49L40.18,33.87L40.08,33.25L40.02,32.63L40.00,32.00L40.02,31.37L40.08,30.75L40.18,30.13L40.31,29.51L40.49,28.91L40.70,28.32L40.95,27.74L41.24,27.18L41.56,26.64L41.91,26.12L42.29,25.63L42.71,25.15L43.15,24.71L43.63,24.29L44.12,23.91L44.64,23.56L45.18,23.24L45.74,22.95L46.32,22.70L46.91,22.49L47.51,22.31L48.13,22.18L48.75,22.08L49.37,22.02L50.00,22.00L50.63,22.02L51.25,22.08L51.87,22.18L52.49,22.31L53.09,22.49L53.68,22.70L54.26,22.95L54.82,23.24L55.36,23.56L55.88,23.91L56.37,24.29L56.85,24.71L57.29,25.15L57.71,25.63L58.09,26.12L58.44,26.64L58.76,27.18L59.05,27.74L59.30,28.32L59.51,28.91L59.69,29.51L59.82,30.13L59.92,30.75L59.98,31.37"]
+          KCanvasItem {circle} at (174,126) size 120x120 [stroke={[type=SOLID] [color=#0000FF]}] [fill={[type=SOLID] [color=#000000]}] [data="M50.00,32.00L49.98,32.63L49.92,33.25L49.82,33.87L49.69,34.49L49.51,35.09L49.30,35.68L49.05,36.26L48.76,36.82L48.44,37.36L48.09,37.88L47.71,38.37L47.29,38.85L46.85,39.29L46.37,39.71L45.88,40.09L45.36,40.44L44.82,40.76L44.26,41.05L43.68,41.30L43.09,41.51L42.49,41.69L41.87,41.82L41.25,41.92L40.63,41.98L40.00,42.00L39.37,41.98L38.75,41.92L38.13,41.82L37.51,41.69L36.91,41.51L36.32,41.30L35.74,41.05L35.18,40.76L34.64,40.44L34.12,40.09L33.63,39.71L33.15,39.29L32.71,38.85L32.29,38.37L31.91,37.88L31.56,37.36L31.24,36.82L30.95,36.26L30.70,35.68L30.49,35.09L30.31,34.49L30.18,33.87L30.08,33.25L30.02,32.63L30.00,32.00L30.02,31.37L30.08,30.75L30.18,30.13L30.31,29.51L30.49,28.91L30.70,28.32L30.95,27.74L31.24,27.18L31.56,26.64L31.91,26.12L32.29,25.63L32.71,25.15L33.15,24.71L33.63,24.29L34.12,23.91L34.64,23.56L35.18,23.24L35.74,22.95L36.32,22.70L36.91,22.49L37.51,22.31L38.13,22.18L38.75,22.08L39.37,22.02L40.00,22.00L40.63,22.02L41.25,22.08L41.87,22.18L42.49,22.31L43.09,22.49L43.68,22.70L44.26,22.95L44.82,23.24L45.36,23.56L45.88,23.91L46.37,24.29L46.85,24.71L47.29,25.15L47.71,25.63L48.09,26.12L48.44,26.64L48.76,27.18L49.05,27.74L49.30,28.32L49.51,28.91L49.69,29.51L49.82,30.13L49.92,30.75L49.98,31.37"]
+      KCanvasItem {rect} at (0,0) size 480x360 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L80.00,1.00L80.00,60.00L1.00,60.00"]
index 00ed8458b71a67b0c3fa2067e687240e06c58430..c1f64e91551b62e064a78d5cf4958e0523d9ef8d 100644 (file)
@@ -1 +1 @@
-80b67165ea98efc0fa1b571c2b96a6d9
\ No newline at end of file
+aa6872f7282a6017f6c979dd95f0629c
\ No newline at end of file
index becdba6afaf9017179a95bd4b6a14e7c3ba1878d..b4eac6740507f3b3958b141313225be02955e497 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/painting-marker-01-f-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/painting-marker-01-f-expected.png differ
index 7f1ec91cc84a925d69e82be5fe440ea29f699d15..50cc38c7dd73b65247b963bd2c1aaacf3dbde6e6 100644 (file)
@@ -1 +1 @@
-e709e362d83245b2077689abc612cc24
\ No newline at end of file
+c623117024750093bb79d66bdbda4cff
\ No newline at end of file
index e26bebfdfdd11ea87e99978a07809452aa66edd9..53b2fc2a0cc80ca1edc10e9a115296cd4cec642f 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f-expected.png differ
index 209dc2f2e06129dee896392ec89b3c7c6be0e23f..90b862f881ef6d85915138bca6b9ecef7c45606d 100644 (file)
@@ -1,5 +1,6 @@
-KCanvasRegistry: empty
-KCanvasContainer at (0,0) size 479x359
-  KCanvasContainer at (0,0) size 240x150 [fill={[type=SOLID] [color=#000000]}]
-    KCanvasItem at (0,0) size 240x150 [fill={[type=IMAGE]}] [data="M0.00,0.00L240.00,0.00L240.00,150.00L0.00,150.00"]
-  KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
+layer at (0,0) size 480x360
+  RenderCanvas at (0,0) size 480x360
+    KCanvasContainer {svg} at (0,0) size 479x359
+      KCanvasContainer {g} at (0,0) size 240x150
+        KCanvasItem {image} at (0,0) size 240x150 [fill={[type=IMAGE] [bounding box=at (0,0) size 16x16]}] [data="M0.00,0.00L240.00,0.00L240.00,150.00L0.00,150.00"]
+      KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
index a22035866e27a803c9d88864fa6c4efbfc5015c6..5b268766afd5e8fa523eca207c5ed6f794a9ef5f 100644 (file)
@@ -1,16 +1,8 @@
-KCanvasRegistry: empty
-KCanvasContainer at (0,0) size 479x359
-  KCanvasContainer at (45,0) size 390x300 [fill={[type=SOLID] [color=#000000]}]
-    KCanvasContainer at (45,0) size 390x300 [fill={[type=SOLID] [color=#000000]}]
-      KCanvasContainer at (45,0) size 150x150 [fill={[type=SOLID] [color=#000000]}]
-        KCanvasContainer at (45,0) size 150x150 [fill={[type=SOLID] [color=#000000]}]
-          KCanvasContainer at (45,0) size 150x150 [transform={m=((0.15,0.00)(0.00,0.15)) t=(45.00,0.00)}]
-            KCanvasItem at (45,0) size 150x150 [fill={[type=IMAGE]}] [data="M0.00,0.00L1000.00,0.00L1000.00,1000.00L0.00,1000.00"]
-      KCanvasContainer at (285,150) size 150x150 [fill={[type=SOLID] [color=#000000]}]
-        KCanvasContainer at (285,150) size 150x150 [transform={m=((1.00,0.00)(0.00,1.00)) t=(240.00,150.00)}] [fill={[type=SOLID] [color=#000000]}]
-          KCanvasContainer at (285,150) size 150x150 [transform={m=((0.15,0.00)(0.00,0.15)) t=(285.00,150.00)}]
-            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"]
-  KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
+layer at (0,0) size 480x360
+  RenderCanvas at (0,0) size 480x360
+    KCanvasContainer {svg} at (0,0) size 479x359
+      KCanvasContainer {g} at (0,0) size 0x0
+        KCanvasContainer {g} at (0,0) size 0x0
+          KCanvasContainer {use} at (0,0) size 0x0
+          KCanvasContainer {use} at (0,0) size 0x0
+      KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
index 0b0acd8e8db35ed2ca2e400f409e70977fab9298..c8c25c4a07dc413ae353225f572aaee26399e5fb 100644 (file)
@@ -1,18 +1,13 @@
-KCanvasRegistry: empty
-KCanvasContainer at (0,0) size 479x359
-  KCanvasContainer at (16,22) size 401x269 [fill={[type=SOLID] [color=#000000]}]
-    KCanvasContainer at (198,22) size 219x84 [fill={[type=SOLID] [color=#000000]}]
-      KCanvasContainer at (198,22) size 219x84 [stroke={[type=SOLID] [color=#0000FF]}]
-        KCanvasContainer at (198,22) size 219x84 [stroke={[type=SOLID] [color=#0000FF]}]
-          KCanvasItem {path} at (198,22) size 219x84 [stroke={[type=SOLID] [color=#0000FF]}] [data="M199.00,89.30C206.60,66.60,235.80,13.20,270.00,30.30C286.60,38.60,298.90,59.40,310.00,73.30C321.70,87.90,338.60,99.00,356.00,103.30C387.30,111.10,396.60,90.40,418.00,74.30"]
-    KCanvasContainer at (16,78) size 275x132 [fill={[type=SOLID] [color=#000000]}]
-      KCanvasContainer at (33,78) size 219x84 [stroke={[type=SOLID] [color=#0000FF]}]
-        KCanvasContainer at (33,78) size 219x84 [stroke={[type=SOLID] [color=#0000FF]}]
-          KCanvasItem {path} at (33,78) size 219x84 [stroke={[type=SOLID] [color=#0000FF]}] [data="M33.50,145.80C41.00,123.00,70.30,69.70,104.50,86.80C121.00,95.00,133.00,116.00,144.50,129.80C156.20,144.40,173.00,155.50,190.50,159.80C221.80,167.60,231.00,146.90,252.50,130.80"]
-      KCanvasItem {rect} at (16,168) size 275x42 [stroke={[type=SOLID] [color=#000000]}] [data="M17.00,169.00L291.00,169.00L291.00,210.00L17.00,210.00"]
-    KCanvasContainer at (113,231) size 300x60 [fill={[type=SOLID] [color=#000000]}]
-      KCanvasContainer at (113,231) size 300x4 [stroke={[type=SOLID] [color=#0000FF] [stroke width=4.00]}]
-        KCanvasContainer at (113,231) size 300x4 [stroke={[type=SOLID] [color=#0000FF] [stroke width=4.00]}]
-          KCanvasItem {path} at (113,231) size 300x4 [stroke={[type=SOLID] [color=#0000FF] [stroke width=4.00]}] [data="M113.00,233.00L413.00,233.00"]
-      KCanvasItem {rect} at (117,249) size 261x42 [stroke={[type=SOLID] [color=#000000]}] [data="M118.00,250.00L378.00,250.00L378.00,291.00L118.00,291.00"]
-  KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
+layer at (0,0) size 480x360
+  RenderCanvas at (0,0) size 480x360
+    KCanvasContainer {svg} at (0,0) size 479x359
+      KCanvasContainer {g} at (16,168) size 362x123
+        KCanvasContainer {g} at (0,0) size 0x0
+          KCanvasContainer {use} at (0,0) size 0x0
+        KCanvasContainer {g} at (16,168) size 275x42
+          KCanvasContainer {use} at (0,0) size 0x0
+          KCanvasItem {rect} at (16,168) size 275x42 [stroke={[type=SOLID] [color=#000000]}] [data="M17.00,169.00L291.00,169.00L291.00,210.00L17.00,210.00"]
+        KCanvasContainer {g} at (117,249) size 261x42
+          KCanvasContainer {use} at (0,0) size 0x0
+          KCanvasItem {rect} at (117,249) size 261x42 [stroke={[type=SOLID] [color=#000000]}] [data="M118.00,250.00L378.00,250.00L378.00,291.00L118.00,291.00"]
+      KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
index c650176d429b6b81d85944ed833baa9c4861283c..c8c05f3355776d469956889d6d72f5ca659e3677 100644 (file)
@@ -1,6 +1,6 @@
 layer at (0,0) size 480x360
   RenderCanvas at (0,0) size 480x360
-    KCanvasContainer {svg} at (0,0) size 79x59
+    KCanvasContainer {svg} at (0,0) size 474x354
       KCanvasContainer {g} at (0,0) size 0x0
         KCanvasContainer {g} at (0,0) size 0x0
-      KCanvasItem {rect} at (0,0) size 79x59 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L79.00,1.00L79.00,59.00L1.00,59.00"]
+      KCanvasItem {rect} at (0,0) size 474x354 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L79.00,1.00L79.00,59.00L1.00,59.00"]
index 34080312ecf624bc11126c57a04bfcea00cf8661..5dce617db601fa642f31fc166fd6d8dddb3e86e9 100644 (file)
@@ -1,45 +1,45 @@
 layer at (0,0) size 480x360
   RenderCanvas at (0,0) size 480x360
-    KCanvasContainer {svg} at (0,0) size 159x119
-      KCanvasContainer {g} at (1,31) size 157x71
-        KCanvasContainer {g} at (1,31) size 157x5
+    KCanvasContainer {svg} at (0,0) size 477x357
+      KCanvasContainer {g} at (3,93) size 471x213
+        KCanvasContainer {g} at (3,93) size 471x15
           KCanvasContainer {g} at (0,0) size 0x0
-          KCanvasContainer {g} at (1,31) size 157x5
-            KCanvasItem {line} at (2,31) size 54x1 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M2.00,32.00L56.00,32.00"]
-            KCanvasItem {line} at (1,32) size 1x4 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M2.00,32.00L2.00,36.00"]
-            KCanvasItem {line} at (55,32) size 1x4 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M56.00,32.00L56.00,36.00"]
-            KCanvasItem {line} at (74,31) size 84x1 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M74.00,32.00L158.00,32.00"]
-            KCanvasItem {line} at (73,32) size 1x4 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M74.00,32.00L74.00,36.00"]
-            KCanvasItem {line} at (157,32) size 1x4 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M158.00,32.00L158.00,36.00"]
+          KCanvasContainer {g} at (3,93) size 471x15
+            KCanvasItem {line} at (6,93) size 162x3 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M2.00,32.00L56.00,32.00"]
+            KCanvasItem {line} at (3,96) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M2.00,32.00L2.00,36.00"]
+            KCanvasItem {line} at (165,96) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M56.00,32.00L56.00,36.00"]
+            KCanvasItem {line} at (222,93) size 252x3 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M74.00,32.00L158.00,32.00"]
+            KCanvasItem {line} at (219,96) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M74.00,32.00L74.00,36.00"]
+            KCanvasItem {line} at (471,96) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M158.00,32.00L158.00,36.00"]
           KCanvasContainer {g} at (0,0) size 0x0
-        KCanvasContainer {g} at (1,53) size 140x5 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,22.00)}]
+        KCanvasContainer {g} at (3,115) size 420x15 [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 (1,53) size 140x5
-            KCanvasItem {line} at (2,53) size 67x1 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M2.00,32.00L69.00,32.00"]
-            KCanvasItem {line} at (1,54) size 1x4 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M2.00,32.00L2.00,36.00"]
-            KCanvasItem {line} at (68,54) size 1x4 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M69.00,32.00L69.00,36.00"]
-            KCanvasItem {line} at (74,53) size 67x1 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M74.00,32.00L141.00,32.00"]
-            KCanvasItem {line} at (73,54) size 1x4 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M74.00,32.00L74.00,36.00"]
-            KCanvasItem {line} at (140,54) size 1x4 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M141.00,32.00L141.00,36.00"]
+          KCanvasContainer {g} at (3,115) size 420x15
+            KCanvasItem {line} at (6,115) size 201x3 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M2.00,32.00L69.00,32.00"]
+            KCanvasItem {line} at (3,118) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M2.00,32.00L2.00,36.00"]
+            KCanvasItem {line} at (204,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,115) size 201x3 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M74.00,32.00L141.00,32.00"]
+            KCanvasItem {line} at (219,118) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M74.00,32.00L74.00,36.00"]
+            KCanvasItem {line} at (420,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 (1,75) size 140x5 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,44.00)}]
+        KCanvasContainer {g} at (3,137) size 420x15 [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 (1,75) size 140x5
-            KCanvasItem {line} at (2,75) size 67x1 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M2.00,32.00L69.00,32.00"]
-            KCanvasItem {line} at (1,76) size 1x4 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M2.00,32.00L2.00,36.00"]
-            KCanvasItem {line} at (68,76) size 1x4 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M69.00,32.00L69.00,36.00"]
-            KCanvasItem {line} at (74,75) size 67x1 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M74.00,32.00L141.00,32.00"]
-            KCanvasItem {line} at (73,76) size 1x4 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M74.00,32.00L74.00,36.00"]
-            KCanvasItem {line} at (140,76) size 1x4 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M141.00,32.00L141.00,36.00"]
+          KCanvasContainer {g} at (3,137) size 420x15
+            KCanvasItem {line} at (6,137) size 201x3 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M2.00,32.00L69.00,32.00"]
+            KCanvasItem {line} at (3,140) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M2.00,32.00L2.00,36.00"]
+            KCanvasItem {line} at (204,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,137) size 201x3 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M74.00,32.00L141.00,32.00"]
+            KCanvasItem {line} at (219,140) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M74.00,32.00L74.00,36.00"]
+            KCanvasItem {line} at (420,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 (1,97) size 140x5 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,66.00)}]
+        KCanvasContainer {g} at (3,159) size 420x15 [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 (1,97) size 140x5
-            KCanvasItem {line} at (2,97) size 67x1 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M2.00,32.00L69.00,32.00"]
-            KCanvasItem {line} at (1,98) size 1x4 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M2.00,32.00L2.00,36.00"]
-            KCanvasItem {line} at (68,98) size 1x4 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M69.00,32.00L69.00,36.00"]
-            KCanvasItem {line} at (74,97) size 67x1 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M74.00,32.00L141.00,32.00"]
-            KCanvasItem {line} at (73,98) size 1x4 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M74.00,32.00L74.00,36.00"]
-            KCanvasItem {line} at (140,98) size 1x4 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M141.00,32.00L141.00,36.00"]
+          KCanvasContainer {g} at (3,159) size 420x15
+            KCanvasItem {line} at (6,159) size 201x3 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M2.00,32.00L69.00,32.00"]
+            KCanvasItem {line} at (3,162) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M2.00,32.00L2.00,36.00"]
+            KCanvasItem {line} at (204,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,159) size 201x3 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M74.00,32.00L141.00,32.00"]
+            KCanvasItem {line} at (219,162) size 3x12 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M74.00,32.00L74.00,36.00"]
+            KCanvasItem {line} at (420,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
-      KCanvasItem {rect} at (0,0) size 159x119 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L159.00,1.00L159.00,119.00L1.00,119.00"]
+      KCanvasItem {rect} at (0,0) size 477x357 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L159.00,1.00L159.00,119.00L1.00,119.00"]
diff --git a/LayoutTests/svg/custom/fill-update-expected.checksum b/LayoutTests/svg/custom/fill-update-expected.checksum
new file mode 100644 (file)
index 0000000..36bc6d8
--- /dev/null
@@ -0,0 +1,2 @@
+20c728b09392e75ee1eb6fb5921c9787
+\ No newline at end of file
diff --git a/LayoutTests/svg/custom/fill-update-expected.png b/LayoutTests/svg/custom/fill-update-expected.png
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/LayoutTests/svg/custom/fill-update-expected.txt b/LayoutTests/svg/custom/fill-update-expected.txt
new file mode 100644 (file)
index 0000000..c5f380a
--- /dev/null
@@ -0,0 +1,4 @@
+layer at (0,0) size 480x360
+  RenderCanvas at (0,0) size 480x360
+    KCanvasContainer {svg} at (0,0) size 90x90
+      KCanvasItem {rect} at (0,0) size 90x90 [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00L90.00,0.00L90.00,90.00L0.00,90.00"]
diff --git a/LayoutTests/svg/custom/fill-update.svg b/LayoutTests/svg/custom/fill-update.svg
new file mode 100644 (file)
index 0000000..fdb5871
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">
+<svg version="1.1" baseProfile="basic" id="svg-root" width="100%" height="100%" viewBox="0 0 480 360"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     xmlns="http://www.w3.org/2000/svg" onload="myfunc()">
+     <script>
+       function myfunc() {
+               var myRect = document.getElementById("rect");
+               myRect.setAttribute("fill", "green");
+       }
+     </script>
+     <rect id="rect" x="0" y="0" width="90" height="90" fill="red" />
+</svg>
+
index fe24023b7cbd9309bd9f9e97447f6f1adfc7a05b..e9d7ed620c7fbc1424810b803740338f13e40014 100644 (file)
@@ -1,3 +1,4 @@
-KCanvasRegistry: empty
-KCanvasContainer at (0,-233) size 677x494
-  KCanvasItem {path} at (0,-233) size 677x494 [fill={[type=SOLID] [color=#000000]}] [data="M602.78,261.43C677.31,100.20,602.79,-89.02,436.34,-161.21C269.89,-233.40,74.53,-161.22,0.00,-0.00"]
+layer at (0,0) size 755x755
+  RenderCanvas at (0,0) size 465x345
+    KCanvasContainer {svg} at (0,-233) size 677x494
+      KCanvasItem {path} at (0,-233) size 677x494 [fill={[type=SOLID] [color=#000000]}] [data="M602.78,261.43C677.31,100.20,602.79,-89.02,436.34,-161.21C269.89,-233.40,74.53,-161.22,0.00,-0.00"]
diff --git a/LayoutTests/svg/custom/path-update-expected.checksum b/LayoutTests/svg/custom/path-update-expected.checksum
new file mode 100644 (file)
index 0000000..087909c
--- /dev/null
@@ -0,0 +1,2 @@
+12cfa7a70a3351b626dba85f324e3068
+\ No newline at end of file
diff --git a/LayoutTests/svg/custom/path-update-expected.png b/LayoutTests/svg/custom/path-update-expected.png
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/LayoutTests/svg/custom/path-update-expected.txt b/LayoutTests/svg/custom/path-update-expected.txt
new file mode 100644 (file)
index 0000000..0b333d4
--- /dev/null
@@ -0,0 +1,5 @@
+layer at (0,0) size 480x360
+  RenderCanvas at (0,0) size 480x360
+    KCanvasContainer {svg} at (0,0) size 479x359
+      KCanvasItem {path} at (5,160) size 100x100 [fill={[type=SOLID] [color=#FF0000]}] [data="M5.00,260.00C40.00,260.00,60.00,175.00,55.00,160.00C50.00,175.00,70.00,260.00,105.00,260.00"]
+      KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
diff --git a/LayoutTests/svg/custom/path-update.svg b/LayoutTests/svg/custom/path-update.svg
new file mode 100644 (file)
index 0000000..ed6d647
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">
+<svg version="1.1" baseProfile="basic" id="svg-root" width="100%" height="100%" viewBox="0 0 480 360"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     xmlns="http://www.w3.org/2000/svg" onload="myfunc()">
+     <script>
+       function myfunc() {
+               var myRect = document.getElementById("rect");
+               myRect.setAttribute("d", "M5 260 C40 260 60 175  55 160 c  -5  15 15 100 50 100Z");
+       }
+     </script>
+       <path id="rect" d="M 100 100 L 300 100 L 200 300 z" fill="red" />
+       <rect id="test-frame" x="1" y="1" width="478" height="358" fill="none" stroke="#000000"/>
+</svg>
+
diff --git a/LayoutTests/svg/custom/simpleCDF-expected.checksum b/LayoutTests/svg/custom/simpleCDF-expected.checksum
new file mode 100644 (file)
index 0000000..417e8fd
--- /dev/null
@@ -0,0 +1,2 @@
+698e1d541b699d9dad0a1e70b3e2cf99
+\ No newline at end of file
diff --git a/LayoutTests/svg/custom/simpleCDF-expected.png b/LayoutTests/svg/custom/simpleCDF-expected.png
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/LayoutTests/svg/custom/simpleCDF-expected.txt b/LayoutTests/svg/custom/simpleCDF-expected.txt
new file mode 100644 (file)
index 0000000..6ba1e6d
--- /dev/null
@@ -0,0 +1,15 @@
+layer at (0,0) size 480x360
+  RenderCanvas at (0,0) size 480x360
+layer at (0,0) size 480x118
+  RenderBlock {HTML} at (0,0) size 480x118
+    RenderBody {BODY} at (8,16) size 464x86
+      RenderBlock {P} at (0,0) size 464x18
+        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 464x18
+        KCanvasContainer {svg} at (8,8) size 200x200
+          KCanvasItem {rect} at (8,8) 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 464x18
+        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/simpleCDF.xml b/LayoutTests/svg/custom/simpleCDF.xml
new file mode 100644 (file)
index 0000000..d145c55
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>XHTML + SVG Test</title>
+</head>
+<body>
+<p>This is a test of CDF:</p>
+<svg xmlns="http://www.w3.org/2000/svg" 
+     xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200">
+<rect x="0" y="0" width="200" height="200" fill="blue" />
+</svg>
+<p>You should see an SVG image above this!</p>
+</body>
+</html>
+\ No newline at end of file
index 90c77417d422c37ac4fbb664731797fda2137ffd..6297faf66b934687564adc2b75d0eb82d1b76f62 100644 (file)
@@ -1,51 +1,20 @@
-KCanvasRegistry: empty
-KCanvasContainer at (9,9) size 80x70
-  KCanvasContainer at (9,9) size 40x50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-39.84,-20.16)}] [fill={[type=SOLID] [color=#000000]}]
-    KCanvasContainer at (9,9) size 40x50 [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem {path} at (9,9) size 40x50 [stroke={[type=SOLID] [color=#000000] [stroke width=0.33]}] [fill={[type=SOLID] [color=#4C4C4C]}] [data="M50.00,50.00L50.00,80.00L90.00,60.00L90.00,30.00"]
-  KCanvasContainer at (12,11) size 40x50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-37.34,-18.59)}] [fill={[type=SOLID] [color=#000000]}]
-    KCanvasContainer at (12,11) size 40x50 [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem {path} at (12,11) size 40x50 [stroke={[type=SOLID] [color=#000000] [stroke width=0.33]}] [fill={[type=SOLID] [color=#4C4C4C]}] [data="M50.00,50.00L50.00,80.00L90.00,60.00L90.00,30.00"]
-  KCanvasContainer at (14,12) size 40x50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-34.84,-17.66)}] [fill={[type=SOLID] [color=#000000]}]
-    KCanvasContainer at (14,12) size 40x50 [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem {path} at (14,12) size 40x50 [stroke={[type=SOLID] [color=#000000] [stroke width=0.33]}] [fill={[type=SOLID] [color=#4C4C4C]}] [data="M50.00,50.00L50.00,80.00L90.00,60.00L90.00,30.00"]
-  KCanvasContainer at (17,13) size 40x50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-32.34,-16.09)}] [fill={[type=SOLID] [color=#000000]}]
-    KCanvasContainer at (17,13) size 40x50 [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem {path} at (17,13) size 40x50 [stroke={[type=SOLID] [color=#000000] [stroke width=0.33]}] [fill={[type=SOLID] [color=#4C4C4C]}] [data="M50.00,50.00L50.00,80.00L90.00,60.00L90.00,30.00"]
-  KCanvasContainer at (19,14) size 40x50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-30.16,-15.16)}] [fill={[type=SOLID] [color=#000000]}]
-    KCanvasContainer at (19,14) size 40x50 [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem {path} at (19,14) size 40x50 [stroke={[type=SOLID] [color=#000000] [stroke width=0.33]}] [fill={[type=SOLID] [color=#4C4C4C]}] [data="M50.00,50.00L50.00,80.00L90.00,60.00L90.00,30.00"]
-  KCanvasContainer at (22,16) size 40x50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-27.34,-13.59)}] [fill={[type=SOLID] [color=#000000]}]
-    KCanvasContainer at (22,16) size 40x50 [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem {path} at (22,16) size 40x50 [stroke={[type=SOLID] [color=#000000] [stroke width=0.33]}] [fill={[type=SOLID] [color=#4C4C4C]}] [data="M50.00,50.00L50.00,80.00L90.00,60.00L90.00,30.00"]
-  KCanvasContainer at (24,17) size 40x50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-25.16,-12.66)}] [fill={[type=SOLID] [color=#000000]}]
-    KCanvasContainer at (24,17) size 40x50 [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem {path} at (24,17) size 40x50 [stroke={[type=SOLID] [color=#000000] [stroke width=0.33]}] [fill={[type=SOLID] [color=#4C4C4C]}] [data="M50.00,50.00L50.00,80.00L90.00,60.00L90.00,30.00"]
-  KCanvasContainer at (27,18) size 40x50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-22.34,-11.41)}] [fill={[type=SOLID] [color=#000000]}]
-    KCanvasContainer at (27,18) size 40x50 [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem {path} at (27,18) size 40x50 [stroke={[type=SOLID] [color=#000000] [stroke width=0.33]}] [fill={[type=SOLID] [color=#4C4C4C]}] [data="M50.00,50.00L50.00,80.00L90.00,60.00L90.00,30.00"]
-  KCanvasContainer at (29,19) size 40x50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-19.84,-10.16)}] [fill={[type=SOLID] [color=#000000]}]
-    KCanvasContainer at (29,19) size 40x50 [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem {path} at (29,19) size 40x50 [stroke={[type=SOLID] [color=#000000] [stroke width=0.33]}] [fill={[type=SOLID] [color=#4C4C4C]}] [data="M50.00,50.00L50.00,80.00L90.00,60.00L90.00,30.00"]
-  KCanvasContainer at (32,20) size 40x50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-17.34,-8.91)}] [fill={[type=SOLID] [color=#000000]}]
-    KCanvasContainer at (32,20) size 40x50 [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem {path} at (32,20) size 40x50 [stroke={[type=SOLID] [color=#000000] [stroke width=0.33]}] [fill={[type=SOLID] [color=#4C4C4C]}] [data="M50.00,50.00L50.00,80.00L90.00,60.00L90.00,30.00"]
-  KCanvasContainer at (34,22) size 40x50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-14.84,-7.66)}] [fill={[type=SOLID] [color=#000000]}]
-    KCanvasContainer at (34,22) size 40x50 [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem {path} at (34,22) size 40x50 [stroke={[type=SOLID] [color=#000000] [stroke width=0.33]}] [fill={[type=SOLID] [color=#4C4C4C]}] [data="M50.00,50.00L50.00,80.00L90.00,60.00L90.00,30.00"]
-  KCanvasContainer at (37,23) size 40x50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-12.66,-6.41)}] [fill={[type=SOLID] [color=#000000]}]
-    KCanvasContainer at (37,23) size 40x50 [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem {path} at (37,23) size 40x50 [stroke={[type=SOLID] [color=#000000] [stroke width=0.33]}] [fill={[type=SOLID] [color=#4C4C4C]}] [data="M50.00,50.00L50.00,80.00L90.00,60.00L90.00,30.00"]
-  KCanvasContainer at (39,24) size 40x50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-9.84,-5.16)}] [fill={[type=SOLID] [color=#000000]}]
-    KCanvasContainer at (39,24) size 40x50 [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem {path} at (39,24) size 40x50 [stroke={[type=SOLID] [color=#000000] [stroke width=0.33]}] [fill={[type=SOLID] [color=#4C4C4C]}] [data="M50.00,50.00L50.00,80.00L90.00,60.00L90.00,30.00"]
-  KCanvasContainer at (42,25) size 40x50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-7.66,-3.91)}] [fill={[type=SOLID] [color=#000000]}]
-    KCanvasContainer at (42,25) size 40x50 [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem {path} at (42,25) size 40x50 [stroke={[type=SOLID] [color=#000000] [stroke width=0.33]}] [fill={[type=SOLID] [color=#4C4C4C]}] [data="M50.00,50.00L50.00,80.00L90.00,60.00L90.00,30.00"]
-  KCanvasContainer at (44,27) size 40x50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-5.16,-2.66)}] [fill={[type=SOLID] [color=#000000]}]
-    KCanvasContainer at (44,27) size 40x50 [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem {path} at (44,27) size 40x50 [stroke={[type=SOLID] [color=#000000] [stroke width=0.33]}] [fill={[type=SOLID] [color=#4C4C4C]}] [data="M50.00,50.00L50.00,80.00L90.00,60.00L90.00,30.00"]
-  KCanvasContainer at (47,28) size 40x50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-2.66,-1.41)}] [fill={[type=SOLID] [color=#000000]}]
-    KCanvasContainer at (47,28) size 40x50 [fill={[type=SOLID] [color=#000000]}]
-      KCanvasItem {path} at (47,28) size 40x50 [stroke={[type=SOLID] [color=#000000] [stroke width=0.33]}] [fill={[type=SOLID] [color=#4C4C4C]}] [data="M50.00,50.00L50.00,80.00L90.00,60.00L90.00,30.00"]
-  KCanvasItem {path} at (49,29) size 40x50 [stroke={[type=SOLID] [color=#000000] [stroke width=0.33]}] [fill={[type=SOLID] [color=#4C4C4C]}] [data="M50.00,50.00L50.00,80.00L90.00,60.00L90.00,30.00"]
+layer at (0,0) size 480x360
+  RenderCanvas at (0,0) size 480x360
+    KCanvasContainer {svg} at (49,29) size 40x50
+      KCanvasContainer {use} at (0,0) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-39.84,-20.16)}]
+      KCanvasContainer {use} at (0,0) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-37.34,-18.59)}]
+      KCanvasContainer {use} at (0,0) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-34.84,-17.66)}]
+      KCanvasContainer {use} at (0,0) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-32.34,-16.09)}]
+      KCanvasContainer {use} at (0,0) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-30.16,-15.16)}]
+      KCanvasContainer {use} at (0,0) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-27.34,-13.59)}]
+      KCanvasContainer {use} at (0,0) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-25.16,-12.66)}]
+      KCanvasContainer {use} at (0,0) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-22.34,-11.41)}]
+      KCanvasContainer {use} at (0,0) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-19.84,-10.16)}]
+      KCanvasContainer {use} at (0,0) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-17.34,-8.91)}]
+      KCanvasContainer {use} at (0,0) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-14.84,-7.66)}]
+      KCanvasContainer {use} at (0,0) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-12.66,-6.41)}]
+      KCanvasContainer {use} at (0,0) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-9.84,-5.16)}]
+      KCanvasContainer {use} at (0,0) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-7.66,-3.91)}]
+      KCanvasContainer {use} at (0,0) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-5.16,-2.66)}]
+      KCanvasContainer {use} at (0,0) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-2.66,-1.41)}]
+      KCanvasItem {path} at (49,29) size 40x50 [stroke={[type=SOLID] [color=#000000] [stroke width=0.33]}] [fill={[type=SOLID] [color=#4C4C4C]}] [data="M50.00,50.00L50.00,80.00L90.00,60.00L90.00,30.00"]
index ef7261cbdf0cb7eb78fbec7ced8c002a165dea2a..549c6c0d34edfbd25e809aa178f2d0896c94d2cd 100644 (file)
@@ -1,3 +1,43 @@
+2005-11-29  Eric Seidel  <eseidel@apple.com>
+
+        Reviewed by mjs.
+
+        3 test cases added to cover CSS updates and CDF support.
+        Updated all test results for absolute bbox change.
+
+        Fixed in this patch:
+        - CSS dynamic updates
+        - dynamic path data updates
+        - first pass at CDF support
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=5842
+
+        * kcanvas/KCanvasContainer.cpp:
+        (KCanvasContainer::KCanvasContainer): make "replaced" element
+        * kcanvas/device/quartz/KCanvasItemQuartz.mm:
+        (KCanvasItemQuartz::paint): added parent offset ASSERT
+        * kcanvas/device/quartz/KCanvasResourcesQuartz.mm:
+        (KCanvasContainerQuartz::paint): account for parent offset
+        (KCanvasContainerQuartz::absoluteTransform): reflect viewport
+        * khtml/css/css_valueimpl.cpp: remove HTML special case
+        (DOM::CSSMutableStyleDeclarationImpl::setChanged):
+        * khtml/css/cssstyleselector.cpp: remove HTML special case
+        (khtml::CSSStyleSelector::locateCousinList):
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::containingBlock): special case KCanvasContainer
+        * khtml/rendering/render_style.cpp:
+        (RenderStyle::operator==): fix call into SVGRenderStyle
+        (RenderStyle::inheritedNotEqual): calls into SVGRenderStyle
+        (RenderStyle::diff): calls into SVGRenderStyle
+        * ksvg2/css/SVGRenderStyle.cpp:
+        (SVGRenderStyle::equals): include flags in comparison
+        (SVGRenderStyle::inheritedNotEqual): added
+        * ksvg2/css/SVGRenderStyle.h:
+        * ksvg2/svg/SVGPathElementImpl.cpp:
+        (KSVG::SVGPathElementImpl::parseMappedAttribute): clear path first
+        * ksvg2/svg/SVGStyledElementImpl.cpp:
+        (SVGStyledElementImpl::attributeChanged): map to ksvg2 attributes
+        * ksvg2/svg/SVGStyledElementImpl.h:
+
 2005-11-29  Mitz Pettel  <opendarwin.org@mitzpettel.com>
 
         Reviewed by hyatt.  Committed by eseidel.
index c50f9e7a715abc3a2721adcc978f826ca6cad3e1..8dc32b9fe529a29ed4936ce60555fc8678a30537 100644 (file)
@@ -40,6 +40,7 @@ public:
 KCanvasContainer::KCanvasContainer(KSVG::SVGStyledElementImpl *node)
 : khtml::RenderContainer(node), d(new Private())
 {
+    setReplaced(true);
 }
 
 KCanvasContainer::~KCanvasContainer()
index 056e4fbf4c8963fb656c97ac22b5e35ad2519675..aacbc0ef1c39fc2ac3a1fe7d067e7ab2cb829de3 100644 (file)
@@ -182,6 +182,10 @@ void KCanvasItemQuartz::drawMarkersIfNeeded(const QRect &rect, CGPathRef path) c
 
 void KCanvasItemQuartz::paint(PaintInfo &paintInfo, int parentX, int parentY)
 {
+    // No one should be transforming us via these.
+    ASSERT(parentX == 0);
+    ASSERT(parentY == 0);
+
     if (paintInfo.p->paintingDisabled() || (paintInfo.phase != PaintActionForeground) || style()->visibility() == khtml::HIDDEN)
         return;
     
index 7d71191249a6f81961236267966e9b0388f69033..73a48a359cd4cea436335e4141259222bc66abb6 100644 (file)
@@ -96,17 +96,15 @@ void KCanvasContainerQuartz::paint(PaintInfo &paintInfo, int parentX, int parent
     if (paintInfo.p->paintingDisabled())
         return;
     
-    int absoluteX = parentX + m_x;
-    int absoluteY = parentY + m_y;
-    
-    ASSERT(absoluteX == 0 && absoluteY == 0);
-    // We ignore the khtml absolute transforms (for now)
+    // No one should be transforming us via these.
+    ASSERT(m_x == 0);
+    ASSERT(m_y == 0);
         
     if (shouldPaintBackgroundOrBorder() && paintInfo.phase != PaintActionOutline) 
-        paintBoxDecorations(paintInfo, absoluteX, absoluteY);
+        paintBoxDecorations(paintInfo, parentX, parentY);
     
     if (paintInfo.phase == PaintActionOutline && style()->outlineWidth() && style()->visibility() == khtml::VISIBLE)
-        paintOutline(paintInfo.p, absoluteX, absoluteY, width(), height(), style());
+        paintOutline(paintInfo.p, parentX, parentY, width(), height(), style());
     
     if (paintInfo.phase != PaintActionForeground || !drawsContents() || style()->visibility() == khtml::HIDDEN)
         return;
@@ -126,6 +124,12 @@ void KCanvasContainerQuartz::paint(PaintInfo &paintInfo, int parentX, int parent
     
     CGContextRef context = paintInfo.p->currentContext();
     
+    if (parentX != 0 || parentY != 0) {
+        // Translate from parent offsets (khtml) to a relative transform (ksvg2/kcanvas)
+        CGContextConcatCTM(context, CGAffineTransformMakeTranslation(parentX, parentY));
+        parentX = parentY = 0;
+    }
+    
     if (viewport().isValid())
         CGContextConcatCTM(context, CGAffineTransformMakeTranslation(viewport().x(), viewport().y()));
     
@@ -153,7 +157,7 @@ void KCanvasContainerQuartz::paint(PaintInfo &paintInfo, int parentX, int parent
         CGContextConcatCTM(paintInfo.p->currentContext(), CGAffineTransform(getAspectRatio(viewBox(), viewportRect).qmatrix()));
     }
     
-    RenderContainer::paint(paintInfo, absoluteX, absoluteY);
+    RenderContainer::paint(paintInfo, 0, 0);
     
     if (filter)
         filter->applyFilter(quartzDevice, relativeBBox(true));
@@ -202,7 +206,12 @@ KCAlign KCanvasContainerQuartz::align() const
 QMatrix KCanvasContainerQuartz::absoluteTransform() const
 {
     QMatrix transform = KCanvasContainer::absoluteTransform();
-    //transform *= getAspectRatio(viewBox(), bbox(true)).qmatrix();
+    if (!viewBox().isNull()) {
+        QRect viewportRect = viewport();
+        if (!parent()->isKCanvasContainer())
+            viewportRect = QRect(viewport().x(), viewport().y(), width(), height());
+        transform *= getAspectRatio(viewBox(), viewportRect).qmatrix();
+    }
     return transform;
 }
 
index df12c34cfdff86788bb46b6af15c5f67f43f8350..13cc9379d2d2e5b352157a278b50cf7fef17fe44 100644 (file)
@@ -368,8 +368,8 @@ void CSSMutableStyleDeclarationImpl::setChanged()
         // FIXME: Ideally, this should be factored better and there
         // should be a subclass of CSSMutableStyleDeclarationImpl just
         // for inline style declarations that handles this
-        if (m_node->isHTMLElement() && this == static_cast<HTMLElementImpl *>(m_node)->inlineStyleDecl())
-            static_cast<HTMLElementImpl *>(m_node)->invalidateStyleAttribute();
+        if (m_node->isStyledElement() && this == static_cast<StyledElementImpl *>(m_node)->inlineStyleDecl())
+            static_cast<StyledElementImpl *>(m_node)->invalidateStyleAttribute();
         return;
     }
 
index 01dab7e3ba3cd52bc021ea51be7b047f460e2192..1dec7c7334f7e39f744873fdb2cb63fdd2d244e3 100644 (file)
@@ -613,8 +613,8 @@ const int siblingThreshold = 10;
 
 NodeImpl* CSSStyleSelector::locateCousinList(ElementImpl* parent)
 {
-    if (parent && parent->isHTMLElement()) {
-        HTMLElementImpl* p = static_cast<HTMLElementImpl*>(parent);
+    if (parent && parent->isStyledElement()) {
+        StyledElementImpl* p = static_cast<StyledElementImpl *>(parent);
         if (p->renderer() && !p->inlineStyleDecl() && !p->hasID()) {
             NodeImpl* r = p->previousSibling();
             int subcount = 0;
index 9acb2832ecb56d6485a72384c71b2ed936b245e8..7b2f67e4e415999c63014c4eb1e93ec7e7750a54 100644 (file)
@@ -727,7 +727,11 @@ RenderBlock* RenderObject::containingBlock() const
         }
     } else {
         while (o && ((o->isInline() && !o->isReplaced()) || o->isTableRow() || o->isTableSection()
-                     || o->isTableCol() || o->isFrameSet()))
+                     || o->isTableCol() || o->isFrameSet()
+#if SVG_SUPPORT
+                     || o->isKCanvasContainer()
+#endif
+                     ))
             o = o->parent();
     }
 
index 66b2a71fc8056e6b8e8d3d8aadb638b3ddbb3450..556ec44fb0c028650b1020300c1dd2e65ee8355f 100644 (file)
@@ -606,7 +606,7 @@ bool RenderStyle::operator==(const RenderStyle& o) const
             css3InheritedData == o.css3InheritedData &&
             inherited == o.inherited
 #if SVG_SUPPORT
-            && (svgStyle() &&  o.svgStyle()->equals(o.svgStyle()))
+            && *svgStyle() == *o.svgStyle()
 #endif
             );
 }
@@ -679,6 +679,9 @@ bool RenderStyle::inheritedNotEqual( RenderStyle *other ) const
 {
     return inherited_flags != other->inherited_flags ||
            inherited != other->inherited ||
+#if SVG_SUPPORT
+           svgStyle()->inheritedNotEqual(other->svgStyle()) ||
+#endif
            css3InheritedData != other->css3InheritedData;
 }
 
@@ -699,6 +702,14 @@ bool RenderStyle::inheritedNotEqual( RenderStyle *other ) const
 */
 RenderStyle::Diff RenderStyle::diff( const RenderStyle *other ) const
 {
+#if SVG_SUPPORT
+    // This is horribly inefficient.  Eventually we'll have to integrate
+    // this more directly by caling: Diff svgDiff = svgStyle->diff(other)
+    // and then checking svgDiff and returning from the appropraite places below.
+    if (!(*svgStyle() == *(other->svgStyle())))
+        return Layout;
+#endif
+
     // we anyway assume they are the same
 //     EDisplay _effectiveDisplay : 5;
 
index f4f9985401ce83f2418695c14c2c7a812508083b..4dd728dfc123e2ec0fa691794ed1af44dcfa2de0 100644 (file)
@@ -77,14 +77,20 @@ SVGRenderStyle::~SVGRenderStyle()
 {
 }
 
-bool SVGRenderStyle::equals(SVGRenderStyle *svgOther) const
+bool SVGRenderStyle::operator==(const SVGRenderStyle& o) const
 {
-    if(!svgOther)
-        return false;
+    return (fill == o.fill && stroke == o.stroke &&
+        stops == o.stops && clip == o.clip &&
+        misc == o.misc && markers == o.markers &&
+        svg_inherited_flags == o.svg_inherited_flags &&
+        svg_noninherited_flags == o.svg_noninherited_flags);
+}
 
-    return (fill == svgOther->fill && stroke == svgOther->stroke &&
-        stops == svgOther->stops && clip == svgOther->clip &&
-        misc == svgOther->misc && markers == svgOther->markers);
+bool SVGRenderStyle::inheritedNotEqual(SVGRenderStyle *other) const
+{
+    return (fill != other->fill || stroke != other->stroke ||
+        stops != other->stops || misc != other->misc ||
+        markers != other->markers || svg_inherited_flags != other->svg_inherited_flags);
 }
 
 void SVGRenderStyle::inheritFrom(const SVGRenderStyle *svgInheritParent)
index a08e6dc6e88d9f8c5d0982b741b2abddeaec9782..8e602441030a58272712035a9675d8b7f33f23d9 100644 (file)
@@ -39,9 +39,11 @@ namespace KSVG
         SVGRenderStyle(const SVGRenderStyle &other);
         ~SVGRenderStyle();
 
-        bool equals(SVGRenderStyle *other) const;
+        bool inheritedNotEqual(SVGRenderStyle *other) const;
 
         void inheritFrom(const SVGRenderStyle *inheritParent);
+        
+        bool operator==(const SVGRenderStyle& o) const;
 
         // SVG CSS Properties
         SVG_RS_DEFINE_ATTRIBUTE(EAlignmentBaseline, AlignmentBaseline, alignmentBaseline, AB_AUTO)
index 6189fd11f50ecee5637ce90f60f1a202bdf46c29..93008a32042d21dd542feff04bd76383b5f24234 100644 (file)
@@ -72,7 +72,6 @@ KCanvasFEFlood *SVGFEFloodElementImpl::filterEffect() const
         return 0;
     m_filterEffect->setIn(KDOM::DOMString(in1()->baseVal()).qstring());
     setStandardAttributes(m_filterEffect);
-    // FIXME: I don't think this will work, the parent does not have a renderer
     khtml::RenderStyle *filterStyle = const_cast<SVGFEFloodElementImpl *>(this)->styleForRenderer(parentNode()->renderer());
     SVGRenderStyle *svgStyle = filterStyle->svgStyle();
     m_filterEffect->setFloodColor(svgStyle->floodColor());
index 61b650646914384311b9b644963a45c757ac84fc..2198217acc9f78b52977a2157d3fc93c6569fa64 100644 (file)
@@ -344,10 +344,10 @@ void SVGPathElementImpl::svgClosePath()
 
 void SVGPathElementImpl::parseMappedAttribute(KDOM::MappedAttributeImpl *attr)
 {
-    if (attr->name() == SVGNames::dAttr)
+    if (attr->name() == SVGNames::dAttr) {
+        pathSegList()->clear();
         parseSVG(attr->value().qstring(), true);
-    else
-    {
+    } else {
         if(SVGTestsImpl::parseMappedAttribute(attr)) return;
         if(SVGLangSpaceImpl::parseMappedAttribute(attr)) return;
         if(SVGExternalResourcesRequiredImpl::parseMappedAttribute(attr)) return;
index d7ee6e873ed25e2784ca74fce6c6eb36a245cc20..05f88c487533edd0d7a0a00e43da228a8be023e8 100644 (file)
@@ -49,9 +49,9 @@
 #include "SVGHelper.h"
 
 #include "SVGNames.h"
-#include "HTMLNames.h"
 
 using namespace KSVG;
+using namespace KSVG::SVGNames;
 
 SVGStyledElementImpl::SVGStyledElementImpl(const KDOM::QualifiedName& tagName, KDOM::DocumentImpl *doc)
 : SVGElementImpl(tagName, doc)
@@ -105,6 +105,16 @@ void SVGStyledElementImpl::notifyAttributeChange() const
     }
 }
 
+void SVGStyledElementImpl::attributeChanged(KDOM::AttributeImpl *attr, bool preserveDecls)
+{
+    // FIXME: Eventually subclasses from SVGElementImpl should implement
+    // attributeChanged() instead of notifyAttributeChange()
+    // This is a quick fix to allow dynamic updates of SVG elements
+    // but will result in slower dynamic-update performance than necessary.
+    SVGElementImpl::attributeChanged(attr, preserveDecls);
+    notifyAttributeChange();
+}
+
 void SVGStyledElementImpl::finalizeStyle(KCanvasRenderingStyle *style, bool needFillStrokeUpdate)
 {
     if(needFillStrokeUpdate && renderer()->isRenderPath()) {
index 531a35c18334e5670f4eff889cc2b54303e50545..deafa10ca249af32de1b65c68161ea6606bff607 100644 (file)
@@ -65,6 +65,7 @@ namespace KSVG
 
         khtml::RenderCanvas *canvas() const;
         virtual void notifyAttributeChange() const;
+        virtual void attributeChanged(KDOM::AttributeImpl *attr, bool preserveDecls = false);
 
         // Imagine we're a <rect> inside of a <pattern> section with patternContentUnits="objectBoundingBox"
         // and our 'width' attribute is set to 50%. When the pattern gets referenced it knows the "bbox"