Title: [152251] branches/safari-537-branch/Source/WebCore
- Revision
- 152251
- Author
- [email protected]
- Date
- 2013-07-01 13:54:59 -0700 (Mon, 01 Jul 2013)
Log Message
Merged r152207. <rdar://problem/14242032>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (152250 => 152251)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-01 20:53:31 UTC (rev 152250)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-01 20:54:59 UTC (rev 152251)
@@ -1,5 +1,23 @@
2013-07-01 Lucas Forschler <[email protected]>
+ Merge r152207
+
+ 2013-06-29 Carlos Garcia Campos <[email protected]>
+
+ REGRESSION(151586): multipart/x-mixed-replace images are broken
+ https://bugs.webkit.org/show_bug.cgi?id=118169
+
+ Reviewed by Alexey Proskuryakov.
+
+ When loading multipart content the resource data will change as
+ the next part is loaded, so we need to make a copy of the data
+ before sending it to the resource.
+
+ * loader/SubresourceLoader.cpp:
+ (WebCore::SubresourceLoader::didReceiveResponse):
+
+2013-07-01 Lucas Forschler <[email protected]>
+
Merge r152202
2013-06-28 Gavin Barraclough <[email protected]>
Modified: branches/safari-537-branch/Source/WebCore/loader/SubresourceLoader.cpp (152250 => 152251)
--- branches/safari-537-branch/Source/WebCore/loader/SubresourceLoader.cpp 2013-07-01 20:53:31 UTC (rev 152250)
+++ branches/safari-537-branch/Source/WebCore/loader/SubresourceLoader.cpp 2013-07-01 20:54:59 UTC (rev 152251)
@@ -208,7 +208,9 @@
RefPtr<ResourceBuffer> buffer = resourceData();
if (m_loadingMultipartContent && buffer && buffer->size()) {
- m_resource->finishLoading(buffer.get());
+ // The resource data will change as the next part is loaded, so we need to make a copy.
+ RefPtr<ResourceBuffer> copiedData = ResourceBuffer::create(buffer->data(), buffer->size());
+ m_resource->finishLoading(copiedData.get());
clearResourceData();
// Since a subresource loader does not load multipart sections progressively, data was delivered to the loader all at once.
// After the first multipart section is complete, signal to delegates that this load is "finished"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
