Title: [201954] trunk/Source/WebCore
- Revision
- 201954
- Author
- [email protected]
- Date
- 2016-06-10 17:15:11 -0700 (Fri, 10 Jun 2016)
Log Message
Fix WinCairo build after r201943
* platform/network/curl/MultipartHandle.cpp:
(WebCore::MultipartHandle::didReceiveResponse):
* platform/network/curl/ResourceHandleManager.cpp:
(WebCore::handleLocalReceiveResponse):
(WebCore::headerCallback):
(WebCore::ResourceHandleManager::dispatchSynchronousJob):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (201953 => 201954)
--- trunk/Source/WebCore/ChangeLog 2016-06-10 23:54:33 UTC (rev 201953)
+++ trunk/Source/WebCore/ChangeLog 2016-06-11 00:15:11 UTC (rev 201954)
@@ -1,5 +1,16 @@
2016-06-10 Alex Christensen <[email protected]>
+ Fix WinCairo build after r201943
+
+ * platform/network/curl/MultipartHandle.cpp:
+ (WebCore::MultipartHandle::didReceiveResponse):
+ * platform/network/curl/ResourceHandleManager.cpp:
+ (WebCore::handleLocalReceiveResponse):
+ (WebCore::headerCallback):
+ (WebCore::ResourceHandleManager::dispatchSynchronousJob):
+
+2016-06-10 Alex Christensen <[email protected]>
+
handleDataURL is only used by curl
https://bugs.webkit.org/show_bug.cgi?id=158636
Modified: trunk/Source/WebCore/platform/network/curl/MultipartHandle.cpp (201953 => 201954)
--- trunk/Source/WebCore/platform/network/curl/MultipartHandle.cpp 2016-06-10 23:54:33 UTC (rev 201953)
+++ trunk/Source/WebCore/platform/network/curl/MultipartHandle.cpp 2016-06-11 00:15:11 UTC (rev 201954)
@@ -349,8 +349,7 @@
response.setMimeType(mimeType.convertToASCIILowercase());
response.setTextEncodingName(extractCharsetFromMediaType(contentType));
- d->client()->didReceiveResponse(m_resourceHandle, response);
- response.setResponseFired(true);
+ d->client()->didReceiveResponse(m_resourceHandle, WTFMove(response));
}
}
Modified: trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp (201953 => 201954)
--- trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2016-06-10 23:54:33 UTC (rev 201953)
+++ trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2016-06-11 00:15:11 UTC (rev 201954)
@@ -42,7 +42,6 @@
#include "CredentialStorage.h"
#include "CurlCacheManager.h"
-#include "DataURL.h"
#include "HTTPHeaderNames.h"
#include "HTTPParsers.h"
#include "MIMETypeRegistry.h"
@@ -312,7 +311,7 @@
ASSERT(url.isValid());
d->m_response.setURL(url);
if (d->client())
- d->client()->didReceiveResponse(job, d->m_response);
+ d->client()->didReceiveResponse(job, ResourceResponse(d->m_response));
d->m_response.setResponseFired(true);
}
@@ -559,7 +558,7 @@
}
}
}
- client->didReceiveResponse(job, d->m_response);
+ client->didReceiveResponse(job, ResourceResponse(d->m_response));
CurlCacheManager::getInstance().didReceiveResponse(*job, d->m_response);
}
d->m_response.setResponseFired(true);
@@ -1002,7 +1001,7 @@
handle->client()->didFail(job, error);
} else {
if (handle->client())
- handle->client()->didReceiveResponse(job, handle->m_response);
+ handle->client()->didReceiveResponse(job, ResourceResponse(handle->m_response));
}
#if ENABLE(WEB_TIMING)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
