[LBSE] Add support for <circle> & <ellipse>

https://bugs.webkit.org/show_bug.cgi?id=240793 Patch by Nikolas Zimmermann <nzimmermann@igalia.com> on 2022-05-24 Reviewed by Rob Buis. Rename RenderSVGEllipse -> LegacyRenderSVGEllipse and adapt callees. Re-introduce RenderSVGEllipse for LBSE, and activate renderer creation for <circle> & <ellipse>, if LBSE is enabled at run-time. This allows 14 more SVG 1.1 testcases to pass. * LayoutTests/platform/mac-monterey-wk2-lbse-text/TestExpectations: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/animate-elem-21-t-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/animate-elem-23-t-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/animate-elem-26-t-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/animate-elem-28-t-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/animate-elem-29-b-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/animate-elem-30-t-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/animate-elem-31-t-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/animate-elem-33-t-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/animate-elem-37-t-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/animate-elem-44-t-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/animate-elem-80-t-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/animate-elem-82-t-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/color-prop-01-b-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/color-prop-02-f-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/color-prop-03-t-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/coords-units-02-b-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/coords-viewattr-01-b-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/filters-felem-01-b-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/filters-offset-01-b-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/interact-cursor-01-f-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/interact-order-01-b-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/interact-zoom-01-t-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/linking-a-04-t-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/linking-a-05-t-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/linking-uri-01-b-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/linking-uri-02-b-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/metadata-example-01-b-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/painting-marker-01-f-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/painting-render-01-b-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/script-handle-02-b-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/script-handle-03-b-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/script-handle-04-b-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/shapes-circle-01-t-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/shapes-circle-02-t-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/shapes-ellipse-01-t-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/shapes-ellipse-02-t-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/struct-frag-02-t-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/struct-frag-03-t-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/struct-frag-04-t-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/styling-css-01-b-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/styling-css-02-b-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/styling-css-03-b-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/styling-inherit-01-b-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/styling-pres-01-t-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/text-align-01-b-expected.txt: * LayoutTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/text-align-05-b-expected.txt: * Source/WebCore/Sources.txt: * Source/WebCore/WebCore.xcodeproj/project.pbxproj: * Source/WebCore/rendering/svg/LegacyRenderSVGEllipse.cpp: Copied from Source/WebCore/rendering/svg/RenderSVGEllipse.cpp. (WebCore::LegacyRenderSVGEllipse::LegacyRenderSVGEllipse): (WebCore::LegacyRenderSVGEllipse::updateShapeFromElement): (WebCore::LegacyRenderSVGEllipse::calculateRadiiAndCenter): (WebCore::LegacyRenderSVGEllipse::fillShape const): (WebCore::LegacyRenderSVGEllipse::strokeShape const): (WebCore::LegacyRenderSVGEllipse::shapeDependentStrokeContains): (WebCore::LegacyRenderSVGEllipse::shapeDependentFillContains const): (WebCore::LegacyRenderSVGEllipse::isRenderingDisabled const): * Source/WebCore/rendering/svg/LegacyRenderSVGEllipse.h: Copied from Source/WebCore/rendering/svg/RenderSVGEllipse.h. * Source/WebCore/rendering/svg/RenderSVGEllipse.cpp: (WebCore::RenderSVGEllipse::RenderSVGEllipse): (WebCore::RenderSVGEllipse::updateShapeFromElement): (WebCore::RenderSVGEllipse::fillShape const): (WebCore::RenderSVGEllipse::strokeShape const): (WebCore::RenderSVGEllipse::shapeDependentStrokeContains): (WebCore::RenderSVGEllipse::shapeDependentFillContains const): * Source/WebCore/rendering/svg/RenderSVGEllipse.h: * Source/WebCore/svg/SVGCircleElement.cpp: (WebCore::SVGCircleElement::createElementRenderer): * Source/WebCore/svg/SVGElement.cpp: (WebCore::createSVGLayerAwareElementSet): * Source/WebCore/svg/SVGEllipseElement.cpp: (WebCore::SVGEllipseElement::createElementRenderer): Canonical link: https://commits.webkit.org/250913@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@294745 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · May 24, 2022 · 0862e86 · 0862e86
1 parent 22bef87
commit 0862e86
Show file tree

