Title: [201767] trunk/Source/WebCore
- Revision
- 201767
- Author
- [email protected]
- Date
- 2016-06-07 13:05:36 -0700 (Tue, 07 Jun 2016)
Log Message
Build fix non-cocoa platforms.
https://bugs.webkit.org/show_bug.cgi?id=158332
* loader/cache/CachedFont.cpp:
(WebCore::CachedFont::createCustomFontData):
* platform/network/ResourceHandle.cpp:
(WebCore::ResourceHandle::continueWillSendRequest):
* platform/network/curl/MultipartHandle.cpp:
(WebCore::MultipartHandle::didReceiveResponse):
* platform/network/curl/ResourceHandleManager.cpp:
(WebCore::headerCallback):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (201766 => 201767)
--- trunk/Source/WebCore/ChangeLog 2016-06-07 19:51:41 UTC (rev 201766)
+++ trunk/Source/WebCore/ChangeLog 2016-06-07 20:05:36 UTC (rev 201767)
@@ -1,3 +1,17 @@
+2016-06-07 Alex Christensen <[email protected]>
+
+ Build fix non-cocoa platforms.
+ https://bugs.webkit.org/show_bug.cgi?id=158332
+
+ * loader/cache/CachedFont.cpp:
+ (WebCore::CachedFont::createCustomFontData):
+ * platform/network/ResourceHandle.cpp:
+ (WebCore::ResourceHandle::continueWillSendRequest):
+ * platform/network/curl/MultipartHandle.cpp:
+ (WebCore::MultipartHandle::didReceiveResponse):
+ * platform/network/curl/ResourceHandleManager.cpp:
+ (WebCore::headerCallback):
+
2016-06-07 Sam Weinig <[email protected]>
Try to fix the 10.10 build.
Modified: trunk/Source/WebCore/loader/cache/CachedFont.cpp (201766 => 201767)
--- trunk/Source/WebCore/loader/cache/CachedFont.cpp 2016-06-07 19:51:41 UTC (rev 201766)
+++ trunk/Source/WebCore/loader/cache/CachedFont.cpp 2016-06-07 20:05:36 UTC (rev 201767)
@@ -113,7 +113,7 @@
return nullptr;
auto buffer = SharedBuffer::adoptVector(convertedFont);
- return createFontCustomPlatformData(*buffer);
+ return createFontCustomPlatformData(buffer);
}
#endif
Modified: trunk/Source/WebCore/platform/network/ResourceHandle.cpp (201766 => 201767)
--- trunk/Source/WebCore/platform/network/ResourceHandle.cpp 2016-06-07 19:51:41 UTC (rev 201766)
+++ trunk/Source/WebCore/platform/network/ResourceHandle.cpp 2016-06-07 20:05:36 UTC (rev 201767)
@@ -155,7 +155,7 @@
#if !PLATFORM(COCOA) && !USE(CFNETWORK) && !USE(SOUP)
// ResourceHandle never uses async client calls on these platforms yet.
-void ResourceHandle::continueWillSendRequest(const ResourceRequest&)
+void ResourceHandle::continueWillSendRequest(ResourceRequest&&)
{
notImplemented();
}
Modified: trunk/Source/WebCore/platform/network/curl/MultipartHandle.cpp (201766 => 201767)
--- trunk/Source/WebCore/platform/network/curl/MultipartHandle.cpp 2016-06-07 19:51:41 UTC (rev 201766)
+++ trunk/Source/WebCore/platform/network/curl/MultipartHandle.cpp 2016-06-07 20:05:36 UTC (rev 201767)
@@ -337,19 +337,19 @@
{
ResourceHandleInternal* d = m_resourceHandle->getInternal();
if (d->client()) {
- std::unique_ptr<ResourceResponse> response = ResourceResponseBase::adopt(d->m_response.copyData());
+ auto response = d->m_response;
HTTPHeaderMap::const_iterator end = m_headers.end();
for (HTTPHeaderMap::const_iterator it = m_headers.begin(); it != end; ++it)
- response->setHTTPHeaderField(it->key, it->value);
+ response.setHTTPHeaderField(it->key, it->value);
String contentType = m_headers.get(HTTPHeaderName::ContentType);
String mimeType = extractMIMETypeFromMediaType(contentType);
- response->setMimeType(mimeType.convertToASCIILowercase());
- response->setTextEncodingName(extractCharsetFromMediaType(contentType));
+ response.setMimeType(mimeType.convertToASCIILowercase());
+ response.setTextEncodingName(extractCharsetFromMediaType(contentType));
- d->client()->didReceiveResponse(m_resourceHandle, *response);
+ d->client()->didReceiveResponse(m_resourceHandle, response);
response->setResponseFired(true);
}
}
Modified: trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp (201766 => 201767)
--- trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2016-06-07 19:51:41 UTC (rev 201766)
+++ trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2016-06-07 20:05:36 UTC (rev 201767)
@@ -522,8 +522,9 @@
ResourceRequest redirectedRequest = job->firstRequest();
redirectedRequest.setURL(newURL);
+ ResourceResponse response = d->m_response;
if (client)
- client->willSendRequest(job, redirectedRequest, d->m_response);
+ client->willSendRequest(job, WTFMove(redirectedRequest), WTFMove(response));
d->m_firstRequest.setURL(newURL);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
