[Mac] Share cookie storage between UI process and secondary processes

• Component: WebKit2
• Status: RESOLVED FIXED

[Alexey Proskuryakov]

When UI process uses a custom cookie storage location, WebProcess and NetworkProcess don't pick it up.

rdar://problem/20734401

[Alexey Proskuryakov]

Created attachment 252904 [details]
proposed patch

[WebKit Commit Bot]

Attachment 252904 [details] did not pass style-queue:


ERROR: Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp:114:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/WebKit2/Shared/WebProcessCreationParameters.cpp:191:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/WebCore/platform/network/mac/CookieJarMac.mm:29:  Alphabetical sorting problem.  [build/include_order] [4]
Total errors found: 3 in 14 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Alexey Proskuryakov]

Created attachment 252905 [details]
proposed patch

With iOS build fix.

[WebKit Commit Bot]

Attachment 252905 [details] did not pass style-queue:


ERROR: Source/WebCore/platform/network/mac/CookieJarMac.mm:29:  Alphabetical sorting problem.  [build/include_order] [4]
Total errors found: 1 in 14 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Alexey Proskuryakov]

Created attachment 252971 [details]
more iOS build fix

[WebKit Commit Bot]

Attachment 252971 [details] did not pass style-queue:


ERROR: Source/WebCore/platform/network/mac/CookieJarMac.mm:29:  Alphabetical sorting problem.  [build/include_order] [4]
Total errors found: 1 in 14 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Darin Adler]

Comment on attachment 252971 [details]
more iOS build fix

View in context: https://bugs.webkit.org/attachment.cgi?id=252971&action=review

> Source/WebKit2/Shared/WebProcessCreationParameters.cpp:186
> +    if (!decoder.decode(result.cookieStorageDirectory))

This says "result" but should say "parameters".

> Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm:158
> +#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
> +    if ([NSHTTPCookieStorage respondsToSelector:@selector(_setSharedHTTPCookieStorage:)]) {
> +        RetainPtr<CFDataRef> cookieStorageData = adoptCF(CFDataCreate(kCFAllocatorDefault, parameters.uiProcessCookieStorageIdentifier.data(), parameters.uiProcessCookieStorageIdentifier.size()));
> +        RetainPtr<CFHTTPCookieStorageRef> uiProcessCookieStorage = adoptCF(CFHTTPCookieStorageCreateFromIdentifyingData(kCFAllocatorDefault, cookieStorageData.get()));
> +        [NSHTTPCookieStorage _setSharedHTTPCookieStorage:adoptNS([[NSHTTPCookieStorage alloc] _initWithCFHTTPCookieStorage:uiProcessCookieStorage.get()]).get()];
> +    }
> +#endif

Can we avoid having two copies of this code?

[Alexey Proskuryakov]

Committed with the proposed changes in <http://trac.webkit.org/r184211> (and then I noticed that iOS EWS is still red!)

[Alexey Proskuryakov]

iOS build fix in r184212.