Attachment 342456 Details for Bug 186537 – Patch

[patch] Patch

bug-186537-20180611124140.patch (text/plain), 5.25 KB, created by Chris Dumez on 2018-06-11 12:41:41 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2018-06-11 12:41:41 PDT

Size: 5.25 KB

patch

obsolete

>Subversion Revision: 232717
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 1ad6b83000ce08bfe8d1fe6481ebc1a48f301efe..ac407046f3d67db73c11d02c8104cb3a71eb41e7 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-06-11  Chris Dumez  <cdumez@apple.com>
>+
>+        Allow enabling PSON in layout tests without window.open support
>+        https://bugs.webkit.org/show_bug.cgi?id=186537
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Allow enabling PSON in layout tests without window.open support since window.open support
>+        is far from being ready and we plan to enable PSON in layout tests soon.
>+
>+        * WebKitTestRunner/TestController.cpp:
>+        (WTR::TestController::createWebViewWithOptions):
>+        (WTR::updateTestOptionsFromTestHeader):
>+        * WebKitTestRunner/TestOptions.h:
>+        (WTR::TestOptions::hasSameInitializationOptions const):
>+
> 2018-06-11  Philippe Normand  <pnormand@igalia.com>
> 
>         [webkitpy] PHP7.2 support on Debian platforms
>diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp
>index bed37b30cde3da6dce9d90635aa343e7478086cd..ee6b0859c584f43b0ec31d0afa665f91e325b498 100644
>--- a/Tools/WebKitTestRunner/TestController.cpp
>+++ b/Tools/WebKitTestRunner/TestController.cpp
>@@ -506,9 +506,10 @@ void TestController::createWebViewWithOptions(const TestOptions& options)
>         WKArrayAppendItem(overrideLanguages.get(), adoptWK(WKStringCreateWithUTF8CString(language.utf8().data())).get());
>     WKContextConfigurationSetOverrideLanguages(contextConfiguration.get(), overrideLanguages.get());
> 
>-    if (options.enableProcessSwapOnNavigation) {
>+    if (options.enableProcessSwapOnNavigation || options.enableProcessSwapOnWindowOpen) {
>         WKContextConfigurationSetProcessSwapsOnNavigation(contextConfiguration.get(), true);
>-        WKContextConfigurationSetProcessSwapsOnWindowOpenWithOpener(contextConfiguration.get(), true);
>+        if (options.enableProcessSwapOnWindowOpen)
>+            WKContextConfigurationSetProcessSwapsOnWindowOpenWithOpener(contextConfiguration.get(), true);
>     }
> 
>     auto configuration = generatePageConfiguration(contextConfiguration.get());
>@@ -1120,6 +1121,8 @@ static void updateTestOptionsFromTestHeader(TestOptions& testOptions, const std:
>             testOptions.enableWebAnimationsCSSIntegration = parseBooleanTestHeaderValue(value);
>         if (key == "enableProcessSwapOnNavigation")
>             testOptions.enableProcessSwapOnNavigation = parseBooleanTestHeaderValue(value);
>+        if (key == "enableProcessSwapOnWindowOpen")
>+            testOptions.enableProcessSwapOnWindowOpen = parseBooleanTestHeaderValue(value);
>         if (key == "enableColorFilter")
>             testOptions.enableColorFilter = parseBooleanTestHeaderValue(value);
>         pairStart = pairEnd + 1;
>diff --git a/Tools/WebKitTestRunner/TestOptions.h b/Tools/WebKitTestRunner/TestOptions.h
>index 1e1ff427e50271b0393cdb29dcdf189b9fe10246..0e0599764d705fd3b836803d57b7a536ae18e225 100644
>--- a/Tools/WebKitTestRunner/TestOptions.h
>+++ b/Tools/WebKitTestRunner/TestOptions.h
>@@ -57,6 +57,7 @@ struct TestOptions {
>     bool allowCrossOriginSubresourcesToAskForCredentials { false };
>     bool enableWebAnimationsCSSIntegration { false };
>     bool enableProcessSwapOnNavigation { false };
>+    bool enableProcessSwapOnWindowOpen { false };
>     bool enableColorFilter { false };
> 
>     float deviceScaleFactor { 1 };
>@@ -90,6 +91,7 @@ struct TestOptions {
>             || allowCrossOriginSubresourcesToAskForCredentials != options.allowCrossOriginSubresourcesToAskForCredentials
>             || enableWebAnimationsCSSIntegration != options.enableWebAnimationsCSSIntegration
>             || enableProcessSwapOnNavigation != options.enableProcessSwapOnNavigation
>+            || enableProcessSwapOnWindowOpen != options.enableProcessSwapOnWindowOpen
>             || enableColorFilter != options.enableColorFilter)
>             return false;
> 
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 856584f94ece567d52676979ca87e8ac4c31af72..4afecce1daf2ba51caaf7c3a15285cc424ef52a9 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-06-11  Chris Dumez  <cdumez@apple.com>
>+
>+        Allow enabling PSON in layout tests without window.open support
>+        https://bugs.webkit.org/show_bug.cgi?id=186537
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Update layout test which requires window.open support in addition to PSON.
>+
>+        * http/tests/navigation/process-swap-window-open.html:
>+
> 2018-06-11  Antti Koivisto  <antti@apple.com>
> 
>         REGRESSION (Mojave): LayoutTest http/tests/cache/disk-cache/disk-cache-media-small.html is failing
>diff --git a/LayoutTests/http/tests/navigation/process-swap-window-open.html b/LayoutTests/http/tests/navigation/process-swap-window-open.html
>index cff0f0a79f7ebf2e5b30869cda9c15c04759eba5..a648a4138b625fe2654485254464e7d7fc0ec9ab 100644
>--- a/LayoutTests/http/tests/navigation/process-swap-window-open.html
>+++ b/LayoutTests/http/tests/navigation/process-swap-window-open.html
>@@ -1,4 +1,4 @@
>-<!DOCTYPE html>
>+<!DOCTYPE html>
> <html>
> <body>
> <script src="/js-test-resources/js-test.js"></script>

Actions: View | Formatted Diff | Diff

Attachments on bug 186537: 342456