Title: [207336] trunk/Source/WebCore
- Revision
- 207336
- Author
- [email protected]
- Date
- 2016-10-14 04:47:39 -0700 (Fri, 14 Oct 2016)
Log Message
http://trac.webkit.org/changeset/207330 broke Mac Windows build
https://bugs.webkit.org/show_bug.cgi?id=163442
Unreviewed.
Patch by Youenn Fablet <[email protected]> on 2016-10-14
* platform/network/cf/ResourceRequestCFNet.cpp:
(WebCore::toPlatformRequestCachePolicy): Do not explicitly use CFURLRequestCachePolicy enumeration values.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (207335 => 207336)
--- trunk/Source/WebCore/ChangeLog 2016-10-14 10:23:18 UTC (rev 207335)
+++ trunk/Source/WebCore/ChangeLog 2016-10-14 11:47:39 UTC (rev 207336)
@@ -1,3 +1,13 @@
+2016-10-14 Youenn Fablet <[email protected]>
+
+ http://trac.webkit.org/changeset/207330 broke Mac Windows build
+ https://bugs.webkit.org/show_bug.cgi?id=163442
+
+ Unreviewed.
+
+ * platform/network/cf/ResourceRequestCFNet.cpp:
+ (WebCore::toPlatformRequestCachePolicy): Do not explicitly use CFURLRequestCachePolicy enumeration values.
+
2016-10-14 Zan Dobersek <[email protected]>
[Cairo] GraphicsContext3D::ImageExtractor fails to extract images
Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (207335 => 207336)
--- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2016-10-14 10:23:18 UTC (rev 207335)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2016-10-14 11:47:39 UTC (rev 207336)
@@ -170,18 +170,10 @@
m_cfRequest = adoptCF(cfRequest);
}
+// FIXME: We should use a switch based on ResourceRequestCachePolicy parameter
static inline CFURLRequestCachePolicy toPlatformRequestCachePolicy(ResourceRequestCachePolicy policy)
{
- switch (policy) {
- case UseProtocolCachePolicy:
- return CFURLRequestUseProtocolCachePolicy;
- case ReturnCacheDataElseLoad:
- return CFURLRequestReturnCacheDataElseLoad;
- case ReturnCacheDataDontLoad:
- return CFURLRequestReturnCacheDataDontLoad;
- default:
- return CFURLRequestReloadIgnoringLocalCacheData;
- }
+ return static_cast<CFURLRequestCachePolicy>((policy <= ReturnCacheDataDontLoad) ? policy : ReloadIgnoringCacheData);
}
void ResourceRequest::doUpdatePlatformHTTPBody()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
