Changeset 293857 in webkit

Timestamp:

May 5, 2022, 11:58:04 AM (4 years ago)

Author:

commit-queue@webkit.org

Message:

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):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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-05  Said Abou-Hallawa  <said@apple.com>
 

trunk/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);
 }