Attachment 372857 Details for Bug 199081 – Patch

[patch] Patch

bug-199081-20190625134117.patch (text/plain), 24.21 KB, created by Alex Christensen on 2019-06-25 13:41:18 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2019-06-25 13:41:18 PDT

Size: 24.21 KB

patch

obsolete

>Subversion Revision: 246797
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index a289d0d834657d022d3c86d10e0bece4ce62517f..4bb87f5eca202f1e8473ff4a5e4dbb103e253ffa 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-06-25  Alex Christensen  <achristensen@webkit.org>
>+
>+        Make HTTPCookieAcceptPolicy an enum class
>+        https://bugs.webkit.org/show_bug.cgi?id=199081
>+
>+        Reviewed by Michael Catanzaro
>+
>+        * pal/spi/cf/CFNetworkSPI.h:
>+
> 2019-06-19  Devin Rousso  <drousso@apple.com>
> 
>         Web Inspector: Network: replace CFNetwork SPI with new API where able
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 9dec21a3a33f1768efd77f83e0071cf406c0ff81..eb2f27aab95200f4eaeb6d7f61a271a8a23df754 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,36 @@
>+2019-06-25  Alex Christensen  <achristensen@webkit.org>
>+
>+        Make HTTPCookieAcceptPolicy an enum class
>+        https://bugs.webkit.org/show_bug.cgi?id=199081
>+
>+        Reviewed by Michael Catanzaro.
>+
>+        Doing so reveals some interesting bugs in the C API that are also fixed:
>+        WKPreferencesGetIncrementalRenderingSuppressionTimeout was using its toAPI function to convert a double to a double because HTTPCookieAcceptPolicy used to be an unsigned integer.
>+        toAPI(WebCore::MouseButton) was also using the toAPI(HTTPCookieAcceptPolicy) because HTTPCookieAcceptPolicy used to be an unsigned integer.
>+        Yikes!  Type safety is our friend.
>+
>+        * NetworkProcess/Cookies/WebCookieManager.messages.in:
>+        * NetworkProcess/Cookies/mac/WebCookieManagerMac.mm:
>+        (WebKit::toCFHTTPCookieStorageAcceptPolicy):
>+        (WebKit::WebCookieManager::platformSetHTTPCookieAcceptPolicy):
>+        (WebKit::WebCookieManager::platformGetHTTPCookieAcceptPolicy):
>+        * Shared/API/c/WKSharedAPICast.h:
>+        (WebKit::toAPI):
>+        * Shared/HTTPCookieAcceptPolicy.h:
>+        (): Deleted.
>+        * UIProcess/API/C/WKAPICast.h:
>+        (WebKit::toHTTPCookieAcceptPolicy):
>+        (WebKit::toAPI):
>+        * UIProcess/API/C/WKPreferences.cpp:
>+        (WKPreferencesGetIncrementalRenderingSuppressionTimeout):
>+        * UIProcess/API/Cocoa/WKProcessPool.mm:
>+        (toHTTPCookieAcceptPolicy):
>+        * UIProcess/WebCookieManagerProxy.cpp:
>+        (WebKit::WebCookieManagerProxy::didGetHTTPCookieAcceptPolicy):
>+        * UIProcess/WebCookieManagerProxy.h:
>+        * UIProcess/WebCookieManagerProxy.messages.in:
>+
> 2019-06-25  Youenn Fablet  <youenn@apple.com>
> 
>         Close sockets with too high file descriptor
>diff --git a/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h b/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h
>index 0857d457cea450ba411171aab8ee419799e164aa..38db2c5d476b7eaa674c8e9036f4872d4b259759 100644
>--- a/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h
>+++ b/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h
>@@ -101,6 +101,14 @@ typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef;
> typedef CFIndex CFURLRequestPriority;
> typedef int CFHTTPCookieStorageAcceptPolicy;
> 
>+CF_ENUM(CFHTTPCookieStorageAcceptPolicy)
>+{
>+    CFHTTPCookieStorageAcceptPolicyAlways = 0,
>+    CFHTTPCookieStorageAcceptPolicyNever = 1,
>+    CFHTTPCookieStorageAcceptPolicyOnlyFromMainDocumentDomain = 2,
>+    CFHTTPCookieStorageAcceptPolicyExclusivelyFromMainDocumentDomain = 3,
>+};
>+
> #ifdef __BLOCKS__
> typedef void (^CFCachedURLResponseCallBackBlock)(CFCachedURLResponseRef);
> #endif
>diff --git a/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.messages.in b/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.messages.in
>index 05bf2436181ea9041472f882eef0ed6af7ca1d77..518d11cffe22d6d76257ad8e266bd4bd235d68d3 100644
>--- a/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.messages.in
>+++ b/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.messages.in
>@@ -35,7 +35,7 @@
>     void DeleteCookie(PAL::SessionID sessionID, struct WebCore::Cookie cookie, WebKit::CallbackID callbackID)
>     void DeleteAllCookiesModifiedSince(PAL::SessionID sessionID, WallTime time, WebKit::CallbackID callbackID)
> 
>-    void SetHTTPCookieAcceptPolicy(uint32_t policy, WebKit::OptionalCallbackID callbackID)
>+    void SetHTTPCookieAcceptPolicy(enum:uint8_t WebKit::HTTPCookieAcceptPolicy policy, WebKit::OptionalCallbackID callbackID)
>     void GetHTTPCookieAcceptPolicy(WebKit::CallbackID callbackID)
>     
>     void StartObservingCookieChanges(PAL::SessionID sessionID)
>diff --git a/Source/WebKit/NetworkProcess/Cookies/curl/WebCookieManagerCurl.cpp b/Source/WebKit/NetworkProcess/Cookies/curl/WebCookieManagerCurl.cpp
>index 4a829c26461551a7bd5f2b00326db56c6139e360..80f3b494b55396e8355c8ded48bf68fb9893c59a 100644
>--- a/Source/WebKit/NetworkProcess/Cookies/curl/WebCookieManagerCurl.cpp
>+++ b/Source/WebKit/NetworkProcess/Cookies/curl/WebCookieManagerCurl.cpp
>@@ -37,16 +37,16 @@ void WebCookieManager::platformSetHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy
> {
>     CookieAcceptPolicy curlPolicy = CookieAcceptPolicy::OnlyFromMainDocumentDomain;
>     switch (policy) {
>-    case HTTPCookieAcceptPolicyAlways:
>+    case HTTPCookieAcceptPolicy::AlwaysAccept:
>         curlPolicy = CookieAcceptPolicy::Always;
>         break;
>-    case HTTPCookieAcceptPolicyNever:
>+    case HTTPCookieAcceptPolicy::Never:
>         curlPolicy = CookieAcceptPolicy::Never;
>         break;
>-    case HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain:
>+    case HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain:
>         curlPolicy = CookieAcceptPolicy::OnlyFromMainDocumentDomain;
>         break;
>-    case HTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain:
>+    case HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain:
>         curlPolicy = CookieAcceptPolicy::ExclusivelyFromMainDocumentDomain;
>         break;
>     }
>@@ -61,17 +61,17 @@ HTTPCookieAcceptPolicy WebCookieManager::platformGetHTTPCookieAcceptPolicy()
>     const auto& networkStorageSession = m_process.defaultStorageSession();
>     switch (networkStorageSession.cookieStorage().cookieAcceptPolicy(networkStorageSession)) {
>     case CookieAcceptPolicy::Always:
>-        return HTTPCookieAcceptPolicyAlways;
>+        return HTTPCookieAcceptPolicy::AlwaysAccept;
>     case CookieAcceptPolicy::Never:
>-        return HTTPCookieAcceptPolicyNever;
>+        return HTTPCookieAcceptPolicy::Never;
>     case CookieAcceptPolicy::OnlyFromMainDocumentDomain:
>-        return HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
>+        return HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain;
>     case CookieAcceptPolicy::ExclusivelyFromMainDocumentDomain:
>-        return HTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain;
>+        return HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain;
>     }
> 
>     ASSERT_NOT_REACHED();
>-    return HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
>+    return HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain;
> }
> 
> } // namespace WebKit
>diff --git a/Source/WebKit/NetworkProcess/Cookies/mac/WebCookieManagerMac.mm b/Source/WebKit/NetworkProcess/Cookies/mac/WebCookieManagerMac.mm
>index 7148e71a0eba01bc9bcb8f6d42d8c93f69714e06..ee46ae5dc746cf52dfc85b0236590cd84e6a7c23 100644
>--- a/Source/WebKit/NetworkProcess/Cookies/mac/WebCookieManagerMac.mm
>+++ b/Source/WebKit/NetworkProcess/Cookies/mac/WebCookieManagerMac.mm
>@@ -35,6 +35,23 @@
> namespace WebKit {
> using namespace WebCore;
> 
>+static CFHTTPCookieStorageAcceptPolicy toCFHTTPCookieStorageAcceptPolicy(HTTPCookieAcceptPolicy policy)
>+{
>+    switch (policy) {
>+    case HTTPCookieAcceptPolicy::AlwaysAccept:
>+        return CFHTTPCookieStorageAcceptPolicyAlways;
>+    case HTTPCookieAcceptPolicy::Never:
>+        return CFHTTPCookieStorageAcceptPolicyNever;
>+    case HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain:
>+        return CFHTTPCookieStorageAcceptPolicyOnlyFromMainDocumentDomain;
>+    case HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain:
>+        return CFHTTPCookieStorageAcceptPolicyExclusivelyFromMainDocumentDomain;
>+    }
>+    ASSERT_NOT_REACHED();
>+
>+    return CFHTTPCookieStorageAcceptPolicyAlways;
>+}
>+
> void WebCookieManager::platformSetHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy policy)
> {
>     ASSERT(hasProcessPrivilege(ProcessPrivilege::CanAccessRawCookies));
>@@ -43,7 +60,7 @@ void WebCookieManager::platformSetHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy
> 
>     m_process.forEachNetworkStorageSession([&] (const auto& networkStorageSession) {
>         if (auto cookieStorage = networkStorageSession.cookieStorage())
>-            CFHTTPCookieStorageSetCookieAcceptPolicy(cookieStorage.get(), policy);
>+            CFHTTPCookieStorageSetCookieAcceptPolicy(cookieStorage.get(), toCFHTTPCookieStorageAcceptPolicy(policy));
>     });
> }
> 
>@@ -51,7 +68,19 @@ HTTPCookieAcceptPolicy WebCookieManager::platformGetHTTPCookieAcceptPolicy()
> {
>     ASSERT(hasProcessPrivilege(ProcessPrivilege::CanAccessRawCookies));
> 
>-    return [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookieAcceptPolicy];
>+    switch ([[NSHTTPCookieStorage sharedHTTPCookieStorage] cookieAcceptPolicy]) {
>+    case NSHTTPCookieAcceptPolicyAlways:
>+        return HTTPCookieAcceptPolicy::AlwaysAccept;
>+    case NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain:
>+        return HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain;
>+    case NSHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain:
>+        return HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain;
>+    case NSHTTPCookieAcceptPolicyNever:
>+        return HTTPCookieAcceptPolicy::Never;
>+    }
>+
>+    ASSERT_NOT_REACHED();
>+    return HTTPCookieAcceptPolicy::AlwaysAccept;
> }
> 
> } // namespace WebKit
>diff --git a/Source/WebKit/NetworkProcess/Cookies/soup/WebCookieManagerSoup.cpp b/Source/WebKit/NetworkProcess/Cookies/soup/WebCookieManagerSoup.cpp
>index b85c9ae6ba3ad35787908bb8ef101693926994a8..ab571b63f1a4f125efb576d390a8e15552a2eb7c 100644
>--- a/Source/WebKit/NetworkProcess/Cookies/soup/WebCookieManagerSoup.cpp
>+++ b/Source/WebKit/NetworkProcess/Cookies/soup/WebCookieManagerSoup.cpp
>@@ -41,13 +41,13 @@ void WebCookieManager::platformSetHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy
> {
>     SoupCookieJarAcceptPolicy soupPolicy = SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY;
>     switch (policy) {
>-    case HTTPCookieAcceptPolicyAlways:
>+    case HTTPCookieAcceptPolicy::AlwaysAccept:
>         soupPolicy = SOUP_COOKIE_JAR_ACCEPT_ALWAYS;
>         break;
>-    case HTTPCookieAcceptPolicyNever:
>+    case HTTPCookieAcceptPolicy::Never:
>         soupPolicy = SOUP_COOKIE_JAR_ACCEPT_NEVER;
>         break;
>-    case HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain:
>+    case HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain:
>         soupPolicy = SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY;
>         break;
>     }
>@@ -61,15 +61,15 @@ HTTPCookieAcceptPolicy WebCookieManager::platformGetHTTPCookieAcceptPolicy()
> {
>     switch (soup_cookie_jar_get_accept_policy(m_process.defaultStorageSession().cookieStorage())) {
>     case SOUP_COOKIE_JAR_ACCEPT_ALWAYS:
>-        return HTTPCookieAcceptPolicyAlways;
>+        return HTTPCookieAcceptPolicy::AlwaysAccept;
>     case SOUP_COOKIE_JAR_ACCEPT_NEVER:
>-        return HTTPCookieAcceptPolicyNever;
>+        return HTTPCookieAcceptPolicy::Never;
>     case SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY:
>-        return HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
>+        return HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain;
>     }
> 
>     ASSERT_NOT_REACHED();
>-    return HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
>+    return HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain;
> }
> 
> void WebCookieManager::setCookiePersistentStorage(PAL::SessionID sessionID, const String& storagePath, SoupCookiePersistentStorageType storageType)
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h
>index 1777faeac912028a15eebbd2117f7a3e72a49b95..81b154efd60c438dcbf218d388e05a4e34e4a782 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h
>+++ b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h
>@@ -86,7 +86,7 @@ struct NetworkProcessCreationParameters {
>     WebsiteDataStoreParameters defaultDataStoreParameters;
>     
> #if USE(SOUP)
>-    HTTPCookieAcceptPolicy cookieAcceptPolicy { HTTPCookieAcceptPolicyAlways };
>+    HTTPCookieAcceptPolicy cookieAcceptPolicy { HTTPCookieAcceptPolicy::AlwaysAccept };
>     bool ignoreTLSErrors { false };
>     Vector<String> languages;
>     WebCore::SoupNetworkProxySettings proxySettings;
>diff --git a/Source/WebKit/Shared/API/c/WKSharedAPICast.h b/Source/WebKit/Shared/API/c/WKSharedAPICast.h
>index 0d87e969493719d19a22f5cf49e9b610f1b36f4a..18cceb211b2631adf7adb8a47443ed49e386ef30 100644
>--- a/Source/WebKit/Shared/API/c/WKSharedAPICast.h
>+++ b/Source/WebKit/Shared/API/c/WKSharedAPICast.h
>@@ -55,6 +55,7 @@
> #include <WebCore/FrameLoaderTypes.h>
> #include <WebCore/IntRect.h>
> #include <WebCore/LayoutMilestone.h>
>+#include <WebCore/PlatformMouseEvent.h>
> #include <WebCore/SecurityOrigin.h>
> #include <WebCore/UserContentTypes.h>
> #include <WebCore/UserScriptTypes.h>
>@@ -319,6 +320,28 @@ inline WKEventMouseButton toAPI(WebMouseEvent::Button mouseButton)
>     return wkMouseButton;
> }
> 
>+inline WKEventMouseButton toAPI(WebCore::MouseButton mouseButton)
>+{
>+    WKEventMouseButton wkMouseButton = kWKEventMouseButtonNoButton;
>+
>+    switch (mouseButton) {
>+    case WebCore::MouseButton::NoButton:
>+        wkMouseButton = kWKEventMouseButtonNoButton;
>+        break;
>+    case WebCore::MouseButton::LeftButton:
>+        wkMouseButton = kWKEventMouseButtonLeftButton;
>+        break;
>+    case WebCore::MouseButton::MiddleButton:
>+        wkMouseButton = kWKEventMouseButtonMiddleButton;
>+        break;
>+    case WebCore::MouseButton::RightButton:
>+        wkMouseButton = kWKEventMouseButtonRightButton;
>+        break;
>+    }
>+
>+    return wkMouseButton;
>+}
>+
> inline WKContextMenuItemTag toAPI(WebCore::ContextMenuAction action)
> {
>     switch (action) {
>diff --git a/Source/WebKit/Shared/HTTPCookieAcceptPolicy.h b/Source/WebKit/Shared/HTTPCookieAcceptPolicy.h
>index 4fe81b3c39bcfb247b6ee75ec401510d787f7243..457c2344c9c8986ff6e2323305a28433d86ea0eb 100644
>--- a/Source/WebKit/Shared/HTTPCookieAcceptPolicy.h
>+++ b/Source/WebKit/Shared/HTTPCookieAcceptPolicy.h
>@@ -23,19 +23,29 @@
>  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#ifndef HTTPCookieAcceptPolicy_h
>-#define HTTPCookieAcceptPolicy_h
>+#pragma once
> 
> namespace WebKit {
> 
>-enum {
>-    HTTPCookieAcceptPolicyAlways = 0,
>-    HTTPCookieAcceptPolicyNever = 1,
>-    HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain = 2,
>-    HTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain = 3,
>+enum class HTTPCookieAcceptPolicy : uint8_t {
>+    AlwaysAccept = 0,
>+    Never = 1,
>+    OnlyFromMainDocumentDomain = 2,
>+    ExclusivelyFromMainDocumentDomain = 3,
> };
>-typedef unsigned HTTPCookieAcceptPolicy;
> 
> } // namespace WebKit
> 
>-#endif // HTTPCookieAcceptPolicy_h
>+namespace WTF {
>+
>+template<> struct EnumTraits<WebKit::HTTPCookieAcceptPolicy> {
>+    using values = EnumValues<
>+        WebKit::HTTPCookieAcceptPolicy,
>+        WebKit::HTTPCookieAcceptPolicy::AlwaysAccept,
>+        WebKit::HTTPCookieAcceptPolicy::Never,
>+        WebKit::HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain,
>+        WebKit::HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain
>+    >;
>+};
>+
>+}
>diff --git a/Source/WebKit/UIProcess/API/C/WKAPICast.h b/Source/WebKit/UIProcess/API/C/WKAPICast.h
>index a30d59793b6b4dd5ede330535e7f5b5b41d4f636..c86603ddc94fdde78ff5e7e8c3cf73d5cd93c609 100644
>--- a/Source/WebKit/UIProcess/API/C/WKAPICast.h
>+++ b/Source/WebKit/UIProcess/API/C/WKAPICast.h
>@@ -367,29 +367,29 @@ inline HTTPCookieAcceptPolicy toHTTPCookieAcceptPolicy(WKHTTPCookieAcceptPolicy
> {
>     switch (policy) {
>     case kWKHTTPCookieAcceptPolicyAlways:
>-        return HTTPCookieAcceptPolicyAlways;
>+        return HTTPCookieAcceptPolicy::AlwaysAccept;
>     case kWKHTTPCookieAcceptPolicyNever:
>-        return HTTPCookieAcceptPolicyNever;
>+        return HTTPCookieAcceptPolicy::Never;
>     case kWKHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain:
>-        return HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
>+        return HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain;
>     case kWKHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain:
>-        return HTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain;
>+        return HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain;
>     }
> 
>     ASSERT_NOT_REACHED();
>-    return HTTPCookieAcceptPolicyAlways;
>+    return HTTPCookieAcceptPolicy::AlwaysAccept;
> }
> 
> inline WKHTTPCookieAcceptPolicy toAPI(HTTPCookieAcceptPolicy policy)
> {
>     switch (policy) {
>-    case HTTPCookieAcceptPolicyAlways:
>+    case HTTPCookieAcceptPolicy::AlwaysAccept:
>         return kWKHTTPCookieAcceptPolicyAlways;
>-    case HTTPCookieAcceptPolicyNever:
>+    case HTTPCookieAcceptPolicy::Never:
>         return kWKHTTPCookieAcceptPolicyNever;
>-    case HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain:
>+    case HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain:
>         return kWKHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
>-    case HTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain:
>+    case HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain:
>         return kWKHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain;
>     }
> 
>diff --git a/Source/WebKit/UIProcess/API/C/WKPreferences.cpp b/Source/WebKit/UIProcess/API/C/WKPreferences.cpp
>index 460187abb85f4c2939a6c6030435ea8ea765db41..a031798defbfd860f1aae28b2b2d61ca5e2156b0 100644
>--- a/Source/WebKit/UIProcess/API/C/WKPreferences.cpp
>+++ b/Source/WebKit/UIProcess/API/C/WKPreferences.cpp
>@@ -1307,7 +1307,7 @@ void WKPreferencesSetIncrementalRenderingSuppressionTimeout(WKPreferencesRef pre
> 
> double WKPreferencesGetIncrementalRenderingSuppressionTimeout(WKPreferencesRef preferencesRef)
> {
>-    return toAPI(toImpl(preferencesRef)->incrementalRenderingSuppressionTimeout());
>+    return toImpl(preferencesRef)->incrementalRenderingSuppressionTimeout();
> }
> 
> void WKPreferencesSetThreadedScrollingEnabled(WKPreferencesRef preferencesRef, bool enabled)
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm b/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm
>index b0ac76bef1229d0b3f07fe86f971ab31c60461b9..c06e1afb33ffa318b7e29dfdc4f067957a838bf2 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm
>@@ -207,17 +207,17 @@ static WebKit::HTTPCookieAcceptPolicy toHTTPCookieAcceptPolicy(NSHTTPCookieAccep
> {
>     switch (static_cast<NSUInteger>(policy)) {
>     case NSHTTPCookieAcceptPolicyAlways:
>-        return WebKit::HTTPCookieAcceptPolicyAlways;
>+        return WebKit::HTTPCookieAcceptPolicy::AlwaysAccept;
>     case NSHTTPCookieAcceptPolicyNever:
>-        return WebKit::HTTPCookieAcceptPolicyNever;
>+        return WebKit::HTTPCookieAcceptPolicy::Never;
>     case NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain:
>-        return WebKit::HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
>+        return WebKit::HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain;
>     case NSHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain:
>-        return WebKit::HTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain;
>+        return WebKit::HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain;
>     }
> 
>     ASSERT_NOT_REACHED();
>-    return WebKit::HTTPCookieAcceptPolicyAlways;
>+    return WebKit::HTTPCookieAcceptPolicy::AlwaysAccept;
> }
> 
> - (void)_setCookieAcceptPolicy:(NSHTTPCookieAcceptPolicy)policy
>diff --git a/Source/WebKit/UIProcess/API/glib/WebKitCookieManager.cpp b/Source/WebKit/UIProcess/API/glib/WebKitCookieManager.cpp
>index a1de2c27c3d980b99d97793b95c2c5ff5d538d91..8327ae93084f9d1e7260cfdcf15b5bcf1c1799a0 100644
>--- a/Source/WebKit/UIProcess/API/glib/WebKitCookieManager.cpp
>+++ b/Source/WebKit/UIProcess/API/glib/WebKitCookieManager.cpp
>@@ -90,11 +90,11 @@ static inline SoupCookiePersistentStorageType toSoupCookiePersistentStorageType(
> static inline WebKitCookieAcceptPolicy toWebKitCookieAcceptPolicy(HTTPCookieAcceptPolicy httpPolicy)
> {
>     switch (httpPolicy) {
>-    case HTTPCookieAcceptPolicyAlways:
>+    case HTTPCookieAcceptPolicy::AlwaysAccept:
>         return WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS;
>-    case HTTPCookieAcceptPolicyNever:
>+    case HTTPCookieAcceptPolicy::Never:
>         return WEBKIT_COOKIE_POLICY_ACCEPT_NEVER;
>-    case HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain:
>+    case HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain:
>         return WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY;
>     default:
>         ASSERT_NOT_REACHED();
>@@ -106,14 +106,14 @@ static inline HTTPCookieAcceptPolicy toHTTPCookieAcceptPolicy(WebKitCookieAccept
> {
>     switch (kitPolicy) {
>     case WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS:
>-        return HTTPCookieAcceptPolicyAlways;
>+        return HTTPCookieAcceptPolicy::AlwaysAccept;
>     case WEBKIT_COOKIE_POLICY_ACCEPT_NEVER:
>-        return HTTPCookieAcceptPolicyNever;
>+        return HTTPCookieAcceptPolicy::Never;
>     case WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY:
>-        return HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
>+        return HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain;
>     default:
>         ASSERT_NOT_REACHED();
>-        return HTTPCookieAcceptPolicyAlways;
>+        return HTTPCookieAcceptPolicy::AlwaysAccept;
>     }
> }
> 
>diff --git a/Source/WebKit/UIProcess/WebCookieManagerProxy.cpp b/Source/WebKit/UIProcess/WebCookieManagerProxy.cpp
>index b144b9ecb62ad6381f58ebd481b25d31aa0f5c7b..7432880e9e3360af5adfaaa26de7a7d450c8be65 100644
>--- a/Source/WebKit/UIProcess/WebCookieManagerProxy.cpp
>+++ b/Source/WebKit/UIProcess/WebCookieManagerProxy.cpp
>@@ -258,7 +258,7 @@ void WebCookieManagerProxy::getHTTPCookieAcceptPolicy(PAL::SessionID, Function<v
>     processPool()->sendToNetworkingProcess(Messages::WebCookieManager::GetHTTPCookieAcceptPolicy(callbackID));
> }
> 
>-void WebCookieManagerProxy::didGetHTTPCookieAcceptPolicy(uint32_t policy, WebKit::CallbackID callbackID)
>+void WebCookieManagerProxy::didGetHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy policy, WebKit::CallbackID callbackID)
> {
>     m_callbacks.take<HTTPCookieAcceptPolicyCallback>(callbackID)->performCallbackWithReturnValue(policy);
> }
>diff --git a/Source/WebKit/UIProcess/WebCookieManagerProxy.h b/Source/WebKit/UIProcess/WebCookieManagerProxy.h
>index f73f9d051098dafa9a15b54d8cedc9a08a4ff0b0..673ad6403fb2b7d4dd94e0110bc549525b06a4bc 100644
>--- a/Source/WebKit/UIProcess/WebCookieManagerProxy.h
>+++ b/Source/WebKit/UIProcess/WebCookieManagerProxy.h
>@@ -109,7 +109,7 @@ private:
>     WebCookieManagerProxy(WebProcessPool*);
> 
>     void didGetHostnamesWithCookies(const Vector<String>&, WebKit::CallbackID);
>-    void didGetHTTPCookieAcceptPolicy(uint32_t policy, WebKit::CallbackID);
>+    void didGetHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy, WebKit::CallbackID);
> 
>     void didSetHTTPCookieAcceptPolicy(WebKit::CallbackID);
>     void didSetCookies(WebKit::CallbackID);
>diff --git a/Source/WebKit/UIProcess/WebCookieManagerProxy.messages.in b/Source/WebKit/UIProcess/WebCookieManagerProxy.messages.in
>index 33df495c394cc998e7a8cf118cbe51851c7a8e07..bb6723c34c5bf3d180ad88404357bb1bb7f24be7 100644
>--- a/Source/WebKit/UIProcess/WebCookieManagerProxy.messages.in
>+++ b/Source/WebKit/UIProcess/WebCookieManagerProxy.messages.in
>@@ -22,7 +22,7 @@
> 
> messages -> WebCookieManagerProxy {
>     DidGetHostnamesWithCookies(Vector<String> hostnames, WebKit::CallbackID callbackID);
>-    DidGetHTTPCookieAcceptPolicy(uint32_t policy, WebKit::CallbackID callbackID);
>+    DidGetHTTPCookieAcceptPolicy(enum:uint8_t WebKit::HTTPCookieAcceptPolicy policy, WebKit::CallbackID callbackID);
> 
>     DidSetHTTPCookieAcceptPolicy(WebKit::CallbackID callbackID);
>     DidDeleteCookies(WebKit::CallbackID callbackID);
>diff --git a/Source/WebKit/UIProcess/WebProcessPool.h b/Source/WebKit/UIProcess/WebProcessPool.h
>index 71f20512b2734254fe16e8c490926e7b9d285c0b..57068520efae1bec0fcec43b331d7cb5dcc9ecca 100644
>--- a/Source/WebKit/UIProcess/WebProcessPool.h
>+++ b/Source/WebKit/UIProcess/WebProcessPool.h
>@@ -680,7 +680,7 @@ private:
>     WebContextSupplementMap m_supplements;
> 
> #if USE(SOUP)
>-    HTTPCookieAcceptPolicy m_initialHTTPCookieAcceptPolicy { HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain };
>+    HTTPCookieAcceptPolicy m_initialHTTPCookieAcceptPolicy { HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain };
>     WebCore::SoupNetworkProxySettings m_networkProxySettings;
> #endif
>     HashSet<String, ASCIICaseInsensitiveHash> m_urlSchemesRegisteredForCustomProtocols;

Actions: View | Formatted Diff | Diff

Attachments on bug 199081: 372585 | 372588 | 372590 | 372847 | 372855 | 372857