Changeset 287286 in webkit

Timestamp:

Dec 20, 2021, 4:24:53 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Don't include SVGImageForContainers in allCachedSVGImages
​https://bugs.webkit.org/show_bug.cgi?id=234364

Patch by Matt Woodrow <Matt Woodrow> 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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/cache/CachedImage.cpp (modified) (2 diffs)
• loader/cache/CachedImage.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/loader/cache/CachedImage.cpp

@@ -236 +236 @@
 }
 
-Image* CachedImage::image()
+Image* CachedImage::image() const
 {
     if (errorOccurred() && m_shouldPaintBrokenImage) {
@@ -273 +273 @@
 bool CachedImage::hasSVGImage() const
 {
-    return m_image && m_image->drawsSVGImage();
+    return image() && image()->isSVGImage();
 }
 

trunk/Source/WebCore/loader/cache/CachedImage.h

@@ -54 +54 @@
     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(); }