Changeset 250119 in webkit

Timestamp:

Sep 19, 2019 8:51:38 PM (5 years ago)

Author:

Brent Fulgham

Message:

[FTW, WinCairo] Support running tests in Release mode
​https://bugs.webkit.org/show_bug.cgi?id=202021

Reviewed by Don Olmstead.

In Bug 201597, we added new features to better lock down JSC features in the
potentially untrusted WebContent process.

Unfortunately, this change included XPC Dictionary items used at startup to
lock down JSC features before entering the main execution of the process. These
changes were not done for the WinCairo or FTW ports.

We need to pass the state of the JIT and whether to enable certain JSC features
at process launch. Since the XPC mechanisms we use on macOS and iOS do not exist
on Windows, I am implementing them as command-line flags.

-configure-jsc-for-testing: Sets the JSC in testing mode.
-disable-jit: Disables the JIT.

See r249808 for the equivalent changes on macOS and iOS.

• PlatformFTW.cmake: Add some missing header files needed when building tests.
• Shared/win/AuxiliaryProcessMainWin.cpp:

(WebKit::AuxiliaryProcessMainBase::parseCommandLine):

• UIProcess/Launcher/win/ProcessLauncherWin.cpp:

(WebKit::ProcessLauncher::launchProcess):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• PlatformFTW.cmake (modified) (3 diffs)
• Shared/win/AuxiliaryProcessMainWin.cpp (modified) (2 diffs)
• UIProcess/Launcher/win/ProcessLauncherWin.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-09-19  Brent Fulgham  <bfulgham@apple.com>
+
+        [FTW, WinCairo] Support running tests in Release mode
+        https://bugs.webkit.org/show_bug.cgi?id=202021
+
+        Reviewed by Don Olmstead.
+
+        In Bug 201597, we added new features to better lock down JSC features in the
+        potentially untrusted WebContent process.
+
+        Unfortunately, this change included XPC Dictionary items used at startup to
+        lock down JSC features before entering the main execution of the process. These
+        changes were not done for the WinCairo or FTW ports.
+
+        We need to pass the state of the JIT and whether to enable certain JSC features
+        at process launch. Since the XPC mechanisms we use on macOS and iOS do not exist
+        on Windows, I am implementing them as command-line flags.
+
+            -configure-jsc-for-testing: Sets the JSC in testing mode.
+            -disable-jit: Disables the JIT.
+
+        See r249808 for the equivalent changes on macOS and iOS.
+
+        * PlatformFTW.cmake: Add some missing header files needed when building tests.
+        * Shared/win/AuxiliaryProcessMainWin.cpp:
+        (WebKit::AuxiliaryProcessMainBase::parseCommandLine):
+        * UIProcess/Launcher/win/ProcessLauncherWin.cpp:
+        (WebKit::ProcessLauncher::launchProcess):
+
 2019-09-19  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/PlatformFTW.cmake

@@ -263 +263 @@
     UIProcess/API/C/WKGeolocationPermissionRequest.h
     UIProcess/API/C/WKGeolocationPosition.h
+    UIProcess/API/C/WKHTTPCookieStoreRef.h
     UIProcess/API/C/WKHitTestResult.h
     UIProcess/API/C/WKIconDatabase.h
@@ -294 +295 @@
     UIProcess/API/C/WKPagePolicyClient.h
     UIProcess/API/C/WKPagePrivate.h
+    UIProcess/API/C/WKPageRenderingProgressEvents.h
     UIProcess/API/C/WKPageStateClient.h
-    UIProcess/API/C/WKPageRenderingProgressEvents.h
     UIProcess/API/C/WKPageUIClient.h
     UIProcess/API/C/WKPluginLoadPolicy.h
@@ -313 +314 @@
     UIProcess/API/C/WKUserScriptRef.h
     UIProcess/API/C/WKViewportAttributes.h
+    UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.h
     UIProcess/API/C/WKWebsiteDataStoreRef.h
     UIProcess/API/C/WKWebsitePolicies.h

trunk/Source/WebKit/Shared/win/AuxiliaryProcessMainWin.cpp

@@ -27 +27 @@
 #include "AuxiliaryProcessMain.h"
 
+#include <JavaScriptCore/ExecutableAllocator.h>
 #include <cstring>
 #include <wtf/text/WTFString.h>
@@ -41 +42 @@
             String str(argv[++i]);
             m_parameters.processIdentifier = makeObjectIdentifier<WebCore::ProcessIdentifierType>(str.toUInt64());
-        }
+        } else if (!strcmp(argv[i], "-configure-jsc-for-testing"))
+            JSC::Config::configureForTesting();
+        else if (!strcmp(argv[i], "-disable-jit"))
+            JSC::ExecutableAllocator::setJITEnabled(false);
     }
     return true;

trunk/Source/WebKit/UIProcess/Launcher/win/ProcessLauncherWin.cpp

@@ -83 +83 @@
     commandLineBuilder.append(" -clientIdentifier ");
     commandLineBuilder.append(String::number(reinterpret_cast<uintptr_t>(clientIdentifier)));
+    if (m_client->shouldConfigureJSCForTesting())
+        commandLineBuilder.append(" -configure-jsc-for-testing");
+    if (!m_client->isJITEnabled())
+        commandLineBuilder.append(" -disable-jit");
     commandLineBuilder.append('\0');