Attachment 359214 Details for Bug 193451 – Patch

[patch] Patch

bug-193451-20190115153553.patch (text/plain), 3.24 KB, created by Sihui Liu on 2019-01-15 15:35:53 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Sihui Liu

Created: 2019-01-15 15:35:53 PST

Size: 3.24 KB

patch

obsolete

>Subversion Revision: 240009
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 1300f79129eb7d375376c4a7e71de60c8eef2d08..afe3ed50076e1500f0c777a0de8c81e4de7253b0 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-15  Ryan Haddad  <ryanhaddad@apple.com>
> 
>         Adjust the arguments passed to run-javascriptcore-tests for the 32-bit JSC bot
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/DuplicateCompletionHandlerCalls.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/DuplicateCompletionHandlerCalls.mm
>index ac7082fb892ffec1f41d6a3574165f3942345168..6129141af90a313ff2c27a1d40800525481b3036 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/DuplicateCompletionHandlerCalls.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/DuplicateCompletionHandlerCalls.mm
>@@ -30,6 +30,7 @@
> 
> #import "PlatformUtilities.h"
> #import "Utilities.h"
>+#import <WebKit/WKPreferencesRef.h>
> #import <WebKit/WKUIDelegatePrivate.h>
> #import <WebKit/WKWebViewPrivate.h>
> #import <WebKit/_WKInputDelegate.h>
>@@ -126,6 +127,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..fa1d9f8d16e7badfe83f390ac6c99d15a68d2374 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm
>@@ -28,6 +28,7 @@
> #import "PlatformUtilities.h"
> #import "Test.h"
> #import "TestNavigationDelegate.h"
>+#import <WebKit/WKPreferencesRef.h>
> #import <WebKit/WKProcessPoolPrivate.h>
> #import <WebKit/WKUserContentControllerPrivate.h>
> #import <WebKit/WKWebViewConfigurationPrivate.h>
>@@ -129,6 +130,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