Changeset 162219 in webkit

Timestamp:

Jan 17, 2014 1:24:21 PM (10 years ago)

Author:

ap@apple.com

Message:

More iOS build fix.

• WebView/WebPreferences.mm: (-[WebPreferences _synchronizeWebStoragePolicyWithCookiePolicy]):

NSHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain is not part of NSHTTPCookieAcceptPolicy enum.

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebPreferences.mm (modified) (2 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2014-01-17  Alexey Proskuryakov  <ap@apple.com>
+
+        More iOS build fix.
+
+        * WebView/WebPreferences.mm: (-[WebPreferences _synchronizeWebStoragePolicyWithCookiePolicy]):
+        NSHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain is not part of NSHTTPCookieAcceptPolicy enum.
+
 2014-01-16  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebPreferences.mm

@@ -2321 +2321 @@
     NSHTTPCookieAcceptPolicy cookieAcceptPolicy = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookieAcceptPolicy];
     WebStorageBlockingPolicy storageBlockingPolicy;
-    switch (cookieAcceptPolicy) {
+    switch (static_cast<unsigned>(cookieAcceptPolicy)) {
     case NSHTTPCookieAcceptPolicyAlways:
         storageBlockingPolicy = WebAllowAllStorage;
@@ -2332 +2332 @@
         storageBlockingPolicy = WebBlockAllStorage;
         break;
+    default:
+        ASSERT_NOT_REACHED();
+        storageBlockingPolicy = WebBlockAllStorage;
+        break;
     }