Don't include SVGImageForContainers in allCachedSVGImages

mattwoodrow · webkit-commit-queue · commit b4ff91d6f08c · 2021-12-21T00:24:53.000Z
https://bugs.webkit.org/show_bug.cgi?id=234364 Patch by Matt Woodrow <mattwoodrow@apple.com> on 2021-12-20 Reviewed by Dean Jackson. * loader/cache/CachedImage.cpp: (WebCore::CachedImage::image const): (WebCore::CachedImage::hasSVGImage const): (WebCore::CachedImage::image): Deleted. * loader/cache/CachedImage.h: Canonical link: https://commits.webkit.org/245438@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287286 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2021-12-20  Matt Woodrow  <mattwoodrow@apple.com>
+
+        Don't include SVGImageForContainers in allCachedSVGImages
+        https://bugs.webkit.org/show_bug.cgi?id=234364
+
+        Reviewed by Dean Jackson.
+
+        * loader/cache/CachedImage.cpp:
+        (WebCore::CachedImage::image const):
+        (WebCore::CachedImage::hasSVGImage const):
+        (WebCore::CachedImage::image): Deleted.
+        * loader/cache/CachedImage.h:
+
 2021-12-20  Wenson Hsieh  <wenson_hsieh@apple.com>
 
         Adopt ChromeClient::classifyModalContainerControls() in ModalContainerObserver
diff --git a/Source/WebCore/loader/cache/CachedImage.cpp b/Source/WebCore/loader/cache/CachedImage.cpp
@@ -235,7 +235,7 @@ bool CachedImage::willPaintBrokenImage() const
     return errorOccurred() && m_shouldPaintBrokenImage;
 }
 
-Image* CachedImage::image()
+Image* CachedImage::image() const
 {
     if (errorOccurred() && m_shouldPaintBrokenImage) {
         // Returning the 1x broken image is non-ideal, but we cannot reliably access the appropriate
@@ -272,7 +272,7 @@ Image* CachedImage::imageForRenderer(const RenderObject* renderer)
 
 bool CachedImage::hasSVGImage() const
 {
-    return m_image && m_image->drawsSVGImage();
+    return image() && image()->isSVGImage();
 }
 
 void CachedImage::setContainerContextForClient(const CachedImageClient& client, const LayoutSize& containerSize, float containerZoom, const URL& imageURL)
diff --git a/Source/WebCore/loader/cache/CachedImage.h b/Source/WebCore/loader/cache/CachedImage.h
@@ -53,7 +53,7 @@ class CachedImage final : public CachedResource {
     CachedImage(const URL&, Image*, PAL::SessionID, const CookieJar*, const String& domainForCachePartition);
     virtual ~CachedImage();
 
-    WEBCORE_EXPORT Image* image(); // Returns the nullImage() if the image is not available yet.
+    WEBCORE_EXPORT Image* image() const; // Returns the nullImage() if the image is not available yet.
     WEBCORE_EXPORT Image* imageForRenderer(const RenderObject*); // Returns the nullImage() if the image is not available yet.
     bool hasImage() const { return m_image.get(); }
     bool hasSVGImage() const;

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ bool CachedImage::willPaintBrokenImage() const`
`235`	`235`	`return errorOccurred() && m_shouldPaintBrokenImage;`
`236`	`236`	`}`
`237`	`237`
`238`		`-Image* CachedImage::image()`
	`238`	`+Image* CachedImage::image() const`
`239`	`239`	`{`
`240`	`240`	`if (errorOccurred() && m_shouldPaintBrokenImage) {`
`241`	`241`	`// Returning the 1x broken image is non-ideal, but we cannot reliably access the appropriate`
`@@ -272,7 +272,7 @@ Image* CachedImage::imageForRenderer(const RenderObject* renderer)`
`272`	`272`
`273`	`273`	`bool CachedImage::hasSVGImage() const`
`274`	`274`	`{`
`275`		`- return m_image && m_image->drawsSVGImage();`
	`275`	`+ return image() && image()->isSVGImage();`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`void CachedImage::setContainerContextForClient(const CachedImageClient& client, const LayoutSize& containerSize, float containerZoom, const URL& imageURL)`