Changeset 227077 in webkit

Timestamp:

Jan 17, 2018 11:35:21 AM (6 years ago)

Author:

pvollan@apple.com

Message:

[Win] Use switch when converting from ResourceRequestCachePolicy to platform cache policy.
​https://bugs.webkit.org/show_bug.cgi?id=181686

Reviewed by Alex Christensen.

No new tests, covered by existing tests.

A switch will make the function easier on the eyes. Also, use the function in places where the ResourceRequestCachePolicy
is just casted to a platform cache policy.

• platform/network/cf/ResourceRequestCFNet.cpp:

(WebCore::toPlatformRequestCachePolicy):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/cf/ResourceRequestCFNet.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-01-17  Per Arne Vollan  <pvollan@apple.com>
+
+        [Win] Use switch when converting from ResourceRequestCachePolicy to platform cache policy.
+        https://bugs.webkit.org/show_bug.cgi?id=181686
+
+        Reviewed by Alex Christensen.
+
+        No new tests, covered by existing tests.
+
+        A switch will make the function easier on the eyes. Also, use the function in places where the ResourceRequestCachePolicy
+        is just casted to a platform cache policy.
+
+        * platform/network/cf/ResourceRequestCFNet.cpp:
+        (WebCore::toPlatformRequestCachePolicy):
+
 2018-01-17  John Wilander  <wilander@apple.com>
 

trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp

@@ -133 +133 @@
 }
 
+static inline CFURLRequestCachePolicy toPlatformRequestCachePolicy(ResourceRequestCachePolicy policy)
+{
+    switch (policy) {
+    case UseProtocolCachePolicy:
+        return kCFURLRequestCachePolicyProtocolDefault;
+    case ReturnCacheDataElseLoad:
+        return kCFURLRequestCachePolicyReturnCacheDataElseLoad;
+    case ReturnCacheDataDontLoad:
+        return kCFURLRequestCachePolicyReturnCacheDataDontLoad;
+    case ReloadIgnoringCacheData:
+    case DoNotUseAnyCache:
+    case RefreshAnyCacheData:
+        return kCFURLRequestCachePolicyReloadIgnoringCache;
+    }
+
+    ASSERT_NOT_REACHED();
+    return kCFURLRequestCachePolicyReloadIgnoringCache;
+}
+
 void ResourceRequest::doUpdatePlatformRequest()
-{
-    CFMutableURLRequestRef cfRequest;
-
-    RetainPtr<CFURLRef> url = ResourceRequest::url().createCFURL();
-    RetainPtr<CFURLRef> firstPartyForCookies = ResourceRequest::firstPartyForCookies().createCFURL();
-    double timeoutInterval = ResourceRequestBase::timeoutInterval() ? ResourceRequestBase::timeoutInterval() : ResourceRequestBase::defaultTimeoutInterval();
-    if (m_cfRequest) {
-        cfRequest = CFURLRequestCreateMutableCopy(0, m_cfRequest.get());
-        CFURLRequestSetURL(cfRequest, url.get());
-        CFURLRequestSetMainDocumentURL(cfRequest, firstPartyForCookies.get());
-        CFURLRequestSetCachePolicy(cfRequest, (CFURLRequestCachePolicy)cachePolicy());
-        CFURLRequestSetTimeoutInterval(cfRequest, timeoutInterval);
-    } else
-        cfRequest = CFURLRequestCreateMutable(0, url.get(), (CFURLRequestCachePolicy)cachePolicy(), timeoutInterval, firstPartyForCookies.get());
-
-    CFURLRequestSetHTTPRequestMethod(cfRequest, httpMethod().createCFString().get());
-
-    if (httpPipeliningEnabled())
-        CFURLRequestSetShouldPipelineHTTP(cfRequest, true, true);
-
-    if (resourcePrioritiesEnabled())
-        CFURLRequestSetRequestPriority(cfRequest, toPlatformRequestPriority(priority()));
-
-#if !PLATFORM(WIN)
-    _CFURLRequestSetProtocolProperty(cfRequest, kCFURLRequestAllowAllPOSTCaching, kCFBooleanTrue);
-#endif
-
-    setHeaderFields(cfRequest, httpHeaderFields());
-
-    CFURLRequestSetShouldHandleHTTPCookies(cfRequest, allowCookies());
-
-    unsigned fallbackCount = m_responseContentDispositionEncodingFallbackArray.size();
-    RetainPtr<CFMutableArrayRef> encodingFallbacks = adoptCF(CFArrayCreateMutable(kCFAllocatorDefault, fallbackCount, 0));
-    for (unsigned i = 0; i != fallbackCount; ++i) {
-        RetainPtr<CFStringRef> encodingName = m_responseContentDispositionEncodingFallbackArray[i].createCFString();
-        CFStringEncoding encoding = CFStringConvertIANACharSetNameToEncoding(encodingName.get());
-        if (encoding != kCFStringEncodingInvalidId)
-            CFArrayAppendValue(encodingFallbacks.get(), reinterpret_cast<const void*>(encoding));
-    }
-    setContentDispositionEncodingFallbackArray(cfRequest, encodingFallbacks.get());
-
-#if ENABLE(CACHE_PARTITIONING)
-    String partition = cachePartition();
-    if (!partition.isNull() && !partition.isEmpty()) {
-        CString utf8String = partition.utf8();
-        RetainPtr<CFStringRef> partitionValue = adoptCF(CFStringCreateWithBytes(0, reinterpret_cast<const UInt8*>(utf8String.data()), utf8String.length(), kCFStringEncodingUTF8, false));
-        _CFURLRequestSetProtocolProperty(cfRequest, _kCFURLCachePartitionKey, partitionValue.get());
-    }
-#endif
-
-    m_cfRequest = adoptCF(cfRequest);
-#if PLATFORM(COCOA)
-    clearOrUpdateNSURLRequest();
-#endif
-}
-
-// FIXME: We should use a switch based on ResourceRequestCachePolicy parameter
-static inline CFURLRequestCachePolicy toPlatformRequestCachePolicy(ResourceRequestCachePolicy policy)
-{
-    return static_cast<CFURLRequestCachePolicy>((policy <= ReturnCacheDataDontLoad) ? policy : ReloadIgnoringCacheData);
-}
-
-void ResourceRequest::doUpdatePlatformHTTPBody()
 {
     CFMutableURLRequestRef cfRequest;
@@ -210 +166 @@
         CFURLRequestSetTimeoutInterval(cfRequest, timeoutInterval);
     } else
