Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[Cocoa] -[WKWebsiteDataStore httpCookieStore] is declared in the main @…
…interface but implemented in a category

https://bugs.webkit.org/show_bug.cgi?id=171657

Reviewed by Sam Weinig.

* UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
(-[WKWebsiteDataStore httpCookieStore]): Moved from the WKPrivate category into the main
  @implementation block.


Canonical link: https://commits.webkit.org/188567@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@216186 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Dan Bernstein committed May 4, 2017
1 parent 819ecc1 commit 58744dc
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 5 deletions.
11 changes: 11 additions & 0 deletions Source/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
2017-05-04 Dan Bernstein <mitz@apple.com>

[Cocoa] -[WKWebsiteDataStore httpCookieStore] is declared in the main @interface but implemented in a category
https://bugs.webkit.org/show_bug.cgi?id=171657

Reviewed by Sam Weinig.

* UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
(-[WKWebsiteDataStore httpCookieStore]): Moved from the WKPrivate category into the main
@implementation block.

2017-05-04 Andy Estes <aestes@apple.com>

[Cocoa] Add an optional width parameter to -[WKWebProcessPlugInNodeHandle renderedImageWithOptions:]
Expand Down
10 changes: 5 additions & 5 deletions Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm
Expand Up @@ -96,6 +96,11 @@ + (NSSet *)allWebsiteDataTypes
return allWebsiteDataTypes;
}

- (WKHTTPCookieStore *)httpCookieStore
{
return WebKit::wrapper(_websiteDataStore->httpCookieStore());
}

static std::chrono::system_clock::time_point toSystemClockTime(NSDate *date)
{
ASSERT(date);
Expand Down Expand Up @@ -197,11 +202,6 @@ - (void)_setResourceLoadStatisticsEnabled:(BOOL)enabled
_websiteDataStore->websiteDataStore().setResourceLoadStatisticsEnabled(enabled);
}

- (WKHTTPCookieStore *)httpCookieStore
{
return WebKit::wrapper(_websiteDataStore->httpCookieStore());
}

@end

#endif // WK_API_ENABLED

0 comments on commit 58744dc

Please sign in to comment.