Changeset 207336 in webkit

Timestamp:

Oct 14, 2016 4:47:39 AM (8 years ago)

Author:

commit-queue@webkit.org

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 <​youenn@apple.com> on 2016-10-14

• platform/network/cf/ResourceRequestCFNet.cpp:

(WebCore::toPlatformRequestCachePolicy): Do not explicitly use CFURLRequestCachePolicy enumeration values.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-14  Youenn Fablet  <youenn@apple.com>
+
+        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  <zdobersek@igalia.com>
 

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

@@ -171 +171 @@
 }
 
+// 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);
 }