Changeset 294842 in webkit

Timestamp:

May 25, 2022, 4:49:47 PM (4 years ago)

Author:

Alan Coon

Message:

Cherry-pick r293857. rdar://problem/93602013

Remove unnecessary calls to CachedResource::updateBuffer and CachedResource::updateData
​https://bugs.webkit.org/show_bug.cgi?id=240126

Patch by Alex Christensen <​achristensen@webkit.org> on 2022-05-05
Reviewed by Chris Dumez.

It adds a function call that does nothing but a redundant assert.

• loader/cache/CachedImage.cpp: (WebCore::CachedImage::updateBufferInternal): (WebCore::CachedImage::updateBuffer): (WebCore::CachedImage::updateData):

Canonical link: ​https://commits.webkit.org/250322@main
git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@293857 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-613-branch/Source/WebCore

Files:

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

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

@@ +1 @@
+2022-05-19  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r293857. rdar://problem/93602013
+
+    Remove unnecessary calls to CachedResource::updateBuffer and CachedResource::updateData
+    https://bugs.webkit.org/show_bug.cgi?id=240126
+    
+    Patch by Alex Christensen <achristensen@webkit.org> on 2022-05-05
+    Reviewed by Chris Dumez.
+    
+    It adds a function call that does nothing but a redundant assert.
+    
+    * loader/cache/CachedImage.cpp:
+    (WebCore::CachedImage::updateBufferInternal):
+    (WebCore::CachedImage::updateBuffer):
+    (WebCore::CachedImage::updateData):
+    
+    Canonical link: https://commits.webkit.org/250322@main
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@293857 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2022-05-05  Alex Christensen  <achristensen@webkit.org>
+
+            Remove unnecessary calls to CachedResource::updateBuffer and CachedResource::updateData
+            https://bugs.webkit.org/show_bug.cgi?id=240126
+
+            Reviewed by Chris Dumez.
+
+            It adds a function call that does nothing but a redundant assert.
+
+            * loader/cache/CachedImage.cpp:
+            (WebCore::CachedImage::updateBufferInternal):
+            (WebCore::CachedImage::updateBuffer):
+            (WebCore::CachedImage::updateData):
+
 2022-05-19  Alan Coon  <alancoon@apple.com>
 

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

@@ -507 +507 @@
         // Image decoding failed. Either we need more image data or the image data is malformed.
         error(errorOccurred() ? status() : DecodeError);
+        if (inCache())
+            MemoryCache::singleton().remove(*this);
         if (m_loader && encodedDataStatus == EncodedDataStatus::Error)
             m_loader->cancel();
-        if (inCache())
-            MemoryCache::singleton().remove(*this);
         return;
     }
@@ -555 +555 @@
     ASSERT(dataBufferingPolicy() == DataBufferingPolicy::BufferData);
     updateBufferInternal(buffer.makeContiguous());
-    CachedResource::updateBuffer(buffer);
 }
 
@@ -562 +561 @@
     ASSERT(dataBufferingPolicy() == DataBufferingPolicy::DoNotBufferData);
     updateBufferInternal(data);
-    CachedResource::updateData(data);
 }