Attachment 359164 Details for Bug 193451 – Patch

[patch] Patch

bug-193451-20190115085309.patch (text/plain), 2.72 KB, created by Sihui Liu on 2019-01-15 08:53:10 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Sihui Liu

Created: 2019-01-15 08:53:10 PST

Size: 2.72 KB

patch

obsolete

>Subversion Revision: 239777
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index f49bfa18783627909a14199b6a1185135a97f51f..38e895b050c780a817d47015dc330bb31927582f 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-01-15  Sihui Liu  <sihui_liu@apple.com>
>+
>+        Fix API test WebKit.WebsiteDataStoreCustomPathsWithoutPrewarming after 193354
>+        https://bugs.webkit.org/show_bug.cgi?id=193451
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * TestWebKitAPI/Tests/WebKitCocoa/DuplicateCompletionHandlerCalls.mm:
>+        (TEST):
>+        * TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm:
>+        (runWebsiteDataStoreCustomPaths):
>+
> 2019-01-09  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][BFC][MarginCollapsing] Add support for peculiar cases.
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/DuplicateCompletionHandlerCalls.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/DuplicateCompletionHandlerCalls.mm
>index ac7082fb892ffec1f41d6a3574165f3942345168..91264f7adec3b3e7125a0334c262531daafabd0c 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/DuplicateCompletionHandlerCalls.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/DuplicateCompletionHandlerCalls.mm
>@@ -126,6 +126,9 @@ @end
> TEST(WebKit, DuplicateCompletionHandlerCalls)
> {
>     auto webView = adoptNS([[WKWebView alloc] initWithFrame:CGRectMake(0, 0, 800, 600)]);
>+    auto preferences = (__bridge WKPreferencesRef)[[webView configuration] preferences];
>+    WKPreferencesSetWebSQLDisabled(preferences, false);
>+
>     auto delegate = adoptNS([[DuplicateCompletionHandlerCallsDelegate alloc] init]);
>     [webView setNavigationDelegate:delegate.get()];
>     [webView setUIDelegate:delegate.get()];
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm
>index 764edf47a3094b0775f3d93babc96dd41c68a012..bd501f8cc53fa79a26856d4f0e7216b964f9070d 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm
>@@ -129,6 +129,9 @@ static void runWebsiteDataStoreCustomPaths(ShouldEnableProcessPrewarming shouldE
>     RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
>     [webView setNavigationDelegate:handler.get()];
> 
>+    auto preferences = (__bridge WKPreferencesRef)[[webView configuration] preferences];
>+    WKPreferencesSetWebSQLDisabled(preferences, false);
>+
>     NSURLRequest *request = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"WebsiteDataStoreCustomPaths" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
>     [webView loadRequest:request];
>

Actions: View | Formatted Diff | Diff

Attachments on bug 193451: 359164 | 359214