Unreviewed: Fix build break after cherry-picking 268629@main

https://bugs.webkit.org/show_bug.cgi?id=260732
rdar://114465545

Replace references to LegacyRenderSVGResourceContainer by RenderSVGResourceContainer.

* Source/WebCore/rendering/ReferencedSVGResources.cpp:
(WebCore::ReferencedSVGResources::referencedRenderResource):
* Source/WebCore/rendering/ReferencedSVGResources.h:
* Source/WebCore/rendering/style/StyleCachedImage.cpp:
(WebCore::StyleCachedImage::uncheckedRenderSVGResource const):
(WebCore::StyleCachedImage::renderSVGResource const):
* Source/WebCore/rendering/style/StyleCachedImage.h:
* Source/WebCore/svg/graphics/SVGResourceImage.cpp:
(WebCore::SVGResourceImage::create):
(WebCore::SVGResourceImage::SVGResourceImage):
* Source/WebCore/svg/graphics/SVGResourceImage.h:

Canonical link: https://commits.webkit.org/267815.211@safari-7617-branch

Source/WebCore/rendering/ReferencedSVGResources.cpp

@@ -28,6 +28,8 @@
 
 #include "FilterOperations.h"
 #include "PathOperation.h"
+#include "RenderSVGResourceClipper.h"
+#include "RenderSVGResourceContainer.h"
 #include "RenderStyle.h"
 #include "SVGClipPathElement.h"
 #include "SVGElementTypeHelpers.h"
@@ -162,7 +164,7 @@ RenderSVGResourceClipper* ReferencedSVGResources::referencedClipperRenderer(Tree
     return getRenderSVGResourceById<RenderSVGResourceClipper>(treeScope, clipPath.fragment());
 }
 
