Attachment 341302 Details for Bug 185041 – Patch

[patch] Patch

bug-185041-20180525110146.patch (text/plain), 5.92 KB, created by Sihui Liu on 2018-05-25 11:01:46 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sihui Liu

Created: 2018-05-25 11:01:46 PDT

Size: 5.92 KB

patch

obsolete

>Subversion Revision: 232189
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index f1ee6fc4351efc493a26502ebb3f7dc799819a43..4ddfb63e86fe4ee9cfe5a9e9382e0f9cdbe3ebc5 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-05-25  Sihui Liu  <sihui_liu@apple.com>
>+
>+        [WKHTTPCookieStore getAllCookies] returns inconsistent creation time
>+        https://bugs.webkit.org/show_bug.cgi?id=185041
>+        <rdar://problem/34684214>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Set creationtime property when creating Cookie object to keep consistency after conversion.
>+
>+        New API test: WebKit.WKHTTPCookieStoreCreationTime.
>+
>+        * platform/network/cocoa/CookieCocoa.mm:
>+        (WebCore::Cookie::operator NSHTTPCookie * const):
>+
> 2018-05-25  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC] Implement border and padding computation
>diff --git a/Source/WebCore/platform/network/cocoa/CookieCocoa.mm b/Source/WebCore/platform/network/cocoa/CookieCocoa.mm
>index 9bc2caba0967babbf3021daa1bd82972330c65d6..44173f4d982afa112934ccccd864abe38b6d0494 100644
>--- a/Source/WebCore/platform/network/cocoa/CookieCocoa.mm
>+++ b/Source/WebCore/platform/network/cocoa/CookieCocoa.mm
>@@ -92,7 +92,7 @@ Cookie::operator NSHTTPCookie *() const
>     if (isNull())
>         return nil;
> 
>-    NSMutableDictionary *properties = [NSMutableDictionary dictionaryWithCapacity:12];
>+    NSMutableDictionary *properties = [NSMutableDictionary dictionaryWithCapacity:13];
> 
>     if (!comment.isNull())
>         [properties setObject:(NSString *)comment forKey:NSHTTPCookieComment];
>@@ -117,6 +117,10 @@ Cookie::operator NSHTTPCookie *() const
>     if (maxAge > 0)
>         [properties setObject:[NSString stringWithFormat:@"%f", maxAge] forKey:NSHTTPCookieMaximumAge];
> 
>+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000)
>+    [properties setObject:[NSNumber numberWithDouble:created / 1000.0] forKey:@"Created"];
>+#endif
>+
>     auto* portString = portStringFromVector(ports);
>     if (portString)
>         [properties setObject:portString forKey:NSHTTPCookiePort];
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 645f70cdc55126738f59b029c5ef8f8aebee560a..27d5df0116c048bdfadea0e9fd2506a1ea6d3423 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-05-25  Sihui Liu  <sihui_liu@apple.com>
>+
>+        [WKHTTPCookieStore getAllCookies] returns inconsistent creation time
>+        https://bugs.webkit.org/show_bug.cgi?id=185041
>+        <rdar://problem/34684214>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add API test coverage.
>+
>+        * TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm:
>+        (TEST):
>+
> 2018-05-24  Chris Dumez  <cdumez@apple.com>
> 
>         Reduce copying of FontCascadeDescription objects by moving them around
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm
>index deb09a127ea0e70dd7ea4592274045eebfc77871..8f94b34d6d03a85cab77ad7ec71878389e90467f 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm
>@@ -33,6 +33,7 @@
> #import <WebKit/WKWebsiteDataStorePrivate.h>
> #import <WebKit/_WKWebsiteDataStoreConfiguration.h>
> #import <wtf/RetainPtr.h>
>+#import <wtf/Seconds.h>
> #import <wtf/text/WTFString.h>
> 
> #if WK_API_ENABLED
>@@ -311,6 +312,60 @@ TEST(WebKit, WKHTTPCookieStoreHttpOnly)
>     [cookies release];
> }
> 
>+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000)
>+TEST(WebKit, WKHTTPCookieStoreCreationTime) 
>+{   
>+    auto dataStore = [WKWebsiteDataStore defaultDataStore];
>+    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
>+    configuration.get().websiteDataStore = dataStore;
>+    auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
>+
>+    [webView loadHTMLString:@"WebKit Test" baseURL:[NSURL URLWithString:@"http://webkit.org"]];
>+    [webView _test_waitForDidFinishNavigation];
>+
>+    [dataStore removeDataOfTypes:[WKWebsiteDataStore allWebsiteDataTypes] modifiedSince:[NSDate distantPast] completionHandler:[] {
>+        gotFlag = true;
>+    }];
>+    TestWebKitAPI::Util::run(&gotFlag);
>+    gotFlag = false;
>+
>+    globalCookieStore = dataStore.httpCookieStore;
>+
>+    RetainPtr<NSHTTPCookie> cookie = [NSHTTPCookie cookieWithProperties:@{
>+        NSHTTPCookiePath: @"/path",
>+        NSHTTPCookieName: @"CookieName",
>+        NSHTTPCookieValue: @"CookieValue",
>+        NSHTTPCookieDomain: @".www.webkit.org",
>+    }];
>+
>+    [globalCookieStore setCookie:cookie.get() completionHandler:[]() {
>+        gotFlag = true;
>+    }];
>+    TestWebKitAPI::Util::run(&gotFlag);
>+    gotFlag = false;
>+
>+    RetainPtr<NSNumber> creationTime = nil;
>+    [globalCookieStore getAllCookies:[&](NSArray<NSHTTPCookie *> *cookies) {
>+        ASSERT_EQ(1u, cookies.count);
>+        creationTime = [cookies objectAtIndex:0].properties[@"Created"];
>+        gotFlag = true;
>+    }];
>+    TestWebKitAPI::Util::run(&gotFlag);
>+    gotFlag = false;
>+
>+    sleep(1_s);
>+
>+    [globalCookieStore getAllCookies:^(NSArray<NSHTTPCookie *> *cookies) {
>+        ASSERT_EQ(1u, cookies.count);
>+        NSNumber* creationTime2 = [cookies objectAtIndex:0].properties[@"Created"];
>+        EXPECT_TRUE([creationTime.get() isEqual:creationTime2]);
>+        gotFlag = true;
>+    }];
>+    TestWebKitAPI::Util::run(&gotFlag);
>+    gotFlag = false;
>+}
>+#endif // (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000)
>+
> // FIXME: This should be removed once <rdar://problem/35344202> is resolved and bots are updated.
> #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED <= 101301) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED <= 110102)
> TEST(WebKit, WKHTTPCookieStoreNonPersistent)

Actions: View | Formatted Diff | Diff

Attachments on bug 185041: 339171 | 339212 | 339240 | 339803 | 341302