Attachment 342463 Details for Bug 186534 – Patch

[patch] Patch

bug-186534-20180611140549.patch (text/plain), 3.95 KB, created by Brady Eidson on 2018-06-11 14:05:50 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Brady Eidson

Created: 2018-06-11 14:05:50 PDT

Size: 3.95 KB

patch

obsolete

>Subversion Revision: 232729
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 9e5de992cc073bd87b55c163e3d575ae9137c555..bf7c96f616b9e253dd81f9cff6d93e06a723f02f 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,22 @@
>+2018-06-11  Brady Eidson  <beidson@apple.com>
>+
>+        Add a command line default to force WebKitTestRunner to turn on process swap on navigation.
>+        https://bugs.webkit.org/show_bug.cgi?id=186534
>+
>+        Reviewed by Chris Dumez.
>+
>+        Right now Process Swap On Navigation is enabled on a per-test basis.
>+        The future is to enable it by default.
>+
>+        Adding a 'defaults write' helps us get to that future.
>+
>+        * WebKitTestRunner/TestController.cpp:
>+        (WTR::TestController::testOptionsForTest const):
>+        (WTR::TestController::platformAddTestOptions const):
>+        * WebKitTestRunner/TestController.h:
>+        * WebKitTestRunner/cocoa/TestControllerCocoa.mm:
>+        (WTR::TestController::platformAddTestOptions const):
>+
> 2018-06-11  Chris Dumez  <cdumez@apple.com>
> 
>         Allow enabling PSON in layout tests without window.open support
>diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp
>index ee6b0859c584f43b0ec31d0afa665f91e325b498..a11fc0060808d17fc7781f8b1dd01a679fbf5a8e 100644
>--- a/Tools/WebKitTestRunner/TestController.cpp
>+++ b/Tools/WebKitTestRunner/TestController.cpp
>@@ -1138,6 +1138,7 @@ TestOptions TestController::testOptionsForTest(const TestCommand& command) const
> 
>     updatePlatformSpecificTestOptionsForTest(options, command.pathOrURL);
>     updateTestOptionsFromTestHeader(options, command.pathOrURL, command.absolutePath);
>+    platformAddTestOptions(options);
> 
>     return options;
> }
>@@ -2857,4 +2858,10 @@ void TestController::statisticsResetToConsistentState()
>     WKWebsiteDataStoreStatisticsResetToConsistentState(dataStore);
> }
> 
>+#if !PLATFORM(COCOA)
>+void TestController::platformAddTestOptions(TestOptions&) const
>+{
>+}
>+#endif
>+
> } // namespace WTR
>diff --git a/Tools/WebKitTestRunner/TestController.h b/Tools/WebKitTestRunner/TestController.h
>index 7303209e0871f0324fd5248f8841e2a47910f150..f33783443ef62ab0cddf8898aae0767adde1cb21 100644
>--- a/Tools/WebKitTestRunner/TestController.h
>+++ b/Tools/WebKitTestRunner/TestController.h
>@@ -227,6 +227,7 @@ private:
>     void platformDestroy();
>     WKContextRef platformAdjustContext(WKContextRef, WKContextConfigurationRef);
>     void platformInitializeContext();
>+    void platformAddTestOptions(TestOptions&) const;
>     void platformCreateWebView(WKPageConfigurationRef, const TestOptions&);
>     static PlatformWebView* platformCreateOtherPage(PlatformWebView* parentView, WKPageConfigurationRef, const TestOptions&);
>     void platformResetPreferencesToConsistentValues();
>diff --git a/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm b/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm
>index 6bc46870b654f00e05210ba4b4927a819cdb4171..beb023d9728e8ab68529d529450812d2d6f68ae0 100644
>--- a/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm
>+++ b/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm
>@@ -46,7 +46,6 @@
> #import <WebKit/WKWebsiteDataStorePrivate.h>
> #import <WebKit/WKWebsiteDataStoreRef.h>
> #import <WebKit/_WKApplicationManifest.h>
>-#import <WebKit/_WKProcessPoolConfiguration.h>
> #import <WebKit/_WKUserContentExtensionStore.h>
> #import <WebKit/_WKUserContentExtensionStorePrivate.h>
> #import <wtf/MainThread.h>
>@@ -128,6 +127,14 @@ WKPreferencesRef TestController::platformPreferences()
> #endif
> }
> 
>+void TestController::platformAddTestOptions(TestOptions& options) const
>+{
>+    if ([[NSUserDefaults standardUserDefaults] boolForKey:@"EnableProcessSwapOnNavigation"])
>+        options.enableProcessSwapOnNavigation = true;
>+    if ([[NSUserDefaults standardUserDefaults] boolForKey:@"EnableProcessSwapOnWindowOpen"])
>+        options.enableProcessSwapOnWindowOpen = true;
>+}
>+
> void TestController::platformCreateWebView(WKPageConfigurationRef, const TestOptions& options)
> {
> #if WK_API_ENABLED

Actions: View | Formatted Diff | Diff

Attachments on bug 186534: 342453 | 342458 | 342463