-LegacyRenderSVGResourceContainer* ReferencedSVGResources::referencedRenderResource(TreeScope& treeScope, const AtomString& fragment)
+RenderSVGResourceContainer* ReferencedSVGResources::referencedRenderResource(TreeScope& treeScope, const AtomString& fragment)
 {
     if (fragment.isEmpty())
         return nullptr;

Source/WebCore/rendering/ReferencedSVGResources.h

@@ -35,12 +35,13 @@ namespace WebCore {
 
 class CSSSVGResourceElementClient;
 class Document;
-class LegacyRenderSVGResourceClipper;
-class LegacyRenderSVGResourceContainer;
+class RenderSVGResourceClipper;
+class RenderSVGResourceContainer;
 class ReferencePathOperation;
 class ReferenceFilterOperation;
 class RenderElement;
 class RenderSVGResourceClipper;
+class RenderSVGResourceContainer;
 class RenderSVGResourceFilter;
 class RenderStyle;
 class QualifiedName;
@@ -58,10 +59,10 @@ class ReferencedSVGResources {
     void updateReferencedResources(TreeScope&, const Vector<std::pair<AtomString, QualifiedName>>&);
 
     // Clipping needs a renderer, filters use an element.
-    static LegacyRenderSVGResourceClipper* referencedClipperRenderer(TreeScope&, const ReferencePathOperation&);
+    static RenderSVGResourceClipper* referencedClipperRenderer(TreeScope&, const ReferencePathOperation&);
     static SVGFilterElement* referencedFilterElement(TreeScope&, const ReferenceFilterOperation&);
 
-    static LegacyRenderSVGResourceContainer* referencedRenderResource(TreeScope&, const AtomString& fragment);
+    static RenderSVGResourceContainer* referencedRenderResource(TreeScope&, const AtomString& fragment);
 
 private:
     static SVGElement* elementForResourceID(TreeScope&, const AtomString& resourceID, const QualifiedName& tagName);

Source/WebCore/rendering/style/StyleCachedImage.cpp

@@ -88,14 +88,14 @@ URL StyleCachedImage::reresolvedURL(const Document& document) const
     return m_cssValue->reresolvedURL(document);
 }
 
-LegacyRenderSVGResourceContainer* StyleCachedImage::uncheckedRenderSVGResource(TreeScope& treeScope, const AtomString& fragment) const
+RenderSVGResourceContainer* StyleCachedImage::uncheckedRenderSVGResource(TreeScope& treeScope, const AtomString& fragment) const
 {
     auto renderSVGResource = ReferencedSVGResources::referencedRenderResource(treeScope, fragment);
     m_isRenderSVGResource = renderSVGResource != nullptr;
     return renderSVGResource;
 }
 
-LegacyRenderSVGResourceContainer* StyleCachedImage::uncheckedRenderSVGResource(const RenderElement* renderer) const
+RenderSVGResourceContainer* StyleCachedImage::uncheckedRenderSVGResource(const RenderElement* renderer) const
 {
     if (!renderer)
         return nullptr;
@@ -125,7 +125,7 @@ LegacyRenderSVGResourceContainer* StyleCachedImage::uncheckedRenderSVGResource(c
     return uncheckedRenderSVGResource(rootElement->treeScopeForSVGReferences(), fragmentIdentifier.toAtomString());
 }
 
-LegacyRenderSVGResourceContainer* StyleCachedImage::renderSVGResource(const RenderElement* renderer) const
+RenderSVGResourceContainer* StyleCachedImage::renderSVGResource(const RenderElement* renderer) const
 {
     if (m_isRenderSVGResource && !*m_isRenderSVGResource)
         return nullptr;

Source/WebCore/rendering/style/StyleCachedImage.h

@@ -32,8 +32,8 @@ class CSSValue;
 class CSSImageValue;
 class CachedImage;
 class Document;
-class LegacyRenderSVGResourceContainer;
 class RenderElement;
+class RenderSVGResourceContainer;
 class TreeScope;
 
 class StyleCachedImage final : public StyleImage {
@@ -79,9 +79,9 @@ class StyleCachedImage final : public StyleImage {
 private:
     StyleCachedImage(Ref<CSSImageValue>&&, float);
 
-    LegacyRenderSVGResourceContainer* uncheckedRenderSVGResource(TreeScope&, const AtomString& fragment) const;
-    LegacyRenderSVGResourceContainer* uncheckedRenderSVGResource(const RenderElement*) const;
-    LegacyRenderSVGResourceContainer* renderSVGResource(const RenderElement*) const;
+    RenderSVGResourceContainer* uncheckedRenderSVGResource(TreeScope&, const AtomString& fragment) const;
+    RenderSVGResourceContainer* uncheckedRenderSVGResource(const RenderElement*) const;
+    RenderSVGResourceContainer* renderSVGResource(const RenderElement*) const;
     bool isRenderSVGResource(const RenderElement*) const;
 
     Ref<CSSImageValue> m_cssValue;

Source/WebCore/svg/graphics/SVGResourceImage.cpp

@@ -32,12 +32,12 @@
 
 namespace WebCore {
 
-Ref<SVGResourceImage> SVGResourceImage::create(LegacyRenderSVGResourceContainer& renderResource, const URL& reresolvedURL)
+Ref<SVGResourceImage> SVGResourceImage::create(RenderSVGResourceContainer& renderResource, const URL& reresolvedURL)
 {
     return adoptRef(*new SVGResourceImage(renderResource, reresolvedURL));
 }
 
-SVGResourceImage::SVGResourceImage(LegacyRenderSVGResourceContainer& renderResource, const URL& reresolvedURL)
+SVGResourceImage::SVGResourceImage(RenderSVGResourceContainer& renderResource, const URL& reresolvedURL)
     : m_renderResource(renderResource)
     , m_reresolvedURL(reresolvedURL)
 {

Source/WebCore/svg/graphics/SVGResourceImage.h

@@ -32,15 +32,15 @@
 
 namespace WebCore {
 
-class LegacyRenderSVGResourceContainer;
 class RenderElement;
+class RenderSVGResourceContainer;
 
 class SVGResourceImage final : public GeneratedImage {
 public:
-    static Ref<SVGResourceImage> create(LegacyRenderSVGResourceContainer&, const URL& reresolvedURL);
+    static Ref<SVGResourceImage> create(RenderSVGResourceContainer&, const URL& reresolvedURL);
 
 private:
-    SVGResourceImage(LegacyRenderSVGResourceContainer&, const URL& reresolvedURL);
+    SVGResourceImage(RenderSVGResourceContainer&, const URL& reresolvedURL);
 
     ImageDrawResult draw(GraphicsContext&, const FloatRect& destinationRect, const FloatRect& sourceRect, const ImagePaintingOptions& = { }) final;
     void drawPattern(GraphicsContext&, const FloatRect& destRect, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, const ImagePaintingOptions& = { }) final;
@@ -49,7 +49,7 @@ class SVGResourceImage final : public GeneratedImage {
 
     void dump(WTF::TextStream&) const final;
 
-    WeakPtr<LegacyRenderSVGResourceContainer> m_renderResource;
+    WeakPtr<RenderSVGResourceContainer> m_renderResource;
     URL m_reresolvedURL;
 };