Title: [293857] trunk/Source/WebCore
- Revision
- 293857
- Author
- commit-qu...@webkit.org
- Date
- 2022-05-05 11:58:04 -0700 (Thu, 05 May 2022)
Log Message
Remove unnecessary calls to CachedResource::updateBuffer and CachedResource::updateData
https://bugs.webkit.org/show_bug.cgi?id=240126
Patch by Alex Christensen <achristen...@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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (293856 => 293857)
--- trunk/Source/WebCore/ChangeLog 2022-05-05 18:54:37 UTC (rev 293856)
+++ trunk/Source/WebCore/ChangeLog 2022-05-05 18:58:04 UTC (rev 293857)
@@ -1,3 +1,17 @@
+2022-05-05 Alex Christensen <achristen...@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 <s...@apple.com>
[GPU Process] NativeImage should share the ShareableBitmap data when it's sent to GPU Process
Modified: trunk/Source/WebCore/loader/cache/CachedImage.cpp (293856 => 293857)
--- trunk/Source/WebCore/loader/cache/CachedImage.cpp 2022-05-05 18:54:37 UTC (rev 293856)
+++ trunk/Source/WebCore/loader/cache/CachedImage.cpp 2022-05-05 18:58:04 UTC (rev 293857)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
