Title: [173329] trunk/Source/WebCore
- Revision
- 173329
- Author
- commit-qu...@webkit.org
- Date
- 2014-09-05 13:05:19 -0700 (Fri, 05 Sep 2014)
Log Message
[Curl] Compile error.
https://bugs.webkit.org/show_bug.cgi?id=136574
Patch by pe...@outlook.com <pe...@outlook.com> on 2014-09-05
Reviewed by Alex Christensen.
The ResourceResponse::setSuggestedFilename method is no longer available.
* platform/network/curl/CurlCacheEntry.cpp:
(WebCore::CurlCacheEntry::setResponseFromCachedHeaders):
* platform/network/curl/CurlDownload.cpp:
(WebCore::CurlDownload::didReceiveHeader):
* platform/network/curl/MultipartHandle.cpp:
(WebCore::MultipartHandle::didReceiveResponse):
* platform/network/curl/ResourceHandleManager.cpp:
(WebCore::headerCallback):
* platform/network/curl/ResourceResponse.h:
(WebCore::ResourceResponse::platformSuggestedFilename):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (173328 => 173329)
--- trunk/Source/WebCore/ChangeLog 2014-09-05 20:04:39 UTC (rev 173328)
+++ trunk/Source/WebCore/ChangeLog 2014-09-05 20:05:19 UTC (rev 173329)
@@ -1,3 +1,23 @@
+2014-09-05 pe...@outlook.com <pe...@outlook.com>
+
+ [Curl] Compile error.
+ https://bugs.webkit.org/show_bug.cgi?id=136574
+
+ Reviewed by Alex Christensen.
+
+ The ResourceResponse::setSuggestedFilename method is no longer available.
+
+ * platform/network/curl/CurlCacheEntry.cpp:
+ (WebCore::CurlCacheEntry::setResponseFromCachedHeaders):
+ * platform/network/curl/CurlDownload.cpp:
+ (WebCore::CurlDownload::didReceiveHeader):
+ * platform/network/curl/MultipartHandle.cpp:
+ (WebCore::MultipartHandle::didReceiveResponse):
+ * platform/network/curl/ResourceHandleManager.cpp:
+ (WebCore::headerCallback):
+ * platform/network/curl/ResourceResponse.h:
+ (WebCore::ResourceResponse::platformSuggestedFilename):
+
2014-09-05 Benjamin Poulain <benja...@webkit.org>
Update the current matching of :read-only and :read-write to the latest spec
Modified: trunk/Source/WebCore/platform/network/curl/CurlCacheEntry.cpp (173328 => 173329)
--- trunk/Source/WebCore/platform/network/curl/CurlCacheEntry.cpp 2014-09-05 20:04:39 UTC (rev 173328)
+++ trunk/Source/WebCore/platform/network/curl/CurlCacheEntry.cpp 2014-09-05 20:05:19 UTC (rev 173329)
@@ -194,7 +194,6 @@
response.setMimeType(extractMIMETypeFromMediaType(response.httpHeaderField(HTTPHeaderName::ContentType)));
response.setTextEncodingName(extractCharsetFromMediaType(response.httpHeaderField(HTTPHeaderName::ContentType)));
- response.setSuggestedFilename(filenameFromHTTPContentDisposition(response.httpHeaderField(HTTPHeaderName::ContentDisposition)));
}
void CurlCacheEntry::didFail()
Modified: trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp (173328 => 173329)
--- trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp 2014-09-05 20:04:39 UTC (rev 173328)
+++ trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp 2014-09-05 20:05:19 UTC (rev 173329)
@@ -399,7 +399,6 @@
m_response.setMimeType(extractMIMETypeFromMediaType(m_response.httpHeaderField(HTTPHeaderName::ContentType)));
m_response.setTextEncodingName(extractCharsetFromMediaType(m_response.httpHeaderField(HTTPHeaderName::ContentType)));
- m_response.setSuggestedFilename(filenameFromHTTPContentDisposition(m_response.httpHeaderField(HTTPHeaderName::ContentDisposition)));
callOnMainThread(MainThreadTask(receivedResponseCallback, this));
}
Modified: trunk/Source/WebCore/platform/network/curl/MultipartHandle.cpp (173328 => 173329)
--- trunk/Source/WebCore/platform/network/curl/MultipartHandle.cpp 2014-09-05 20:04:39 UTC (rev 173328)
+++ trunk/Source/WebCore/platform/network/curl/MultipartHandle.cpp 2014-09-05 20:05:19 UTC (rev 173329)
@@ -353,7 +353,6 @@
response->setMimeType(mimeType.lower());
response->setTextEncodingName(extractCharsetFromMediaType(contentType));
- response->setSuggestedFilename(filenameFromHTTPContentDisposition(response->httpHeaderField(HTTPHeaderName::ContentDisposition)));
d->client()->didReceiveResponse(m_resourceHandle, *response);
response->setResponseFired(true);
Modified: trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp (173328 => 173329)
--- trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2014-09-05 20:04:39 UTC (rev 173328)
+++ trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2014-09-05 20:05:19 UTC (rev 173329)
@@ -505,7 +505,6 @@
d->m_response.setHTTPStatusCode(httpCode);
d->m_response.setMimeType(extractMIMETypeFromMediaType(d->m_response.httpHeaderField(HTTPHeaderName::ContentType)).lower());
d->m_response.setTextEncodingName(extractCharsetFromMediaType(d->m_response.httpHeaderField(HTTPHeaderName::ContentType)));
- d->m_response.setSuggestedFilename(filenameFromHTTPContentDisposition(d->m_response.httpHeaderField(HTTPHeaderName::ContentDisposition)));
if (d->m_response.isMultipart()) {
String boundary;
Modified: trunk/Source/WebCore/platform/network/curl/ResourceResponse.h (173328 => 173329)
--- trunk/Source/WebCore/platform/network/curl/ResourceResponse.h 2014-09-05 20:04:39 UTC (rev 173328)
+++ trunk/Source/WebCore/platform/network/curl/ResourceResponse.h 2014-09-05 20:05:19 UTC (rev 173329)
@@ -26,6 +26,9 @@
#ifndef ResourceResponse_h
#define ResourceResponse_h
+#include "HTTPHeaderNames.h"
+#include "HTTPParsers.h"
+
#include "ResourceResponseBase.h"
typedef struct _CFURLResponse* CFURLResponseRef;
@@ -58,7 +61,10 @@
PassOwnPtr<CrossThreadResourceResponseData> doPlatformCopyData(PassOwnPtr<CrossThreadResourceResponseData> data) const { return data; }
void doPlatformAdopt(PassOwnPtr<CrossThreadResourceResponseData>) { }
- String platformSuggestedFilename() const { return String(); }
+ String platformSuggestedFilename() const
+ {
+ return filenameFromHTTPContentDisposition(httpHeaderField(HTTPHeaderName::ContentDisposition));
+ }
bool m_responseFired;
};
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
