Attachment 342705 Details for Bug 186542 – Patch

[patch] Patch

bug-186542-20180613162311.patch (text/plain), 5.51 KB, created by Chris Dumez on 2018-06-13 16:23:12 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2018-06-13 16:23:12 PDT

Size: 5.51 KB

patch

obsolete

>Subversion Revision: 232816
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 2e9bbeb280baebbbb458ee13c52ab1ced65e431e..c949f571fc9a7dda41a6b60ca4c0b80be94ac790 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,22 @@
>+2018-06-13  Chris Dumez  <cdumez@apple.com>
>+
>+        Turn on PSON in WebKitTestRunner
>+        https://bugs.webkit.org/show_bug.cgi?id=186542
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Turn on process swap on cross-origin navigation by default for WebKitTestRunner
>+        now that all layout tests are passing.
>+
>+        * WebKitTestRunner/TestController.cpp:
>+        (WTR::TestController::generateContextConfiguration const):
>+        (WTR::TestController::createWebViewWithOptions):
>+        (WTR::updateTestOptionsFromTestHeader):
>+        * WebKitTestRunner/TestOptions.h:
>+        (WTR::TestOptions::hasSameInitializationOptions const):
>+        * WebKitTestRunner/cocoa/TestControllerCocoa.mm:
>+        (WTR::TestController::platformAddTestOptions const):
>+
> 2018-06-13  David Fenton  <david_fenton@apple.com>
> 
>         Unreviewed, add myself as a WebKit committer.
>diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp
>index ba85189549dd37509eb3e00e8373816e380f3c3a..7785205d19bbc75c8c7aec352b7017788ece08ef 100644
>--- a/Tools/WebKitTestRunner/TestController.cpp
>+++ b/Tools/WebKitTestRunner/TestController.cpp
>@@ -414,6 +414,7 @@ WKRetainPtr<WKContextConfigurationRef> TestController::generateContextConfigurat
>     auto configuration = adoptWK(WKContextConfigurationCreate());
>     WKContextConfigurationSetInjectedBundlePath(configuration.get(), injectedBundlePath());
>     WKContextConfigurationSetFullySynchronousModeIsAllowedForTesting(configuration.get(), true);
>+    WKContextConfigurationSetProcessSwapsOnNavigation(configuration.get(), true);
> 
>     if (const char* dumpRenderTreeTemp = libraryPathForTesting()) {
>         String temporaryFolder = String::fromUTF8(dumpRenderTreeTemp);
>@@ -506,11 +507,8 @@ void TestController::createWebViewWithOptions(const TestOptions& options)
>         WKArrayAppendItem(overrideLanguages.get(), adoptWK(WKStringCreateWithUTF8CString(language.utf8().data())).get());
>     WKContextConfigurationSetOverrideLanguages(contextConfiguration.get(), overrideLanguages.get());
> 
>-    if (options.enableProcessSwapOnNavigation || options.enableProcessSwapOnWindowOpen) {
>-        WKContextConfigurationSetProcessSwapsOnNavigation(contextConfiguration.get(), true);
>-        if (options.enableProcessSwapOnWindowOpen)
>-            WKContextConfigurationSetProcessSwapsOnWindowOpenWithOpener(contextConfiguration.get(), true);
>-    }
>+    if (options.enableProcessSwapOnWindowOpen)
>+        WKContextConfigurationSetProcessSwapsOnWindowOpenWithOpener(contextConfiguration.get(), true);
> 
>     auto configuration = generatePageConfiguration(contextConfiguration.get());
> 
>@@ -1125,8 +1123,6 @@ static void updateTestOptionsFromTestHeader(TestOptions& testOptions, const std:
>             testOptions.allowCrossOriginSubresourcesToAskForCredentials = parseBooleanTestHeaderValue(value);
>         else if (key == "enableWebAnimationsCSSIntegration")
>             testOptions.enableWebAnimationsCSSIntegration = parseBooleanTestHeaderValue(value);
>-        else if (key == "enableProcessSwapOnNavigation")
>-            testOptions.enableProcessSwapOnNavigation = parseBooleanTestHeaderValue(value);
>         else if (key == "enableProcessSwapOnWindowOpen")
>             testOptions.enableProcessSwapOnWindowOpen = parseBooleanTestHeaderValue(value);
>         else if (key == "enableColorFilter")
>diff --git a/Tools/WebKitTestRunner/TestOptions.h b/Tools/WebKitTestRunner/TestOptions.h
>index 3b17c01146e90fd7da8661cb52736cb8c9a37c26..661026198315a7213526431ca991dbd4f647bce8 100644
>--- a/Tools/WebKitTestRunner/TestOptions.h
>+++ b/Tools/WebKitTestRunner/TestOptions.h
>@@ -56,7 +56,6 @@ struct TestOptions {
>     bool dumpJSConsoleLogInStdErr { false };
>     bool allowCrossOriginSubresourcesToAskForCredentials { false };
>     bool enableWebAnimationsCSSIntegration { false };
>-    bool enableProcessSwapOnNavigation { false };
>     bool enableProcessSwapOnWindowOpen { false };
>     bool enableColorFilter { false };
> 
>@@ -91,7 +90,6 @@ struct TestOptions {
>             || applicationManifest != options.applicationManifest
>             || allowCrossOriginSubresourcesToAskForCredentials != options.allowCrossOriginSubresourcesToAskForCredentials
>             || enableWebAnimationsCSSIntegration != options.enableWebAnimationsCSSIntegration
>-            || enableProcessSwapOnNavigation != options.enableProcessSwapOnNavigation
>             || enableProcessSwapOnWindowOpen != options.enableProcessSwapOnWindowOpen
>             || enableColorFilter != options.enableColorFilter
>             || jscOptions != options.jscOptions)
>diff --git a/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm b/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm
>index beb023d9728e8ab68529d529450812d2d6f68ae0..a87f158666bbd92afc06c71eecd7e2db9adfa0cd 100644
>--- a/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm
>+++ b/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm
>@@ -129,8 +129,6 @@ WKPreferencesRef TestController::platformPreferences()
> 
> void TestController::platformAddTestOptions(TestOptions& options) const
> {
>-    if ([[NSUserDefaults standardUserDefaults] boolForKey:@"EnableProcessSwapOnNavigation"])
>-        options.enableProcessSwapOnNavigation = true;
>     if ([[NSUserDefaults standardUserDefaults] boolForKey:@"EnableProcessSwapOnWindowOpen"])
>         options.enableProcessSwapOnWindowOpen = true;
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 186542: 342467 | 342488 | 342705 | 342962 | 342974 | 345177 | 345188