Changeset 287631 in webkit

Timestamp:

Jan 5, 2022, 10:21:18 AM (5 years ago)

Author:

Russell Epstein

Message:

Cherry-pick r287286. rdar://problem/87124952

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:

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

Location:

branches/safari-612-branch/Source/WebCore

Files:

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

branches/safari-612-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2022-01-05  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r287286. rdar://problem/87124952
+
+    Don't include SVGImageForContainers in allCachedSVGImages
+    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:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287286 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    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:
+
 2022-01-05  Russell Epstein  <repstein@apple.com>
 

branches/safari-612-branch/Source/WebCore/loader/cache/CachedImage.cpp

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

branches/safari-612-branch/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(); }