Hide file tree

Showing 56 changed files with 970 additions and 206 deletions.
diff --git a/LayoutTests/platform/mac-monterey-wk2-lbse-text/TestExpectations b/LayoutTests/platform/mac-monterey-wk2-lbse-text/TestExpectations
@@ -29,10 +29,10 @@ svg/W3C-SVG-1.1/animate-elem-19-t.svg       [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/animate-elem-20-t.svg       [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/animate-elem-21-t.svg       [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/animate-elem-22-b.svg       [ Pass ]
-svg/W3C-SVG-1.1/animate-elem-23-t.svg       [ ImageOnlyFailure ]
+svg/W3C-SVG-1.1/animate-elem-23-t.svg       [ Pass ]
 svg/W3C-SVG-1.1/animate-elem-24-t.svg       [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/animate-elem-25-t.svg       [ ImageOnlyFailure ]
-svg/W3C-SVG-1.1/animate-elem-26-t.svg       [ ImageOnlyFailure ]
+svg/W3C-SVG-1.1/animate-elem-26-t.svg       [ Pass ]
 svg/W3C-SVG-1.1/animate-elem-27-t.svg       [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/animate-elem-28-t.svg       [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/animate-elem-29-b.svg       [ ImageOnlyFailure ]
@@ -64,13 +64,13 @@ svg/W3C-SVG-1.1/animate-elem-77-t.svg       [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/animate-elem-78-t.svg       [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/animate-elem-80-t.svg       [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/animate-elem-81-t.svg       [ Pass ]
-svg/W3C-SVG-1.1/animate-elem-82-t.svg       [ Pass ]
+svg/W3C-SVG-1.1/animate-elem-82-t.svg       [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/animate-elem-83-t.svg       [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/animate-elem-84-t.svg       [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/animate-elem-85-t.svg       [ Pass ]
 svg/W3C-SVG-1.1/color-prof-01-f.svg         [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/color-prop-01-b.svg         [ ImageOnlyFailure ]
-svg/W3C-SVG-1.1/color-prop-02-f.svg         [ ImageOnlyFailure ]
+svg/W3C-SVG-1.1/color-prop-02-f.svg         [ Pass ]
 svg/W3C-SVG-1.1/color-prop-03-t.svg         [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/coords-coord-01-t.svg       [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/coords-coord-02-t.svg       [ ImageOnlyFailure ]
@@ -106,7 +106,7 @@ svg/W3C-SVG-1.1/filters-specular-01-f.svg   [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/filters-tile-01-b.svg       [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/filters-turb-01-f.svg       [ Pass ]
 svg/W3C-SVG-1.1/filters-turb-02-f.svg       [ ImageOnlyFailure ]
-svg/W3C-SVG-1.1/fonts-desc-02-t.svg         [ ImageOnlyFailure ]
+svg/W3C-SVG-1.1/fonts-desc-02-t.svg         [ Pass ImageOnlyFailure ]
 svg/W3C-SVG-1.1/fonts-elem-01-t.svg         [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/fonts-elem-02-t.svg         [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/fonts-elem-03-b.svg         [ ImageOnlyFailure ]
@@ -120,7 +120,7 @@ svg/W3C-SVG-1.1/fonts-kern-01-t.svg         [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/interact-cursor-01-f.svg    [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/interact-dom-01-b.svg       [ Pass ]
 svg/W3C-SVG-1.1/interact-events-01-b.svg    [ Pass ]
-svg/W3C-SVG-1.1/interact-order-01-b.svg     [ ImageOnlyFailure ]
+svg/W3C-SVG-1.1/interact-order-01-b.svg     [ Pass ]
 svg/W3C-SVG-1.1/interact-order-02-b.svg     [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/interact-order-03-b.svg     [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/interact-zoom-01-t.svg      [ ImageOnlyFailure ]
@@ -199,13 +199,13 @@ svg/W3C-SVG-1.1/render-elems-08-t.svg       [ Pass ]
 svg/W3C-SVG-1.1/render-groups-01-b.svg      [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/render-groups-03-t.svg      [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/script-handle-01-b.svg      [ ImageOnlyFailure ]
-svg/W3C-SVG-1.1/script-handle-02-b.svg      [ ImageOnlyFailure ]
-svg/W3C-SVG-1.1/script-handle-03-b.svg      [ ImageOnlyFailure ]
-svg/W3C-SVG-1.1/script-handle-04-b.svg      [ ImageOnlyFailure ]
-svg/W3C-SVG-1.1/shapes-circle-01-t.svg      [ ImageOnlyFailure ]
-svg/W3C-SVG-1.1/shapes-circle-02-t.svg      [ ImageOnlyFailure ]
-svg/W3C-SVG-1.1/shapes-ellipse-01-t.svg     [ ImageOnlyFailure ]
-svg/W3C-SVG-1.1/shapes-ellipse-02-t.svg     [ ImageOnlyFailure ]
+svg/W3C-SVG-1.1/script-handle-02-b.svg      [ Pass ]
+svg/W3C-SVG-1.1/script-handle-03-b.svg      [ Pass ]
+svg/W3C-SVG-1.1/script-handle-04-b.svg      [ Pass ]
+svg/W3C-SVG-1.1/shapes-circle-01-t.svg      [ Pass ]
+svg/W3C-SVG-1.1/shapes-circle-02-t.svg      [ Pass ]
+svg/W3C-SVG-1.1/shapes-ellipse-01-t.svg     [ Pass ]
+svg/W3C-SVG-1.1/shapes-ellipse-02-t.svg     [ Pass ]
 svg/W3C-SVG-1.1/shapes-intro-01-t.svg       [ Pass ]
 svg/W3C-SVG-1.1/shapes-line-01-t.svg        [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/shapes-polygon-01-t.svg     [ ImageOnlyFailure ]
@@ -225,7 +225,7 @@ svg/W3C-SVG-1.1/struct-dom-06-b.svg         [ Pass ]
 svg/W3C-SVG-1.1/struct-frag-01-t.svg        [ Pass ]
 svg/W3C-SVG-1.1/struct-frag-02-t.svg        [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/struct-frag-03-t.svg        [ ImageOnlyFailure ]
-svg/W3C-SVG-1.1/struct-frag-04-t.svg        [ ImageOnlyFailure ]
+svg/W3C-SVG-1.1/struct-frag-04-t.svg        [ Pass ]
 svg/W3C-SVG-1.1/struct-frag-05-t.svg        [ Pass ]
 svg/W3C-SVG-1.1/struct-frag-06-t.svg        [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/struct-group-01-t.svg       [ Pass ]
@@ -257,7 +257,7 @@ svg/W3C-SVG-1.1/text-align-01-b.svg         [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/text-align-02-b.svg         [ Pass ]
 svg/W3C-SVG-1.1/text-align-03-b.svg         [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/text-align-04-b.svg         [ ImageOnlyFailure ]
-svg/W3C-SVG-1.1/text-align-05-b.svg         [ ImageOnlyFailure ]
+svg/W3C-SVG-1.1/text-align-05-b.svg         [ Pass ]
 svg/W3C-SVG-1.1/text-align-06-b.svg         [ Pass ]
 svg/W3C-SVG-1.1/text-align-08-b.svg         [ ImageOnlyFailure ]
 svg/W3C-SVG-1.1/text-altglyph-01-b.svg      [ Pass ]

diff --git a/...tTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/animate-elem-21-t-expected.txt b/...tTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/animate-elem-21-t-expected.txt
@@ -2,10 +2,14 @@ layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
 layer at (0,0) size 480x360
   RenderSVGRoot {svg} at (0,0) size 480x360
-layer at (20,20) size 180x180
-  RenderSVGContainer {g} at (0,0) size 180x180
+layer at (20,20) size 260x240
+  RenderSVGContainer {g} at (0,0) size 270x255
+layer at (40,140) size 120x120
+  RenderSVGEllipse {circle} at (-15,-15) size 150x150 [stroke={[type=SOLID] [color=#FFFFFF] [stroke width=30.00]}] [cx=100.00] [cy=200.00] [r=60.00]
 layer at (20,20) size 180x180
   RenderSVGRect {rect} at (0,0) size 180x180 [fill={[type=SOLID] [color=#FFFFFF]}] [x=20.00] [y=20.00] [width=180.00] [height=180.00]
+layer at (120,30) size 160x160
+  RenderSVGEllipse {circle} at (-10,-10) size 180x180 [stroke={[type=SOLID] [color=#FFFFFF] [stroke width=20.00]}] [cx=200.00] [cy=110.00] [r=80.00]
 layer at (10,304) size 263x46
   RenderSVGText {text} at (10,304) size 264x46 contains 1 chunk(s)
     RenderSVGInlineText {#text} at (0,0) size 264x46

diff --git a/...tTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/animate-elem-23-t-expected.txt b/...tTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/animate-elem-23-t-expected.txt
@@ -12,22 +12,30 @@ layer at (15,43) size 66x15
       chunk 1 text run 1 at (15.00,55.00) startOffset 0 endOffset 11 width 65.61: "Color at 3s"
 layer at (15,60) size 30x31
   RenderSVGRect {rect} at (0,0) size 30x30 [fill={[type=SOLID] [color=#000000]}] [x=15.00] [y=60.00] [width=30.00] [height=30.00]
+layer at (20,65) size 20x21
+  RenderSVGEllipse {circle} at (0,0) size 20x20 [fill={[type=SOLID] [color=#0000FF]}] [cx=30.00] [cy=75.00] [r=10.00]
 layer at (15,133) size 66x15
   RenderSVGText {text} at (0,90) size 66x15 contains 1 chunk(s)
     RenderSVGInlineText {#text} at (0,0) size 66x15
       chunk 1 text run 1 at (15.00,145.00) startOffset 0 endOffset 11 width 65.61: "Color at 6s"
 layer at (15,150) size 30x31
   RenderSVGRect {rect} at (0,0) size 30x30 [fill={[type=SOLID] [color=#000000]}] [x=15.00] [y=150.00] [width=30.00] [height=30.00]
+layer at (20,155) size 20x21
+  RenderSVGEllipse {circle} at (0,0) size 20x20 [fill={[type=SOLID] [color=#40007F]}] [cx=30.00] [cy=165.00] [r=10.00]
 layer at (15,223) size 66x15
   RenderSVGText {text} at (0,180) size 66x15 contains 1 chunk(s)
     RenderSVGInlineText {#text} at (0,0) size 66x15
       chunk 1 text run 1 at (15.00,235.00) startOffset 0 endOffset 11 width 65.61: "Color at 9s"
 layer at (15,240) size 30x31
   RenderSVGRect {rect} at (0,0) size 30x30 [fill={[type=SOLID] [color=#000000]}] [x=15.00] [y=240.00] [width=30.00] [height=30.00]
+layer at (20,245) size 20x21
+  RenderSVGEllipse {circle} at (0,0) size 20x20 [fill={[type=SOLID] [color=#800000]}] [cx=30.00] [cy=255.00] [r=10.00]
 layer at (150,50) size 240x241
   RenderSVGContainer {g} at (-1,-1) size 242x242
 layer at (150,50) size 240x240
   RenderSVGRect {rect} at (-1,-1) size 242x242 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#000000]}] [x=150.00] [y=50.00] [width=240.00] [height=240.00]
+layer at (160,60) size 220x220
+  RenderSVGEllipse {circle} at (0,0) size 0x0 [fill={[type=SOLID] [color=#000000]}] [cx=270.00] [cy=170.00] [r=110.00]
 layer at (10,304) size 263x46
   RenderSVGText {text} at (10,304) size 264x46 contains 1 chunk(s)
     RenderSVGInlineText {#text} at (0,0) size 264x46

diff --git a/...tTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/animate-elem-26-t-expected.txt b/...tTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/animate-elem-26-t-expected.txt
@@ -2,18 +2,34 @@ layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
 layer at (0,0) size 480x360
   RenderSVGRoot {svg} at (0,0) size 480x360
-layer at (70,253) size 339x35
-  RenderSVGContainer {g} at (0,0) size 339x34
-layer at (70,253) size 99x34
-  RenderSVGContainer {g} at (0,0) size 99x34
-layer at (70,253) size 98x34
-  RenderSVGText {text} at (0,0) size 99x34 contains 1 chunk(s)
+layer at (20,40) size 440x247
+  RenderSVGContainer {g} at (-1,-1) size 442x248
+layer at (20,40) size 200x247
+  RenderSVGContainer {g} at (-1,-1) size 202x248
+layer at (50,70) size 140x140
+  RenderSVGEllipse {circle} at (-1,-1) size 142x142 [stroke={[type=SOLID] [color=#3366EE]}] [cx=120.00] [cy=140.00] [r=70.00]
+layer at (80,100) size 80x80
+  RenderSVGEllipse {circle} at (-1,-1) size 82x82 [stroke={[type=SOLID] [color=#000000]}] [cx=120.00] [cy=140.00] [r=40.00]
+layer at (50,70) size 140x140
+  RenderSVGEllipse {circle} at (-1,-1) size 142x142 [stroke={[type=SOLID] [color=#000000]}] [cx=120.00] [cy=140.00] [r=70.00]
+layer at (20,40) size 200x200
+  RenderSVGEllipse {circle} at (-1,-1) size 202x202 [stroke={[type=SOLID] [color=#000000]}] [cx=120.00] [cy=140.00] [r=100.00]
+layer at (70,253) size 98x33
+  RenderSVGText {text} at (50,212) size 99x35 contains 1 chunk(s)
     RenderSVGInlineText {#text} at (0,0) size 99x34
       chunk 1 text run 1 at (70.00,280.00) startOffset 0 endOffset 7 width 98.38: "anim. 1"
-layer at (310,253) size 99x34
-  RenderSVGContainer {g} at (0,0) size 99x34
-layer at (310,253) size 98x34
-  RenderSVGText {text} at (0,0) size 99x34 contains 1 chunk(s)
+layer at (260,40) size 200x247
+  RenderSVGContainer {g} at (-1,-1) size 202x248
+layer at (290,70) size 140x140
+  RenderSVGEllipse {circle} at (-1,-1) size 142x142 [stroke={[type=SOLID] [color=#EE33AA]}] [cx=360.00] [cy=140.00] [r=70.00]
+layer at (320,100) size 80x80
+  RenderSVGEllipse {circle} at (-1,-1) size 82x82 [stroke={[type=SOLID] [color=#000000]}] [cx=360.00] [cy=140.00] [r=40.00]
+layer at (290,70) size 140x140
+  RenderSVGEllipse {circle} at (-1,-1) size 142x142 [stroke={[type=SOLID] [color=#000000]}] [cx=360.00] [cy=140.00] [r=70.00]
+layer at (260,40) size 200x200
+  RenderSVGEllipse {circle} at (-1,-1) size 202x202 [stroke={[type=SOLID] [color=#000000]}] [cx=360.00] [cy=140.00] [r=100.00]
+layer at (310,253) size 98x33
+  RenderSVGText {text} at (50,212) size 99x35 contains 1 chunk(s)
     RenderSVGInlineText {#text} at (0,0) size 99x34
       chunk 1 text run 1 at (310.00,280.00) startOffset 0 endOffset 7 width 98.38: "anim. 2"
 layer at (10,304) size 263x46

diff --git a/...tTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/animate-elem-28-t-expected.txt b/...tTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/animate-elem-28-t-expected.txt
@@ -4,6 +4,8 @@ layer at (0,0) size 480x360
   RenderSVGRoot {svg} at (0,0) size 480x360
 layer at (1,1) size 478x358
   RenderSVGContainer {g} at (-3,-3) size 484x364
+layer at (90,30) size 300x300
+  RenderSVGEllipse {circle} at (-3,-3) size 306x306 [stroke={[type=SOLID] [color=#F1E900] [stroke width=5.00]}] [fill={[type=SOLID] [color=#F1E900]}] [cx=240.00] [cy=180.00] [r=150.00]
 layer at (10,304) size 263x46
   RenderSVGText {text} at (9,303) size 264x46 contains 1 chunk(s)
     RenderSVGInlineText {#text} at (0,0) size 264x46

diff --git a/...tTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/animate-elem-29-b-expected.txt b/...tTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/animate-elem-29-b-expected.txt
@@ -2,10 +2,14 @@ layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
 layer at (0,0) size 480x360
   RenderSVGRoot {svg} at (0,0) size 480x360
-layer at (20,20) size 180x180
-  RenderSVGContainer {g} at (0,0) size 180x180
+layer at (20,20) size 260x240
+  RenderSVGContainer {g} at (0,0) size 270x255
+layer at (40,140) size 120x120
+  RenderSVGEllipse {circle} at (-15,-15) size 150x150 [stroke={[type=SOLID] [color=#666666] [stroke width=30.00]}] [cx=100.00] [cy=200.00] [r=60.00]
 layer at (20,20) size 180x180
   RenderSVGRect {rect} at (0,0) size 180x180 [fill={[type=SOLID] [color=#FF0000] [opacity=0.00]}] [x=20.00] [y=20.00] [width=180.00] [height=180.00]
+layer at (120,30) size 160x160
+  RenderSVGEllipse {circle} at (-10,-10) size 180x180 [stroke={[type=SOLID] [color=#666666] [stroke width=20.00]}] [cx=200.00] [cy=110.00] [r=80.00]
 layer at (10,304) size 263x46
   RenderSVGText {text} at (10,304) size 264x46 contains 1 chunk(s)
     RenderSVGInlineText {#text} at (0,0) size 264x46

diff --git a/...tTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/animate-elem-30-t-expected.txt b/...tTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/animate-elem-30-t-expected.txt
@@ -8,6 +8,10 @@ layer at (10,60) size 60x21
   RenderSVGRect {rect} at (21,0) size 82x30 [stroke={[type=SOLID] [color=#B4B4B4] [stroke width=2.00]}] [fill={[type=SOLID] [color=#B4B4B4]}] [x=10.00] [y=60.00] [width=60.00] [height=20.00]
 layer at (145,60) size 30x41
   RenderSVGRect {rect} at (21,0) size 43x56 [stroke={[type=SOLID] [color=#B4B4B4] [stroke width=2.00]}] [fill={[type=SOLID] [color=#B4B4B4]}] [x=145.00] [y=60.00] [width=30.00] [height=40.00]
+layer at (20,90) size 20x21
+  RenderSVGEllipse {circle} at (22,1) size 28x28 [stroke={[type=SOLID] [color=#B4B4B4]}] [fill={[type=SOLID] [color=#B4B4B4]}] [cx=30.00] [cy=100.00] [r=10.00]
+layer at (85,180) size 30x31
+  RenderSVGEllipse {circle} at (22,1) size 41x41 [stroke={[type=SOLID] [color=#B4B4B4]}] [fill={[type=SOLID] [color=#B4B4B4]}] [cx=100.00] [cy=195.00] [r=15.00]
 layer at (300,10) size 20x21
   RenderSVGRect {rect} at (21,0) size 30x30 [stroke={[type=SOLID] [color=#B4B4B4] [stroke width=2.00]}] [fill={[type=SOLID] [color=#B4B4B4]}] [x=300.00] [y=10.00] [width=20.00] [height=20.00]
 layer at (300,170) size 20x41

diff --git a/...tTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/animate-elem-31-t-expected.txt b/...tTests/platform/mac-monterey-wk2-lbse-text/svg/W3C-SVG-1.1/animate-elem-31-t-expected.txt
@@ -6,6 +6,40 @@ layer at (5,8) size 375x76
   RenderSVGRect {rect} at (-2,-2) size 379x79 [stroke={[type=SOLID] [color=#000000] [stroke width=3.00]}] [fill={[type=SOLID] [color=#C0C0C0]}] [x=5.00] [y=7.50] [width=375.00] [height=75.00]
 layer at (5,113) size 375x76
   RenderSVGRect {rect} at (-2,-2) size 379x79 [stroke={[type=SOLID] [color=#000000] [stroke width=3.00]}] [fill={[type=SOLID] [color=#C0C0C0]}] [x=5.00] [y=112.50] [width=375.00] [height=75.00]
+layer at (10,10) size 240x110
+  RenderSVGContainer {g} at (1,1) size 368x173
+layer at (10,10) size 40x40
+  RenderSVGEllipse {circle} at (1,1) size 68x68 [stroke={[type=SOLID] [color=#000000] [stroke width=5.00]}] [fill={[type=SOLID] [color=#800080]}] [cx=30.00] [cy=30.00] [r=20.00]
+layer at (10,80) size 40x40
+  RenderSVGEllipse {circle} at (1,1) size 68x68 [stroke={[type=SOLID] [color=#000000] [stroke width=5.00]}] [fill={[type=SOLID] [color=#800080]}] [cx=30.00] [cy=100.00] [r=20.00]
+layer at (60,10) size 40x40
+  RenderSVGContainer {g} at (1,1) size 68x68
+layer at (60,10) size 40x40
+  RenderSVGEllipse {circle} at (1,1) size 68x68 [stroke={[type=SOLID] [color=#000000] [stroke width=5.00]}] [fill={[type=SOLID] [color=#008000]}] [cx=80.00] [cy=30.00] [r=20.00]
+layer at (60,80) size 40x40
+  RenderSVGEllipse {circle} at (0,0) size 0x0 [stroke={[type=SOLID] [color=#000000] [stroke width=5.00]}] [fill={[type=SOLID] [color=#008000]}] [cx=80.00] [cy=100.00] [r=20.00]
+layer at (110,80) size 40x40
+  RenderSVGEllipse {circle} at (0,0) size 0x0 [stroke={[type=SOLID] [color=#000000] [stroke width=5.00]}] [fill={[type=SOLID] [color=#FF0000]}] [cx=130.00] [cy=100.00] [r=20.00]
+layer at (160,10) size 40x40
+  RenderSVGContainer {g} at (1,1) size 68x68
+layer at (160,10) size 40x40
+  RenderSVGContainer {g} at (1,1) size 68x68
+layer at (160,10) size 40x40
+  RenderSVGEllipse {circle} at (1,1) size 68x68 [stroke={[type=SOLID] [color=#000000] [stroke width=5.00]}] [fill={[type=SOLID] [color=#0000FF]}] [cx=180.00] [cy=30.00] [r=20.00]
+layer at (160,80) size 40x40
+  RenderSVGEllipse {circle} at (0,0) size 0x0 [stroke={[type=SOLID] [color=#000000] [stroke width=5.00]}] [fill={[type=SOLID] [color=#0000FF]}] [cx=180.00] [cy=100.00] [r=20.00]
+layer at (160,10) size 40x40
+  RenderSVGContainer {g} at (1,1) size 68x68
+layer at (160,10) size 40x40
+  RenderSVGContainer {g} at (1,1) size 68x68
+layer at (160,10) size 40x40
+  RenderSVGEllipse {circle} at (1,1) size 68x68 [stroke={[type=SOLID] [color=#000000] [stroke width=5.00]}] [fill={[type=SOLID] [color=#FFFF00]}] [cx=180.00] [cy=30.00] [r=20.00]
+layer at (160,80) size 40x40
+  RenderSVGEllipse {circle} at (0,0) size 0x0 [stroke={[type=SOLID] [color=#000000] [stroke width=5.00]}] [fill={[type=SOLID] [color=#FFFF00]}] [cx=180.00] [cy=100.00] [r=20.00]
+layer at (210,80) size 40x40
+  RenderSVGContainer {g} at (1,1) size 68x68
+layer at (210,80) size 40x40
+  RenderSVGEllipse {circle} at (0,0) size 0x0 [stroke={[type=SOLID] [color=#000000] [stroke width=5.00]}] [fill={[type=SOLID] [color=#00FFFF]}] [cx=230.00] [cy=100.00] [r=20.00]
 layer at (385,26) size 46x18
   RenderSVGText {text} at (385,26) size 47x18 contains 1 chunk(s)
     RenderSVGInlineText {#text} at (0,0) size 47x18