Changeset 234730 in webkit


Ignore:
Timestamp:
Aug 9, 2018 11:48:14 AM (6 years ago)
Author:
Chris Dumez
Message:

REGRESSION (r232083): WKWebView loses first-party cookies on iOS
​https://bugs.webkit.org/show_bug.cgi?id=188443
<rdar://problem/42991584>

Patch by Sihui Liu <​sihui_liu@apple.com> on 2018-08-09
Reviewed by Chris Dumez.

Source/WebKit:

Revert the change to set sharedCookieStorage for iOS as it is breaking Kayak.

  • NetworkProcess/NetworkProcess.h:
  • NetworkProcess/NetworkProcessCreationParameters.cpp:

(WebKit::NetworkProcessCreationParameters::encode const):
(WebKit::NetworkProcessCreationParameters::decode):

  • NetworkProcess/NetworkProcessCreationParameters.h:
  • NetworkProcess/cocoa/NetworkProcessCocoa.mm:

(WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):

  • Shared/WebProcessCreationParameters.cpp:

(WebKit::WebProcessCreationParameters::encode const):
(WebKit::WebProcessCreationParameters::decode):

  • Shared/WebProcessCreationParameters.h:
  • UIProcess/Cocoa/WebProcessPoolCocoa.mm:

(WebKit::WebProcessPool::platformInitializeWebProcess):
(WebKit::WebProcessPool::platformInitializeNetworkProcess):

Tools:

Skip WebKit.WKHTTPCookieStoreWithoutProcessPool on iOS.

  • TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm:
Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r234725 r234730  
     12018-08-09  Sihui Liu  <sihui_liu@apple.com>
     2
     3        REGRESSION (r232083): WKWebView loses first-party cookies on iOS
     4        https://bugs.webkit.org/show_bug.cgi?id=188443
     5        <rdar://problem/42991584>
     6
     7        Reviewed by Chris Dumez.
     8
     9        Revert the change to set sharedCookieStorage for iOS as it is breaking Kayak.
     10
     11        * NetworkProcess/NetworkProcess.h:
     12        * NetworkProcess/NetworkProcessCreationParameters.cpp:
     13        (WebKit::NetworkProcessCreationParameters::encode const):
     14        (WebKit::NetworkProcessCreationParameters::decode):
     15        * NetworkProcess/NetworkProcessCreationParameters.h:
     16        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
     17        (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
     18        * Shared/WebProcessCreationParameters.cpp:
     19        (WebKit::WebProcessCreationParameters::encode const):
     20        (WebKit::WebProcessCreationParameters::decode):
     21        * Shared/WebProcessCreationParameters.h:
     22        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
     23        (WebKit::WebProcessPool::platformInitializeWebProcess):
     24        (WebKit::WebProcessPool::platformInitializeNetworkProcess):
     25
    1262018-08-09  Per Arne Vollan  <pvollan@apple.com>
    227

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

    r234651 r234730  
    251251#endif
    252252
    253 #if PLATFORM(COCOA)
     253#if PLATFORM(MAC)
    254254    static void setSharedHTTPCookieStorage(const Vector<uint8_t>& identifier);
    255255#endif

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

    r234447 r234730  
    5353    encoder << shouldEnableNetworkCacheSpeculativeRevalidation;
    5454#endif
    55 #if PLATFORM(COCOA)
     55#if PLATFORM(MAC)
    5656    encoder << uiProcessCookieStorageIdentifier;
    5757#endif
    … …  
    145145        return false;
    146146#endif
    147 #if PLATFORM(COCOA)
     147#if PLATFORM(MAC)
    148148    if (!decoder.decode(result.uiProcessCookieStorageIdentifier))
    149149        return false;

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

    r234447 r234730  
    6464    bool shouldEnableNetworkCacheSpeculativeRevalidation { false };
    6565#endif
    66 #if PLATFORM(COCOA)
     66#if PLATFORM(MAC)
    6767    Vector<uint8_t> uiProcessCookieStorageIdentifier;
    6868#endif

  • trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm

    r234651 r234730  
    9797    initializeNetworkSettings();
    9898
    99 #if PLATFORM(COCOA)
     99#if PLATFORM(MAC)
    100100    setSharedHTTPCookieStorage(parameters.uiProcessCookieStorageIdentifier);
    101101#endif
    … …  
    193193}
    194194
    195 #if PLATFORM(COCOA)
     195#if PLATFORM(MAC)
    196196void NetworkProcess::setSharedHTTPCookieStorage(const Vector<uint8_t>& identifier)
    197197{

  • trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp

    r234652 r234730  
    5858    encoder << javaScriptConfigurationDirectory;
    5959    encoder << javaScriptConfigurationDirectoryExtensionHandle;
    60 #if PLATFORM(COCOA)
     60#if PLATFORM(MAC)
    6161    encoder << uiProcessCookieStorageIdentifier;
    6262#endif
    … …  
    217217    parameters.javaScriptConfigurationDirectoryExtensionHandle = WTFMove(*javaScriptConfigurationDirectoryExtensionHandle);
    218218
    219 #if PLATFORM(COCOA)
     219#if PLATFORM(MAC)
    220220    if (!decoder.decode(parameters.uiProcessCookieStorageIdentifier))
    221221        return false;

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

    r234652 r234730  
    8585    String javaScriptConfigurationDirectory;
    8686    SandboxExtension::Handle javaScriptConfigurationDirectoryExtensionHandle;
    87 #if PLATFORM(COCOA)
     87#if PLATFORM(MAC)
    8888    Vector<uint8_t> uiProcessCookieStorageIdentifier;
    8989#endif

  • trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm

    r234652 r234730  
    249249    parameters.networkATSContext = adoptCF(_CFNetworkCopyATSContext());
    250250
    251 #if PLATFORM(COCOA)
     251#if PLATFORM(MAC)
    252252    ASSERT(parameters.uiProcessCookieStorageIdentifier.isEmpty());
    253253    ASSERT(hasProcessPrivilege(ProcessPrivilege::CanAccessRawCookies));
    … …  
    314314    parameters.loadThrottleLatency = Seconds { [defaults integerForKey:WebKitNetworkLoadThrottleLatencyMillisecondsDefaultsKey] / 1000. };
    315315
    316 #if PLATFORM(COCOA)
     316#if PLATFORM(MAC)
    317317    ASSERT(parameters.uiProcessCookieStorageIdentifier.isEmpty());
    318318    ASSERT(hasProcessPrivilege(ProcessPrivilege::CanAccessRawCookies));

  • trunk/Tools/ChangeLog

    r234726 r234730  
     12018-08-09  Sihui Liu  <sihui_liu@apple.com>
     2
     3        REGRESSION (r232083): WKWebView loses first-party cookies on iOS
     4        https://bugs.webkit.org/show_bug.cgi?id=188443
     5        <rdar://problem/42991584>
     6
     7        Reviewed by Chris Dumez.
     8
     9        Skip WebKit.WKHTTPCookieStoreWithoutProcessPool on iOS.
     10
     11        * TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm:
     12
    1132018-08-09  Ross Kirsling  <ross.kirsling@sony.com>
    214

  • trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm

    r234561 r234730  
    477477@end
    478478
     479// FIXME: on iOS, UI process should be using the same cookie file as the network process for default session.
     480#if PLATFORM(MAC)
    479481TEST(WebKit, WKHTTPCookieStoreWithoutProcessPool)
    480482{
    … …  
    568570    TestWebKitAPI::Util::run(&finished);
    569571}
     572#endif // PLATFORM(MAC)
    570573#endif
Note: See TracChangeset for help on using the changeset viewer.