Changeset 246807 in webkit


Ignore:
Timestamp:
Jun 25, 2019 2:08:23 PM (5 years ago)
Author:
commit-queue@webkit.org
Message:

Make HTTPCookieAcceptPolicy an enum class
​https://bugs.webkit.org/show_bug.cgi?id=199081

Patch by Alex Christensen <​achristensen@webkit.org> on 2019-06-25
Source/WebCore/PAL:

Reviewed by Michael Catanzaro

  • pal/spi/cf/CFNetworkSPI.h:

Source/WebKit:

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:
Location:
trunk/Source
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/PAL/ChangeLog

    r246616 r246807  
     12019-06-25  Alex Christensen  <achristensen@webkit.org>
     2
     3        Make HTTPCookieAcceptPolicy an enum class
     4        https://bugs.webkit.org/show_bug.cgi?id=199081
     5
     6        Reviewed by Michael Catanzaro
     7
     8        * pal/spi/cf/CFNetworkSPI.h:
     9
    1102019-06-19  Devin Rousso  <drousso@apple.com>
    211

  • trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h

    r246616 r246807  
    101101typedef CFIndex CFURLRequestPriority;
    102102typedef int CFHTTPCookieStorageAcceptPolicy;
     103
     104CF_ENUM(CFHTTPCookieStorageAcceptPolicy)
     105{
     106    CFHTTPCookieStorageAcceptPolicyAlways = 0,
     107    CFHTTPCookieStorageAcceptPolicyNever = 1,
     108    CFHTTPCookieStorageAcceptPolicyOnlyFromMainDocumentDomain = 2,
     109    CFHTTPCookieStorageAcceptPolicyExclusivelyFromMainDocumentDomain = 3,
     110};
    103111
    104112#ifdef __BLOCKS__

  • trunk/Source/WebKit/ChangeLog

    r246805 r246807  
     12019-06-25  Alex Christensen  <achristensen@webkit.org>
     2
     3        Make HTTPCookieAcceptPolicy an enum class
     4        https://bugs.webkit.org/show_bug.cgi?id=199081
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        Doing so reveals some interesting bugs in the C API that are also fixed:
     9        WKPreferencesGetIncrementalRenderingSuppressionTimeout was using its toAPI function to convert a double to a double because HTTPCookieAcceptPolicy used to be an unsigned integer.
     10        toAPI(WebCore::MouseButton) was also using the toAPI(HTTPCookieAcceptPolicy) because HTTPCookieAcceptPolicy used to be an unsigned integer.
     11        Yikes!  Type safety is our friend.
     12
     13        * NetworkProcess/Cookies/WebCookieManager.messages.in:
     14        * NetworkProcess/Cookies/mac/WebCookieManagerMac.mm:
     15        (WebKit::toCFHTTPCookieStorageAcceptPolicy):
     16        (WebKit::WebCookieManager::platformSetHTTPCookieAcceptPolicy):
     17        (WebKit::WebCookieManager::platformGetHTTPCookieAcceptPolicy):
     18        * Shared/API/c/WKSharedAPICast.h:
     19        (WebKit::toAPI):
     20        * Shared/HTTPCookieAcceptPolicy.h:
     21        (): Deleted.
     22        * UIProcess/API/C/WKAPICast.h:
     23        (WebKit::toHTTPCookieAcceptPolicy):
     24        (WebKit::toAPI):
     25        * UIProcess/API/C/WKPreferences.cpp:
     26        (WKPreferencesGetIncrementalRenderingSuppressionTimeout):
     27        * UIProcess/API/Cocoa/WKProcessPool.mm:
     28        (toHTTPCookieAcceptPolicy):
     29        * UIProcess/WebCookieManagerProxy.cpp:
     30        (WebKit::WebCookieManagerProxy::didGetHTTPCookieAcceptPolicy):
     31        * UIProcess/WebCookieManagerProxy.h:
     32        * UIProcess/WebCookieManagerProxy.messages.in:
     33
    1342019-06-25  Tim Horton  <timothy_horton@apple.com>
    235

  • trunk/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.messages.in

    r244924 r246807  
    3636    void DeleteAllCookiesModifiedSince(PAL::SessionID sessionID, WallTime time, WebKit::CallbackID callbackID)
    3737
    38     void SetHTTPCookieAcceptPolicy(uint32_t policy, WebKit::OptionalCallbackID callbackID)
     38    void SetHTTPCookieAcceptPolicy(enum:uint8_t WebKit::HTTPCookieAcceptPolicy policy, WebKit::OptionalCallbackID callbackID)
    3939    void GetHTTPCookieAcceptPolicy(WebKit::CallbackID callbackID)
    4040   

  • trunk/Source/WebKit/NetworkProcess/Cookies/curl/WebCookieManagerCurl.cpp

    r242517 r246807  
    3838    CookieAcceptPolicy curlPolicy = CookieAcceptPolicy::OnlyFromMainDocumentDomain;
    3939    switch (policy) {
    40     case HTTPCookieAcceptPolicyAlways:
     40    case HTTPCookieAcceptPolicy::AlwaysAccept:
    4141        curlPolicy = CookieAcceptPolicy::Always;
    4242        break;
    43     case HTTPCookieAcceptPolicyNever:
     43    case HTTPCookieAcceptPolicy::Never:
    4444        curlPolicy = CookieAcceptPolicy::Never;
    4545        break;
    46     case HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain:
     46    case HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain:
    4747        curlPolicy = CookieAcceptPolicy::OnlyFromMainDocumentDomain;
    4848        break;
    49     case HTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain:
     49    case HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain:
    5050        curlPolicy = CookieAcceptPolicy::ExclusivelyFromMainDocumentDomain;
    5151        break;
    … …  
    6262    switch (networkStorageSession.cookieStorage().cookieAcceptPolicy(networkStorageSession)) {
    6363    case CookieAcceptPolicy::Always:
    64         return HTTPCookieAcceptPolicyAlways;
     64        return HTTPCookieAcceptPolicy::AlwaysAccept;
    6565    case CookieAcceptPolicy::Never:
    66         return HTTPCookieAcceptPolicyNever;
     66        return HTTPCookieAcceptPolicy::Never;
    6767    case CookieAcceptPolicy::OnlyFromMainDocumentDomain:
    68         return HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
     68        return HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain;
    6969    case CookieAcceptPolicy::ExclusivelyFromMainDocumentDomain:
    70         return HTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain;
     70        return HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain;
    7171    }
    7272
    7373    ASSERT_NOT_REACHED();
    74     return HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
     74    return HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain;
    7575}
    7676

  • trunk/Source/WebKit/NetworkProcess/Cookies/mac/WebCookieManagerMac.mm

    r240292 r246807  
    3636using namespace WebCore;
    3737
     38static CFHTTPCookieStorageAcceptPolicy toCFHTTPCookieStorageAcceptPolicy(HTTPCookieAcceptPolicy policy)
     39{
     40    switch (policy) {
     41    case HTTPCookieAcceptPolicy::AlwaysAccept:
     42        return CFHTTPCookieStorageAcceptPolicyAlways;
     43    case HTTPCookieAcceptPolicy::Never:
     44        return CFHTTPCookieStorageAcceptPolicyNever;
     45    case HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain:
     46        return CFHTTPCookieStorageAcceptPolicyOnlyFromMainDocumentDomain;
     47    case HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain:
     48        return CFHTTPCookieStorageAcceptPolicyExclusivelyFromMainDocumentDomain;
     49    }
     50    ASSERT_NOT_REACHED();
     51
     52    return CFHTTPCookieStorageAcceptPolicyAlways;
     53}
     54
    3855void WebCookieManager::platformSetHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy policy)
    3956{
    … …  
    4461    m_process.forEachNetworkStorageSession([&] (const auto& networkStorageSession) {
    4562        if (auto cookieStorage = networkStorageSession.cookieStorage())
    46             CFHTTPCookieStorageSetCookieAcceptPolicy(cookieStorage.get(), policy);
     63            CFHTTPCookieStorageSetCookieAcceptPolicy(cookieStorage.get(), toCFHTTPCookieStorageAcceptPolicy(policy));
    4764    });
    4865}
    … …  
    5269    ASSERT(hasProcessPrivilege(ProcessPrivilege::CanAccessRawCookies));
    5370
    54     return [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookieAcceptPolicy];
     71    switch ([[NSHTTPCookieStorage sharedHTTPCookieStorage] cookieAcceptPolicy]) {
     72    case NSHTTPCookieAcceptPolicyAlways:
     73        return HTTPCookieAcceptPolicy::AlwaysAccept;
     74    case NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain:
     75        return HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain;
     76    case NSHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain:
     77        return HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain;
     78    case NSHTTPCookieAcceptPolicyNever:
     79        return HTTPCookieAcceptPolicy::Never;
     80    }
     81
     82    ASSERT_NOT_REACHED();
     83    return HTTPCookieAcceptPolicy::AlwaysAccept;
    5584}
    5685

  • trunk/Source/WebKit/NetworkProcess/Cookies/soup/WebCookieManagerSoup.cpp

    r240858 r246807  
    4242    SoupCookieJarAcceptPolicy soupPolicy = SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY;
    4343    switch (policy) {
    44     case HTTPCookieAcceptPolicyAlways:
     44    case HTTPCookieAcceptPolicy::AlwaysAccept:
    4545        soupPolicy = SOUP_COOKIE_JAR_ACCEPT_ALWAYS;
    4646        break;
    47     case HTTPCookieAcceptPolicyNever:
     47    case HTTPCookieAcceptPolicy::Never:
    4848        soupPolicy = SOUP_COOKIE_JAR_ACCEPT_NEVER;
    4949        break;
    50     case HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain:
     50    case HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain:
    5151        soupPolicy = SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY;
    5252        break;
    … …  
    6262    switch (soup_cookie_jar_get_accept_policy(m_process.defaultStorageSession().cookieStorage())) {
    6363    case SOUP_COOKIE_JAR_ACCEPT_ALWAYS:
    64         return HTTPCookieAcceptPolicyAlways;
     64        return HTTPCookieAcceptPolicy::AlwaysAccept;
    6565    case SOUP_COOKIE_JAR_ACCEPT_NEVER:
    66         return HTTPCookieAcceptPolicyNever;
     66        return HTTPCookieAcceptPolicy::Never;
    6767    case SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY:
    68         return HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
     68        return HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain;
    6969    }
    7070
    7171    ASSERT_NOT_REACHED();
    72     return HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
     72    return HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain;
    7373}
    7474

  • trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h

    r246763 r246807  
    8787   
    8888#if USE(SOUP)
    89     HTTPCookieAcceptPolicy cookieAcceptPolicy { HTTPCookieAcceptPolicyAlways };
     89    HTTPCookieAcceptPolicy cookieAcceptPolicy { HTTPCookieAcceptPolicy::AlwaysAccept };
    9090    bool ignoreTLSErrors { false };
    9191    Vector<String> languages;

  • trunk/Source/WebKit/Shared/API/c/WKSharedAPICast.h

    r241000 r246807  
    5656#include <WebCore/IntRect.h>
    5757#include <WebCore/LayoutMilestone.h>
     58#include <WebCore/PlatformMouseEvent.h>
    5859#include <WebCore/SecurityOrigin.h>
    5960#include <WebCore/UserContentTypes.h>
    … …  
    313314        break;
    314315    case WebMouseEvent::RightButton:
     316        wkMouseButton = kWKEventMouseButtonRightButton;
     317        break;
     318    }
     319
     320    return wkMouseButton;
     321}
     322
     323inline WKEventMouseButton toAPI(WebCore::MouseButton mouseButton)
     324{
     325    WKEventMouseButton wkMouseButton = kWKEventMouseButtonNoButton;
     326
     327    switch (mouseButton) {
     328    case WebCore::MouseButton::NoButton:
     329        wkMouseButton = kWKEventMouseButtonNoButton;
     330        break;
     331    case WebCore::MouseButton::LeftButton:
     332        wkMouseButton = kWKEventMouseButtonLeftButton;
     333        break;
     334    case WebCore::MouseButton::MiddleButton:
     335        wkMouseButton = kWKEventMouseButtonMiddleButton;
     336        break;
     337    case WebCore::MouseButton::RightButton:
    315338        wkMouseButton = kWKEventMouseButtonRightButton;
    316339        break;

  • trunk/Source/WebKit/Shared/HTTPCookieAcceptPolicy.h

    r162166 r246807  
    2424 */
    2525
    26 #ifndef HTTPCookieAcceptPolicy_h
    27 #define HTTPCookieAcceptPolicy_h
     26#pragma once
    2827
    2928namespace WebKit {
    3029
    31 enum {
    32     HTTPCookieAcceptPolicyAlways = 0,
    33     HTTPCookieAcceptPolicyNever = 1,
    34     HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain = 2,
    35     HTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain = 3,
     30enum class HTTPCookieAcceptPolicy : uint8_t {
     31    AlwaysAccept = 0,
     32    Never = 1,
     33    OnlyFromMainDocumentDomain = 2,
     34    ExclusivelyFromMainDocumentDomain = 3,
    3635};
    37 typedef unsigned HTTPCookieAcceptPolicy;
    3836
    3937} // namespace WebKit
    4038
    41 #endif // HTTPCookieAcceptPolicy_h
     39namespace WTF {
     40
     41template<> struct EnumTraits<WebKit::HTTPCookieAcceptPolicy> {
     42    using values = EnumValues<
     43        WebKit::HTTPCookieAcceptPolicy,
     44        WebKit::HTTPCookieAcceptPolicy::AlwaysAccept,
     45        WebKit::HTTPCookieAcceptPolicy::Never,
     46        WebKit::HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain,
     47        WebKit::HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain
     48    >;
     49};
     50
     51}

  • trunk/Source/WebKit/UIProcess/API/C/WKAPICast.h

    r239671 r246807  
    368368    switch (policy) {
    369369    case kWKHTTPCookieAcceptPolicyAlways:
    370         return HTTPCookieAcceptPolicyAlways;
     370        return HTTPCookieAcceptPolicy::AlwaysAccept;
    371371    case kWKHTTPCookieAcceptPolicyNever:
    372         return HTTPCookieAcceptPolicyNever;
     372        return HTTPCookieAcceptPolicy::Never;
    373373    case kWKHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain:
    374         return HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
     374        return HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain;
    375375    case kWKHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain:
    376         return HTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain;
    377     }
    378 
    379     ASSERT_NOT_REACHED();
    380     return HTTPCookieAcceptPolicyAlways;
     376        return HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain;
     377    }
     378
     379    ASSERT_NOT_REACHED();
     380    return HTTPCookieAcceptPolicy::AlwaysAccept;
    381381}
    382382
    … …  
    384384{
    385385    switch (policy) {
    386     case HTTPCookieAcceptPolicyAlways:
     386    case HTTPCookieAcceptPolicy::AlwaysAccept:
    387387        return kWKHTTPCookieAcceptPolicyAlways;
    388     case HTTPCookieAcceptPolicyNever:
     388    case HTTPCookieAcceptPolicy::Never:
    389389        return kWKHTTPCookieAcceptPolicyNever;
    390     case HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain:
     390    case HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain:
    391391        return kWKHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
    392     case HTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain:
     392    case HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain:
    393393        return kWKHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain;
    394394    }

  • trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp

    r246444 r246807  
    13081308double WKPreferencesGetIncrementalRenderingSuppressionTimeout(WKPreferencesRef preferencesRef)
    13091309{
    1310     return toAPI(toImpl(preferencesRef)->incrementalRenderingSuppressionTimeout());
     1310    return toImpl(preferencesRef)->incrementalRenderingSuppressionTimeout();
    13111311}
    13121312

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm

    r245979 r246807  
    208208    switch (static_cast<NSUInteger>(policy)) {
    209209    case NSHTTPCookieAcceptPolicyAlways:
    210         return WebKit::HTTPCookieAcceptPolicyAlways;
     210        return WebKit::HTTPCookieAcceptPolicy::AlwaysAccept;
    211211    case NSHTTPCookieAcceptPolicyNever:
    212         return WebKit::HTTPCookieAcceptPolicyNever;
     212        return WebKit::HTTPCookieAcceptPolicy::Never;
    213213    case NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain:
    214         return WebKit::HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
     214        return WebKit::HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain;
    215215    case NSHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain:
    216         return WebKit::HTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain;
     216        return WebKit::HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain;
    217217    }
    218218
    219219    ASSERT_NOT_REACHED();
    220     return WebKit::HTTPCookieAcceptPolicyAlways;
     220    return WebKit::HTTPCookieAcceptPolicy::AlwaysAccept;
    221221}
    222222

  • trunk/Source/WebKit/UIProcess/API/glib/WebKitCookieManager.cpp

    r241903 r246807  
    9191{
    9292    switch (httpPolicy) {
    93     case HTTPCookieAcceptPolicyAlways:
     93    case HTTPCookieAcceptPolicy::AlwaysAccept:
    9494        return WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS;
    95     case HTTPCookieAcceptPolicyNever:
     95    case HTTPCookieAcceptPolicy::Never:
    9696        return WEBKIT_COOKIE_POLICY_ACCEPT_NEVER;
    97     case HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain:
     97    case HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain:
    9898        return WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY;
    9999    default:
    … …  
    107107    switch (kitPolicy) {
    108108    case WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS:
    109         return HTTPCookieAcceptPolicyAlways;
     109        return HTTPCookieAcceptPolicy::AlwaysAccept;
    110110    case WEBKIT_COOKIE_POLICY_ACCEPT_NEVER:
    111         return HTTPCookieAcceptPolicyNever;
     111        return HTTPCookieAcceptPolicy::Never;
    112112    case WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY:
    113         return HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
     113        return HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain;
    114114    default:
    115115        ASSERT_NOT_REACHED();
    116         return HTTPCookieAcceptPolicyAlways;
     116        return HTTPCookieAcceptPolicy::AlwaysAccept;
    117117    }
    118118}

  • trunk/Source/WebKit/UIProcess/WebCookieManagerProxy.cpp

    r244924 r246807  
    259259}
    260260
    261 void WebCookieManagerProxy::didGetHTTPCookieAcceptPolicy(uint32_t policy, WebKit::CallbackID callbackID)
     261void WebCookieManagerProxy::didGetHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy policy, WebKit::CallbackID callbackID)
    262262{
    263263    m_callbacks.take<HTTPCookieAcceptPolicyCallback>(callbackID)->performCallbackWithReturnValue(policy);

  • trunk/Source/WebKit/UIProcess/WebCookieManagerProxy.h

    r244924 r246807  
    110110
    111111    void didGetHostnamesWithCookies(const Vector<String>&, WebKit::CallbackID);
    112     void didGetHTTPCookieAcceptPolicy(uint32_t policy, WebKit::CallbackID);
     112    void didGetHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy, WebKit::CallbackID);
    113113
    114114    void didSetHTTPCookieAcceptPolicy(WebKit::CallbackID);

  • trunk/Source/WebKit/UIProcess/WebCookieManagerProxy.messages.in

    r220857 r246807  
    2323messages -> WebCookieManagerProxy {
    2424    DidGetHostnamesWithCookies(Vector<String> hostnames, WebKit::CallbackID callbackID);
    25     DidGetHTTPCookieAcceptPolicy(uint32_t policy, WebKit::CallbackID callbackID);
     25    DidGetHTTPCookieAcceptPolicy(enum:uint8_t WebKit::HTTPCookieAcceptPolicy policy, WebKit::CallbackID callbackID);
    2626
    2727    DidSetHTTPCookieAcceptPolicy(WebKit::CallbackID callbackID);

  • trunk/Source/WebKit/UIProcess/WebProcessPool.h

    r246500 r246807  
    681681
    682682#if USE(SOUP)
    683     HTTPCookieAcceptPolicy m_initialHTTPCookieAcceptPolicy { HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain };
     683    HTTPCookieAcceptPolicy m_initialHTTPCookieAcceptPolicy { HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain };
    684684    WebCore::SoupNetworkProxySettings m_networkProxySettings;
    685685#endif
Note: See TracChangeset for help on using the changeset viewer.