-        cfRequest = CFURLRequestCreateMutable(0, url.get(), (CFURLRequestCachePolicy)cachePolicy(), timeoutInterval, firstPartyForCookies.get());
+        cfRequest = CFURLRequestCreateMutable(0, url.get(), toPlatformRequestCachePolicy(cachePolicy()), timeoutInterval, firstPartyForCookies.get());
+
+    CFURLRequestSetHTTPRequestMethod(cfRequest, httpMethod().createCFString().get());
+
+    if (httpPipeliningEnabled())
+        CFURLRequestSetShouldPipelineHTTP(cfRequest, true, true);
+
+    if (resourcePrioritiesEnabled())
+        CFURLRequestSetRequestPriority(cfRequest, toPlatformRequestPriority(priority()));
+
+#if !PLATFORM(WIN)
+    _CFURLRequestSetProtocolProperty(cfRequest, kCFURLRequestAllowAllPOSTCaching, kCFBooleanTrue);
+#endif
+
+    setHeaderFields(cfRequest, httpHeaderFields());
+
+    CFURLRequestSetShouldHandleHTTPCookies(cfRequest, allowCookies());
+
+    unsigned fallbackCount = m_responseContentDispositionEncodingFallbackArray.size();
+    RetainPtr<CFMutableArrayRef> encodingFallbacks = adoptCF(CFArrayCreateMutable(kCFAllocatorDefault, fallbackCount, 0));
+    for (unsigned i = 0; i != fallbackCount; ++i) {
+        RetainPtr<CFStringRef> encodingName = m_responseContentDispositionEncodingFallbackArray[i].createCFString();
+        CFStringEncoding encoding = CFStringConvertIANACharSetNameToEncoding(encodingName.get());
+        if (encoding != kCFStringEncodingInvalidId)
+            CFArrayAppendValue(encodingFallbacks.get(), reinterpret_cast<const void*>(encoding));
+    }
+    setContentDispositionEncodingFallbackArray(cfRequest, encodingFallbacks.get());
+
+#if ENABLE(CACHE_PARTITIONING)
+    String partition = cachePartition();
+    if (!partition.isNull() && !partition.isEmpty()) {
+        CString utf8String = partition.utf8();
+        RetainPtr<CFStringRef> partitionValue = adoptCF(CFStringCreateWithBytes(0, reinterpret_cast<const UInt8*>(utf8String.data()), utf8String.length(), kCFStringEncodingUTF8, false));
+        _CFURLRequestSetProtocolProperty(cfRequest, _kCFURLCachePartitionKey, partitionValue.get());
+    }
+#endif
+
+    m_cfRequest = adoptCF(cfRequest);
+#if PLATFORM(COCOA)
+    clearOrUpdateNSURLRequest();
+#endif
+}
+
+void ResourceRequest::doUpdatePlatformHTTPBody()
+{
+    CFMutableURLRequestRef cfRequest;
+
+    RetainPtr<CFURLRef> url = ResourceRequest::url().createCFURL();
+    RetainPtr<CFURLRef> firstPartyForCookies = ResourceRequest::firstPartyForCookies().createCFURL();
+    double timeoutInterval = ResourceRequestBase::timeoutInterval() ? ResourceRequestBase::timeoutInterval() : ResourceRequestBase::defaultTimeoutInterval();
+    if (m_cfRequest) {
+        cfRequest = CFURLRequestCreateMutableCopy(0, m_cfRequest.get());
+        CFURLRequestSetURL(cfRequest, url.get());
+        CFURLRequestSetMainDocumentURL(cfRequest, firstPartyForCookies.get());
+        CFURLRequestSetCachePolicy(cfRequest, toPlatformRequestCachePolicy(cachePolicy()));
+        CFURLRequestSetTimeoutInterval(cfRequest, timeoutInterval);
+    } else
+        cfRequest = CFURLRequestCreateMutable(0, url.get(), toPlatformRequestCachePolicy(cachePolicy()), timeoutInterval, firstPartyForCookies.get());
 
     FormData* formData = httpBody();