Title: [294842] branches/safari-613-branch/Source/WebCore
- Revision
- 294842
- Author
- [email protected]
- Date
- 2022-05-25 16:49:47 -0700 (Wed, 25 May 2022)
Log 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 <[email protected]> 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
Modified Paths
Diff
Modified: branches/safari-613-branch/Source/WebCore/ChangeLog (294841 => 294842)
--- branches/safari-613-branch/Source/WebCore/ChangeLog 2022-05-25 23:49:44 UTC (rev 294841)
+++ branches/safari-613-branch/Source/WebCore/ChangeLog 2022-05-25 23:49:47 UTC (rev 294842)
@@ -1,5 +1,39 @@
2022-05-19 Alan Coon <[email protected]>
+ 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 <[email protected]> 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 <[email protected]>
+
+ 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 <[email protected]>
+
Cherry-pick r293827. rdar://problem/92624773
replaceTrack with different constraints stops sending packets
Modified: branches/safari-613-branch/Source/WebCore/loader/cache/CachedImage.cpp (294841 => 294842)
--- branches/safari-613-branch/Source/WebCore/loader/cache/CachedImage.cpp 2022-05-25 23:49:44 UTC (rev 294841)
+++ branches/safari-613-branch/Source/WebCore/loader/cache/CachedImage.cpp 2022-05-25 23:49:47 UTC (rev 294842)
@@ -506,10 +506,10 @@
if (encodedDataStatus == EncodedDataStatus::Error || m_image->isNull()) {
// 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;
}
@@ -554,7 +554,6 @@
{
ASSERT(dataBufferingPolicy() == DataBufferingPolicy::BufferData);
updateBufferInternal(buffer.makeContiguous());
- CachedResource::updateBuffer(buffer);
}
void CachedImage::updateData(const SharedBuffer& data)
@@ -561,7 +560,6 @@
{
ASSERT(dataBufferingPolicy() == DataBufferingPolicy::DoNotBufferData);
updateBufferInternal(data);
- CachedResource::updateData(data);
}
void CachedImage::finishLoading(const FragmentedSharedBuffer* data, const NetworkLoadMetrics& metrics)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
