Log Message
[Testing] Support configuring any preference from test headers for WebKitTestRunner https://bugs.webkit.org/show_bug.cgi?id=217645
Reviewed by Tim Horton. Support using any preference defined in any of the WebPreference*.yaml configuration files as a test header command rather than limiting it to a hard coded subset by generating the list of supported commands and their types from the yaml files themselves. This currently only works for WebKitTestRunner, but will be made to work with DumpRenderTree in subsequent changes. * WebKitTestRunner/CMakeLists.txt: * WebKitTestRunner/Configurations/Base.xcconfig: * WebKitTestRunner/DerivedSources-input.xcfilelist: * WebKitTestRunner/DerivedSources-output.xcfilelist: * WebKitTestRunner/DerivedSources.make: * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj: * WebKitTestRunner/Scripts/PreferencesTemplates: Added. * WebKitTestRunner/Scripts/PreferencesTemplates/TestOptionsGeneratedKeys.h.erb: Added. Add generation of TestOptionsGeneratedKeys.h from the WebPreference*.yaml using the shared GeneratePreferences.rb script in WTF. * WebKitTestRunner/TestController.cpp: (WTR::TestController::resetPreferencesToConsistentValues): Move preference setting to the bottom of the file to allow any preference to be overriden. Also adds in support for double, uint32_t, and string preferences though none of those are currently being used. * WebKitTestRunner/TestOptions.cpp: (WTR::TestOptions::keyTypeMapping): Use generated macro GENERATED_WEB_PREFERENCE_KEY_TYPE_MAPPINGS rather than hardcoding all the preferences types. * WebKitTestRunner/TestOptions.h: (WTR::TestOptions::boolWebPreferenceFeatures const): (WTR::TestOptions::doubleWebPreferenceFeatures const): (WTR::TestOptions::uint32WebPreferenceFeatures const): (WTR::TestOptions::stringWebPreferenceFeatures const): Expose accessors for preferences values for use in setting the actual preference values. Rather than setting all preferences, we now only set preferences that have been explicitly requested, using the default value for any that have not.
Modified Paths
- trunk/Tools/ChangeLog
- trunk/Tools/WebKitTestRunner/CMakeLists.txt
- trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig
- trunk/Tools/WebKitTestRunner/DerivedSources-input.xcfilelist
- trunk/Tools/WebKitTestRunner/DerivedSources-output.xcfilelist
- trunk/Tools/WebKitTestRunner/DerivedSources.make
- trunk/Tools/WebKitTestRunner/TestController.cpp
- trunk/Tools/WebKitTestRunner/TestController.h
- trunk/Tools/WebKitTestRunner/TestOptions.cpp
- trunk/Tools/WebKitTestRunner/TestOptions.h
- trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj
Added Paths
- trunk/Tools/WebKitTestRunner/Scripts/PreferencesTemplates/
- trunk/Tools/WebKitTestRunner/Scripts/PreferencesTemplates/TestOptionsGeneratedKeys.h.erb
Diff
Modified: trunk/Tools/ChangeLog (268603 => 268604)
--- trunk/Tools/ChangeLog 2020-10-16 19:32:39 UTC (rev 268603)
+++ trunk/Tools/ChangeLog 2020-10-16 19:37:06 UTC (rev 268604)
@@ -1,3 +1,48 @@
+2020-10-16 Sam Weinig <wei...@apple.com>
+
+ [Testing] Support configuring any preference from test headers for WebKitTestRunner
+ https://bugs.webkit.org/show_bug.cgi?id=217645
+
+ Reviewed by Tim Horton.
+
+ Support using any preference defined in any of the WebPreference*.yaml configuration files
+ as a test header command rather than limiting it to a hard coded subset by generating the
+ list of supported commands and their types from the yaml files themselves.
+
+ This currently only works for WebKitTestRunner, but will be made to work with DumpRenderTree
+ in subsequent changes.
+
+ * WebKitTestRunner/CMakeLists.txt:
+ * WebKitTestRunner/Configurations/Base.xcconfig:
+ * WebKitTestRunner/DerivedSources-input.xcfilelist:
+ * WebKitTestRunner/DerivedSources-output.xcfilelist:
+ * WebKitTestRunner/DerivedSources.make:
+ * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
+ * WebKitTestRunner/Scripts/PreferencesTemplates: Added.
+ * WebKitTestRunner/Scripts/PreferencesTemplates/TestOptionsGeneratedKeys.h.erb: Added.
+ Add generation of TestOptionsGeneratedKeys.h from the WebPreference*.yaml using
+ the shared GeneratePreferences.rb script in WTF.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::resetPreferencesToConsistentValues):
+ Move preference setting to the bottom of the file to allow any preference
+ to be overriden. Also adds in support for double, uint32_t, and string preferences
+ though none of those are currently being used.
+
+ * WebKitTestRunner/TestOptions.cpp:
+ (WTR::TestOptions::keyTypeMapping):
+ Use generated macro GENERATED_WEB_PREFERENCE_KEY_TYPE_MAPPINGS rather than hardcoding
+ all the preferences types.
+
+ * WebKitTestRunner/TestOptions.h:
+ (WTR::TestOptions::boolWebPreferenceFeatures const):
+ (WTR::TestOptions::doubleWebPreferenceFeatures const):
+ (WTR::TestOptions::uint32WebPreferenceFeatures const):
+ (WTR::TestOptions::stringWebPreferenceFeatures const):
+ Expose accessors for preferences values for use in setting the actual preference
+ values. Rather than setting all preferences, we now only set preferences that have
+ been explicitly requested, using the default value for any that have not.
+
2020-10-16 Aakash Jain <aakash_j...@apple.com>
[build.webkit.org Rename slave to worker in steps.py
Modified: trunk/Tools/WebKitTestRunner/CMakeLists.txt (268603 => 268604)
--- trunk/Tools/WebKitTestRunner/CMakeLists.txt 2020-10-16 19:32:39 UTC (rev 268603)
+++ trunk/Tools/WebKitTestRunner/CMakeLists.txt 2020-10-16 19:37:06 UTC (rev 268604)
@@ -30,6 +30,7 @@
${CMAKE_BINARY_DIR}
${WebKitTestRunner_SHARED_DIR}
${WebKitTestRunner_BINDINGS_DIR}
+ ${WebKitTestRunner_DERIVED_SOURCES_DIR}
${WebKitTestRunner_DERIVED_SOURCES_DIR}/UIScriptContext
${WebKitTestRunner_DIR}
${WebKitTestRunner_UISCRIPTCONTEXT_DIR}
@@ -43,6 +44,29 @@
${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
)
+set(WebKitTestRunner_WEB_PREFERENCES_TEMPLATES
+ ${WebKitTestRunner_DIR}/Scripts/PreferencesTemplates/TestOptionsGeneratedKeys.h.erb
+)
+
+set(WebKitTestRunner_WEB_PREFERENCES
+ ${WTF_SCRIPTS_DIR}/Preferences/WebPreferences.yaml
+ ${WTF_SCRIPTS_DIR}/Preferences/WebPreferencesDebug.yaml
+ ${WTF_SCRIPTS_DIR}/Preferences/WebPreferencesExperimental.yaml
+ ${WTF_SCRIPTS_DIR}/Preferences/WebPreferencesInternal.yaml
+)
+
+set_source_files_properties(${WebKitTestRunner_WEB_PREFERENCES} PROPERTIES GENERATED TRUE)
+
+add_custom_command(
+ OUTPUT ${WebKitTestRunner_DERIVED_SOURCES_DIR}/TestOptionsGeneratedKeys.h
+ DEPENDS ${WebKitTestRunner_WEB_PREFERENCES_TEMPLATES} ${WebKitTestRunner_WEB_PREFERENCES} WTF_CopyPreferences
+ COMMAND ${RUBY_EXECUTABLE} ${WTF_SCRIPTS_DIR}/GeneratePreferences.rb --frontend WebKit --base ${WTF_SCRIPTS_DIR}/Preferences/WebPreferences.yaml --debug ${WTF_SCRIPTS_DIR}/Preferences/WebPreferencesDebug.yaml --experimental ${WTF_SCRIPTS_DIR}/Preferences/WebPreferencesExperimental.yaml --internal ${WTF_SCRIPTS_DIR}/Preferences/WebPreferencesInternal.yaml --outputDir "${WebKitTestRunner_DERIVED_SOURCES_DIR}" --template ${WebKitTestRunner_DIR}/Scripts/PreferencesTemplates/TestOptionsGeneratedKeys.h.erb
+ VERBATIM)
+
+list(APPEND WebKitTestRunner_SOURCES
+ ${WebKitTestRunner_DERIVED_SOURCES_DIR}/TestOptionsGeneratedKeys.h
+)
+
set(WebKitTestRunnerInjectedBundle_SOURCES
InjectedBundle/AccessibilityController.cpp
InjectedBundle/AccessibilityTextMarker.cpp
Modified: trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig (268603 => 268604)
--- trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2020-10-16 19:32:39 UTC (rev 268603)
+++ trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2020-10-16 19:37:06 UTC (rev 268604)
@@ -100,6 +100,14 @@
PRODUCTION_FRAMEWORKS_DIR[sdk=embedded*] = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
PRODUCTION_FRAMEWORKS_DIR[sdk=macosx*] = $(SDKROOT)$(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
+WTF_BUILD_SCRIPTS_DIR = $(WTF_BUILD_SCRIPTS_DIR_$(CONFIGURATION));
+WTF_BUILD_SCRIPTS_DIR_Release = $(WTF_BUILD_SCRIPTS_DIR_engineering);
+WTF_BUILD_SCRIPTS_DIR_Debug = $(WTF_BUILD_SCRIPTS_DIR_engineering);
+WTF_BUILD_SCRIPTS_DIR_Production = $(WTF_BUILD_SCRIPTS_DIR_Production_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
+WTF_BUILD_SCRIPTS_DIR_Production_COCOA_TOUCH_YES = $(SDKROOT)$(WK_ALTERNATE_WEBKIT_SDK_PATH)/usr/local/include/wtf/Scripts;
+WTF_BUILD_SCRIPTS_DIR_Production_COCOA_TOUCH_NO = $(SDKROOT)/usr/local/include/wtf/Scripts;
+WTF_BUILD_SCRIPTS_DIR_engineering = $(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Scripts;
+
WEBCORE_PRIVATE_HEADERS_DIR = $(WEBCORE_PRIVATE_HEADERS_DIR_$(CONFIGURATION));
WEBCORE_PRIVATE_HEADERS_DIR_Release = $(WEBCORE_PRIVATE_HEADERS_DIR_engineering);
WEBCORE_PRIVATE_HEADERS_DIR_Debug = $(WEBCORE_PRIVATE_HEADERS_DIR_engineering);
@@ -123,6 +131,7 @@
WK_COCOA_TOUCH_watchsimulator = cocoatouch;
WK_COCOA_TOUCH_appletvos = cocoatouch;
WK_COCOA_TOUCH_appletvsimulator = cocoatouch;
+WK_IS_COCOA_TOUCH = $(WK_NOT_$(WK_EMPTY_$(WK_COCOA_TOUCH)));
HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(BUILT_PRODUCTS_DIR)/WebCoreTestSupport $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(NEXT_ROOT)/usr/local/include/WebCoreTestSupport $(HEADER_SEARCH_PATHS_$(WK_COCOA_TOUCH));
HEADER_SEARCH_PATHS_ = ;
Modified: trunk/Tools/WebKitTestRunner/DerivedSources-input.xcfilelist (268603 => 268604)
--- trunk/Tools/WebKitTestRunner/DerivedSources-input.xcfilelist 2020-10-16 19:32:39 UTC (rev 268603)
+++ trunk/Tools/WebKitTestRunner/DerivedSources-input.xcfilelist 2020-10-16 19:37:06 UTC (rev 268604)
@@ -1,4 +1,9 @@
# This file is generated by the generate-xcfilelists script.
+$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Scripts/GeneratePreferences.rb
+$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Scripts/Preferences/WebPreferences.yaml
+$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Scripts/Preferences/WebPreferencesDebug.yaml
+$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Scripts/Preferences/WebPreferencesExperimental.yaml
+$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Scripts/Preferences/WebPreferencesInternal.yaml
$(PROJECT_DIR)/../TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl
$(PROJECT_DIR)/InjectedBundle/Bindings/AccessibilityController.idl
$(PROJECT_DIR)/InjectedBundle/Bindings/AccessibilityTextMarker.idl
@@ -9,6 +14,7 @@
$(PROJECT_DIR)/InjectedBundle/Bindings/GCController.idl
$(PROJECT_DIR)/InjectedBundle/Bindings/TestRunner.idl
$(PROJECT_DIR)/InjectedBundle/Bindings/TextInputController.idl
+$(PROJECT_DIR)/Scripts/PreferencesTemplates/TestOptionsGeneratedKeys.h.erb
$(WEBCORE_PRIVATE_HEADERS_DIR)/CodeGenerator.pm
$(WEBCORE_PRIVATE_HEADERS_DIR)/IDLAttributes.json
$(WEBCORE_PRIVATE_HEADERS_DIR)/IDLParser.pm
Modified: trunk/Tools/WebKitTestRunner/DerivedSources-output.xcfilelist (268603 => 268604)
--- trunk/Tools/WebKitTestRunner/DerivedSources-output.xcfilelist 2020-10-16 19:32:39 UTC (rev 268603)
+++ trunk/Tools/WebKitTestRunner/DerivedSources-output.xcfilelist 2020-10-16 19:37:06 UTC (rev 268604)
@@ -17,3 +17,4 @@
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitTestRunner/JSTextInputController.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitTestRunner/JSUIScriptController.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitTestRunner/JSUIScriptController.h
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitTestRunner/TestOptionsGeneratedKeys.h
Modified: trunk/Tools/WebKitTestRunner/DerivedSources.make (268603 => 268604)
--- trunk/Tools/WebKitTestRunner/DerivedSources.make 2020-10-16 19:32:39 UTC (rev 268603)
+++ trunk/Tools/WebKitTestRunner/DerivedSources.make 2020-10-16 19:37:06 UTC (rev 268604)
@@ -1,4 +1,4 @@
-# Copyright (C) 2010 Apple Inc. All rights reserved.
+# Copyright (C) 2010-2020 Apple Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -26,6 +26,27 @@
$(WebKitTestRunner)/../TestRunnerShared/UIScriptContext/Bindings \
#
+RUBY = ruby
+
+WEB_PREFERENCES = \
+ ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferences.yaml \
+ ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferencesDebug.yaml \
+ ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferencesExperimental.yaml \
+ ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferencesInternal.yaml \
+#
+
+WEB_PREFERENCES_TEMPLATES = \
+ $(WebKitTestRunner)/Scripts/PreferencesTemplates/TestOptionsGeneratedKeys.h.erb \
+#
+WEB_PREFERENCES_FILES = $(basename $(notdir $(WEB_PREFERENCES_TEMPLATES)))
+WEB_PREFERENCES_PATTERNS = $(subst .erb,,$(WEB_PREFERENCES_FILES))
+
+all : $(WEB_PREFERENCES_FILES)
+
+$(WEB_PREFERENCES_PATTERNS) : $(WTF_BUILD_SCRIPTS_DIR)/GeneratePreferences.rb $(WEB_PREFERENCES_TEMPLATES) $(WEB_PREFERENCES)
+ $(RUBY) $< --frontend WebKit --base ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferences.yaml --debug ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferencesDebug.yaml --experimental ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferencesExperimental.yaml --internal ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferencesInternal.yaml $(addprefix --template , $(WEB_PREFERENCES_TEMPLATES))
+
+
INJECTED_BUNDLE_INTERFACES = \
AccessibilityController \
AccessibilityTextMarker \
Added: trunk/Tools/WebKitTestRunner/Scripts/PreferencesTemplates/TestOptionsGeneratedKeys.h.erb (0 => 268604)
--- trunk/Tools/WebKitTestRunner/Scripts/PreferencesTemplates/TestOptionsGeneratedKeys.h.erb (rev 0)
+++ trunk/Tools/WebKitTestRunner/Scripts/PreferencesTemplates/TestOptionsGeneratedKeys.h.erb 2020-10-16 19:37:06 UTC (rev 268604)
@@ -0,0 +1,34 @@
+/*
+ * <%= @warning %>
+ *
+ * Copyright (C) 2020 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#define GENERATED_WEB_PREFERENCE_KEY_TYPE_MAPPINGS \
+<%- for @pref in @preferences do -%>
+ { "<%= @pref.name %>", TestHeaderKeyType::<%= @pref.typeUpper %>WebPreference }, \
+<%- end -%>
+\
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (268603 => 268604)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2020-10-16 19:32:39 UTC (rev 268603)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2020-10-16 19:37:06 UTC (rev 268604)
@@ -469,6 +469,7 @@
m_checkForWorldLeaks = options.checkForWorldLeaks;
m_allowAnyHTTPSCertificateForAllowedHosts = options.allowAnyHTTPSCertificateForAllowedHosts;
+ m_globalFeatures = TestOptions::defaults();
m_globalFeatures.internalDebugFeatures = options.internalFeatures;
m_globalFeatures.experimentalFeatures = options.experimentalFeatures;
m_globalFeatures.boolWebPreferenceFeatures.insert({ "AcceleratedDrawingEnabled", options.shouldUseAcceleratedDrawing });
@@ -497,21 +498,21 @@
m_eventSenderProxy = makeUnique<EventSenderProxy>(this);
}
-WKRetainPtr<WKContextConfigurationRef> TestController::generateContextConfiguration(const ContextOptions& options) const
+WKRetainPtr<WKContextConfigurationRef> TestController::generateContextConfiguration(const TestOptions& options) const
{
auto configuration = adoptWK(WKContextConfigurationCreate());
WKContextConfigurationSetInjectedBundlePath(configuration.get(), injectedBundlePath());
WKContextConfigurationSetFullySynchronousModeIsAllowedForTesting(configuration.get(), true);
- WKContextConfigurationSetIgnoreSynchronousMessagingTimeoutsForTesting(configuration.get(), options.ignoreSynchronousMessagingTimeouts);
+ WKContextConfigurationSetIgnoreSynchronousMessagingTimeoutsForTesting(configuration.get(), options.ignoreSynchronousMessagingTimeouts());
auto overrideLanguages = adoptWK(WKMutableArrayCreate());
- for (auto& language : options.overrideLanguages)
+ for (auto& language : options.overrideLanguages())
WKArrayAppendItem(overrideLanguages.get(), toWK(language).get());
WKContextConfigurationSetOverrideLanguages(configuration.get(), overrideLanguages.get());
if (options.shouldEnableProcessSwapOnNavigation()) {
WKContextConfigurationSetProcessSwapsOnNavigation(configuration.get(), true);
- if (options.enableProcessSwapOnWindowOpen)
+ if (options.enableProcessSwapOnWindowOpen())
WKContextConfigurationSetProcessSwapsOnWindowOpenWithOpener(configuration.get(), true);
}
@@ -560,11 +561,9 @@
WKRetainPtr<WKPageConfigurationRef> TestController::generatePageConfiguration(const TestOptions& options)
{
- auto contextOptions = options.contextOptions();
- if (!m_context || !m_contextOptions->hasSameInitializationOptions(contextOptions)) {
- auto contextConfiguration = generateContextConfiguration(contextOptions);
+ if (!m_context || !m_mainWebView || !m_mainWebView->viewSupportsOptions(options)) {
+ auto contextConfiguration = generateContextConfiguration(options);
m_context = platformAdjustContext(adoptWK(WKContextCreateWithConfiguration(contextConfiguration.get())).get(), contextConfiguration.get());
- m_contextOptions = contextOptions;
m_geolocationProvider = makeUnique<GeolocationProviderMock>(m_context.get());
@@ -824,7 +823,6 @@
m_createdOtherPage = false;
}
-
createWebViewWithOptions(options);
if (!resetStateToConsistentValues(options, ResetStage::BeforeTest))
@@ -856,11 +854,8 @@
for (const auto& [key, value] : options.internalDebugFeatures())
WKPreferencesSetInternalDebugFeatureForKey(preferences, value, toWK(key).get());
- for (const auto& [key, value] : options.boolWKPreferences())
- WKPreferencesSetBoolValueForKey(preferences, value, toWK(key).get());
-
// FIXME: Convert these to default values for TestOptions.
- WKPreferencesSetProcessSwapOnNavigationEnabled(preferences, options.contextOptions().shouldEnableProcessSwapOnNavigation());
+ WKPreferencesSetProcessSwapOnNavigationEnabled(preferences, options.shouldEnableProcessSwapOnNavigation());
WKPreferencesSetOfflineWebApplicationCacheEnabled(preferences, true);
WKPreferencesSetSubpixelAntialiasedLayerTextEnabled(preferences, false);
WKPreferencesSetXSSAuditorEnabled(preferences, false);
@@ -924,6 +919,19 @@
#endif
platformResetPreferencesToConsistentValues();
+
+ for (const auto& [key, value] : options.boolWebPreferenceFeatures())
+ WKPreferencesSetBoolValueForKey(preferences, value, toWK(key).get());
+
+ for (const auto& [key, value] : options.doubleWebPreferenceFeatures())
+ WKPreferencesSetDoubleValueForKey(preferences, value, toWK(key).get());
+
+ for (const auto& [key, value] : options.uint32WebPreferenceFeatures())
+ WKPreferencesSetUInt32ValueForKey(preferences, value, toWK(key).get());
+
+ for (const auto& [key, value] : options.stringWebPreferenceFeatures())
+ WKPreferencesSetStringValueForKey(preferences, toWK(value).get(), toWK(key).get());
+
}
bool TestController::resetStateToConsistentValues(const TestOptions& options, ResetStage resetStage)
Modified: trunk/Tools/WebKitTestRunner/TestController.h (268603 => 268604)
--- trunk/Tools/WebKitTestRunner/TestController.h 2020-10-16 19:32:39 UTC (rev 268603)
+++ trunk/Tools/WebKitTestRunner/TestController.h 2020-10-16 19:37:06 UTC (rev 268604)
@@ -353,7 +353,7 @@
private:
WKRetainPtr<WKPageConfigurationRef> generatePageConfiguration(const TestOptions&);
- WKRetainPtr<WKContextConfigurationRef> generateContextConfiguration(const ContextOptions&) const;
+ WKRetainPtr<WKContextConfigurationRef> generateContextConfiguration(const TestOptions&) const;
void initialize(int argc, const char* argv[]);
void createWebViewWithOptions(const TestOptions&);
void run();
@@ -538,7 +538,6 @@
std::unique_ptr<PlatformWebView> m_mainWebView;
WKRetainPtr<WKContextRef> m_context;
- Optional<ContextOptions> m_contextOptions;
WKRetainPtr<WKPageGroupRef> m_pageGroup;
WKRetainPtr<WKUserContentControllerRef> m_userContentController;
Modified: trunk/Tools/WebKitTestRunner/TestOptions.cpp (268603 => 268604)
--- trunk/Tools/WebKitTestRunner/TestOptions.cpp 2020-10-16 19:32:39 UTC (rev 268603)
+++ trunk/Tools/WebKitTestRunner/TestOptions.cpp 2020-10-16 19:37:06 UTC (rev 268604)
@@ -26,131 +26,81 @@
#include "config.h"
#include "TestOptions.h"
-#include <fstream>
-#include <string>
+#include "TestOptionsGeneratedKeys.h"
#include <wtf/Assertions.h>
-#include <wtf/StdFilesystem.h>
namespace WTR {
-static const std::unordered_map<std::string, bool>& boolWebPreferencesDefaultsMap()
+const TestFeatures& TestOptions::defaults()
{
- static std::unordered_map<std::string, bool> map {
- { "AcceleratedDrawingEnabled", false },
- { "AllowCrossOriginSubresourcesToAskForCredentials", false },
- { "AllowTopNavigationToDataURLs", true },
- { "AttachmentElementEnabled", false },
- { "CaptureAudioInGPUProcessEnabled", false },
- { "CaptureAudioInUIProcessEnabled", false },
- { "CaptureVideoInGPUProcessEnabled", false },
- { "CaptureVideoInUIProcessEnabled", false },
- { "ColorFilterEnabled", false },
- { "DOMPasteAllowed", true },
- { "InspectorAdditionsEnabled", false },
- { "KeygenElementEnabled", false },
- { "MenuItemElementEnabled", false },
- { "MockScrollbarsEnabled", true },
- { "ModernMediaControlsEnabled", true },
- { "NeedsSiteSpecificQuirks", false },
- { "PageVisibilityBasedProcessSuppressionEnabled", false },
- { "PunchOutWhiteBackgroundsInDarkMode", false },
- { "ServiceControlsEnabled", false },
- { "ShouldIgnoreMetaViewport", false },
- { "ShouldUseServiceWorkerShortTimeout", false },
- { "UsesBackForwardCache", false },
- { "WebAuthenticationEnabled", true },
- { "WebAuthenticationLocalAuthenticatorEnabled", true },
- };
- return map;
+ static TestFeatures features;
+ if (features.boolWebPreferenceFeatures.empty()) {
+ features.boolWebPreferenceFeatures = {
+ // These are WebPreference values that must always be set as they may
+ // differ from the default set in the WebPreferences*.yaml configuration.
+ { "AllowTopNavigationToDataURLs", true },
+ { "CaptureAudioInGPUProcessEnabled", false },
+ { "CaptureAudioInUIProcessEnabled", false },
+ { "CaptureVideoInGPUProcessEnabled", false },
+ { "CaptureVideoInUIProcessEnabled", false },
+ { "DOMPasteAllowed", true },
+ { "MockScrollbarsEnabled", true },
+ { "ModernMediaControlsEnabled", true },
+ { "NeedsSiteSpecificQuirks", false },
+ { "PageVisibilityBasedProcessSuppressionEnabled", false },
+ { "UsesBackForwardCache", false },
+ { "WebAuthenticationEnabled", true },
+ { "WebAuthenticationLocalAuthenticatorEnabled", true },
+ };
+ features.boolTestRunnerFeatures = {
+ { "allowsLinkPreview", true },
+ { "dumpJSConsoleLogInStdErr", false },
+ { "editable", false },
+ { "enableInAppBrowserPrivacy", false },
+ { "enableProcessSwapOnNavigation", true },
+ { "enableProcessSwapOnWindowOpen", false },
+ { "ignoreSynchronousMessagingTimeouts", false },
+ { "ignoresViewportScaleLimits", false },
+ { "isAppBoundWebView", false },
+ { "runSingly", false },
+ { "shouldHandleRunOpenPanel", true },
+ { "shouldPresentPopovers", true },
+ { "shouldShowTouches", false },
+ { "shouldShowWebView", false },
+ { "spellCheckingDots", false },
+ { "useCharacterSelectionGranularity", false },
+ { "useDataDetection", false },
+ { "useEphemeralSession", false },
+ { "useFlexibleViewport", false },
+ { "useRemoteLayerTree", false },
+ { "useThreadedScrolling", false },
+ };
+ features.doubleTestRunnerFeatures = {
+ { "contentInset.top", 0 },
+ { "deviceScaleFactor", 1 },
+ { "viewHeight", 600 },
+ { "viewWidth", 800 },
+ };
+ features.stringTestRunnerFeatures = {
+ { "additionalSupportedImageTypes", { } },
+ { "applicationBundleIdentifier", { } },
+ { "applicationManifest", { } },
+ { "contentMode", { } },
+ { "jscOptions", { } },
+ { "standaloneWebApplicationURL", { } },
+ };
+ features.stringVectorTestRunnerFeatures = {
+ { "language", { } },
+ };
+ }
+
+ return features;
}
-static const std::unordered_map<std::string, bool>& boolTestRunnerDefaultsMap()
-{
- static std::unordered_map<std::string, bool> map {
- { "allowsLinkPreview", true },
- { "dumpJSConsoleLogInStdErr", false },
- { "editable", false },
- { "enableInAppBrowserPrivacy", false },
- { "enableProcessSwapOnNavigation", true },
- { "enableProcessSwapOnWindowOpen", false },
- { "ignoreSynchronousMessagingTimeouts", false },
- { "ignoresViewportScaleLimits", false },
- { "isAppBoundWebView", false },
- { "runSingly", false },
- { "shouldHandleRunOpenPanel", true },
- { "shouldPresentPopovers", true },
- { "shouldShowTouches", false },
- { "shouldShowWebView", false },
- { "spellCheckingDots", false },
- { "useCharacterSelectionGranularity", false },
- { "useDataDetection", false },
- { "useEphemeralSession", false },
- { "useFlexibleViewport", false },
- { "useRemoteLayerTree", false },
- { "useThreadedScrolling", false },
- };
- return map;
-}
-
-static const std::unordered_map<std::string, double>& doubleTestRunnerDefaultsMap()
-{
- static std::unordered_map<std::string, double> map {
- { "contentInset.top", 0 },
- { "deviceScaleFactor", 1 },
- { "viewHeight", 600 },
- { "viewWidth", 800 },
- };
- return map;
-}
-
-static const std::unordered_map<std::string, std::string>& stringTestRunnerDefaultsMap()
-{
- static std::unordered_map<std::string, std::string> map {
- { "additionalSupportedImageTypes", { } },
- { "applicationBundleIdentifier", { } },
- { "applicationManifest", { } },
- { "contentMode", { } },
- { "jscOptions", { } },
- { "standaloneWebApplicationURL", { } },
- };
- return map;
-}
-
-static const std::unordered_map<std::string, std::vector<std::string>>& stringVectorTestRunnerDefaultsMap()
-{
- static std::unordered_map<std::string, std::vector<std::string>> map {
- { "language", { } },
- };
- return map;
-}
-
const std::unordered_map<std::string, TestHeaderKeyType>& TestOptions::keyTypeMapping()
{
- static std::unordered_map<std::string, TestHeaderKeyType> map {
- { "AcceleratedDrawingEnabled", TestHeaderKeyType::BoolWebPreference },
- { "AllowCrossOriginSubresourcesToAskForCredentials", TestHeaderKeyType::BoolWebPreference },
- { "AllowTopNavigationToDataURLs", TestHeaderKeyType::BoolWebPreference },
- { "AttachmentElementEnabled", TestHeaderKeyType::BoolWebPreference },
- { "CaptureAudioInGPUProcessEnabled", TestHeaderKeyType::BoolWebPreference },
- { "CaptureAudioInUIProcessEnabled", TestHeaderKeyType::BoolWebPreference },
- { "CaptureVideoInGPUProcessEnabled", TestHeaderKeyType::BoolWebPreference },
- { "CaptureVideoInUIProcessEnabled", TestHeaderKeyType::BoolWebPreference },
- { "ColorFilterEnabled", TestHeaderKeyType::BoolWebPreference },
- { "DOMPasteAllowed", TestHeaderKeyType::BoolWebPreference },
- { "InspectorAdditionsEnabled", TestHeaderKeyType::BoolWebPreference },
- { "KeygenElementEnabled", TestHeaderKeyType::BoolWebPreference },
- { "MenuItemElementEnabled", TestHeaderKeyType::BoolWebPreference },
- { "MockScrollbarsEnabled", TestHeaderKeyType::BoolWebPreference },
- { "ModernMediaControlsEnabled", TestHeaderKeyType::BoolWebPreference },
- { "NeedsSiteSpecificQuirks", TestHeaderKeyType::BoolWebPreference },
- { "PageVisibilityBasedProcessSuppressionEnabled", TestHeaderKeyType::BoolWebPreference },
- { "PunchOutWhiteBackgroundsInDarkMode", TestHeaderKeyType::BoolWebPreference },
- { "ServiceControlsEnabled", TestHeaderKeyType::BoolWebPreference },
- { "ShouldIgnoreMetaViewport", TestHeaderKeyType::BoolWebPreference },
- { "ShouldUseServiceWorkerShortTimeout", TestHeaderKeyType::BoolWebPreference },
- { "UsesBackForwardCache", TestHeaderKeyType::BoolWebPreference },
- { "WebAuthenticationEnabled", TestHeaderKeyType::BoolWebPreference },
- { "WebAuthenticationLocalAuthenticatorEnabled", TestHeaderKeyType::BoolWebPreference },
+ static const std::unordered_map<std::string, TestHeaderKeyType> map {
+ GENERATED_WEB_PREFERENCE_KEY_TYPE_MAPPINGS
{ "allowsLinkPreview", TestHeaderKeyType::BoolTestRunner },
{ "dumpJSConsoleLogInStdErr", TestHeaderKeyType::BoolTestRunner },
@@ -192,11 +142,6 @@
return map;
}
-TestOptions::TestOptions(TestFeatures features)
- : m_features { features }
-{
-}
-
bool TestOptions::hasSameInitializationOptions(const TestOptions& options) const
{
if (m_features.experimentalFeatures != options.m_features.experimentalFeatures)
@@ -222,46 +167,42 @@
return true;
}
-std::vector<std::pair<std::string, bool>> TestOptions::boolWKPreferences() const
+bool TestOptions::boolWebPreferenceFeatureValue(std::string key, bool defaultValue) const
{
- std::vector<std::pair<std::string, bool>> result;
-
- for (auto [key, defaultValue] : boolWebPreferencesDefaultsMap())
- result.push_back({ key, boolWebPreferenceFeatureValue(key) });
-
- return result;
+ auto it = m_features.boolWebPreferenceFeatures.find(key);
+ if (it != m_features.boolWebPreferenceFeatures.end())
+ return it->second;
+ return defaultValue;
}
-template<typename T> T featureValue(std::string key, const std::unordered_map<std::string, T>& map, const std::unordered_map<std::string, T>& defaultsMap)
+template<typename T> T testRunnerFeatureValue(std::string key, const std::unordered_map<std::string, T>& map)
{
+ // All test runner features should always exist in their corresponding map since the base/global defaults
+ // contains default values for all of them.
+
auto it = map.find(key);
- if (it != map.end())
- return it->second;
-
- auto defaultsMapIt = defaultsMap.find(key);
- ASSERT(defaultsMapIt != defaultsMap.end());
- return defaultsMapIt->second;
+ ASSERT(it != map.end());
+ return it->second;
}
-bool TestOptions::boolWebPreferenceFeatureValue(std::string key) const
-{
- return featureValue(key, m_features.boolWebPreferenceFeatures, boolWebPreferencesDefaultsMap());
-}
bool TestOptions::boolTestRunnerFeatureValue(std::string key) const
{
- return featureValue(key, m_features.boolTestRunnerFeatures, boolTestRunnerDefaultsMap());
+ return testRunnerFeatureValue(key, m_features.boolTestRunnerFeatures);
}
+
double TestOptions::doubleTestRunnerFeatureValue(std::string key) const
{
- return featureValue(key, m_features.doubleTestRunnerFeatures, doubleTestRunnerDefaultsMap());
+ return testRunnerFeatureValue(key, m_features.doubleTestRunnerFeatures);
}
+
std::string TestOptions::stringTestRunnerFeatureValue(std::string key) const
{
- return featureValue(key, m_features.stringTestRunnerFeatures, stringTestRunnerDefaultsMap());
+ return testRunnerFeatureValue(key, m_features.stringTestRunnerFeatures);
}
+
std::vector<std::string> TestOptions::stringVectorTestRunnerFeatureValue(std::string key) const
{
- return featureValue(key, m_features.stringVectorTestRunnerFeatures, stringVectorTestRunnerDefaultsMap());
+ return testRunnerFeatureValue(key, m_features.stringVectorTestRunnerFeatures);
}
}
Modified: trunk/Tools/WebKitTestRunner/TestOptions.h (268603 => 268604)
--- trunk/Tools/WebKitTestRunner/TestOptions.h 2020-10-16 19:32:39 UTC (rev 268603)
+++ trunk/Tools/WebKitTestRunner/TestOptions.h 2020-10-16 19:37:06 UTC (rev 268604)
@@ -33,51 +33,20 @@
namespace WTR {
-struct ContextOptions {
- std::vector<std::string> overrideLanguages;
- bool ignoreSynchronousMessagingTimeouts;
- bool enableProcessSwapOnNavigation;
- bool enableProcessSwapOnWindowOpen;
- bool useServiceWorkerShortTimeout;
-
- bool hasSameInitializationOptions(const ContextOptions& options) const
- {
- if (ignoreSynchronousMessagingTimeouts != options.ignoreSynchronousMessagingTimeouts
- || overrideLanguages != options.overrideLanguages
- || enableProcessSwapOnNavigation != options.enableProcessSwapOnNavigation
- || enableProcessSwapOnWindowOpen != options.enableProcessSwapOnWindowOpen
- || useServiceWorkerShortTimeout != options.useServiceWorkerShortTimeout)
- return false;
- return true;
- }
-
- bool shouldEnableProcessSwapOnNavigation() const
- {
- return enableProcessSwapOnNavigation || enableProcessSwapOnWindowOpen;
- }
-};
-
class TestOptions {
public:
+ static const TestFeatures& defaults();
static const std::unordered_map<std::string, TestHeaderKeyType>& keyTypeMapping();
- explicit TestOptions(TestFeatures);
-
- ContextOptions contextOptions() const
+ explicit TestOptions(TestFeatures features)
+ : m_features { std::move(features) }
{
- return {
- overrideLanguages(),
- ignoreSynchronousMessagingTimeouts(),
- enableProcessSwapOnNavigation(),
- enableProcessSwapOnWindowOpen(),
- useServiceWorkerShortTimeout()
- };
}
- bool allowTopNavigationToDataURLs() const { return boolWebPreferenceFeatureValue("AllowTopNavigationToDataURLs"); }
- bool enableAttachmentElement() const { return boolWebPreferenceFeatureValue("AttachmentElementEnabled"); }
- bool punchOutWhiteBackgroundsInDarkMode() const { return boolWebPreferenceFeatureValue("PunchOutWhiteBackgroundsInDarkMode"); }
- bool useServiceWorkerShortTimeout() const { return boolWebPreferenceFeatureValue("ShouldUseServiceWorkerShortTimeout"); }
+ bool allowTopNavigationToDataURLs() const { return boolWebPreferenceFeatureValue("AllowTopNavigationToDataURLs", true); }
+ bool enableAttachmentElement() const { return boolWebPreferenceFeatureValue("AttachmentElementEnabled", false); }
+ bool punchOutWhiteBackgroundsInDarkMode() const { return boolWebPreferenceFeatureValue("PunchOutWhiteBackgroundsInDarkMode", false); }
+ bool useServiceWorkerShortTimeout() const { return boolWebPreferenceFeatureValue("ShouldUseServiceWorkerShortTimeout", false); }
bool allowsLinkPreview() const { return boolTestRunnerFeatureValue("allowsLinkPreview"); }
bool dumpJSConsoleLogInStdErr() const { return boolTestRunnerFeatureValue("dumpJSConsoleLogInStdErr"); }
@@ -112,15 +81,23 @@
std::string standaloneWebApplicationURL() const { return stringTestRunnerFeatureValue("standaloneWebApplicationURL"); }
std::vector<std::string> overrideLanguages() const { return stringVectorTestRunnerFeatureValue("language"); }
+ bool shouldEnableProcessSwapOnNavigation() const
+ {
+ return enableProcessSwapOnNavigation() || enableProcessSwapOnWindowOpen();
+ }
+
const std::unordered_map<std::string, bool>& experimentalFeatures() const { return m_features.experimentalFeatures; }
const std::unordered_map<std::string, bool>& internalDebugFeatures() const { return m_features.internalDebugFeatures; }
- std::vector<std::pair<std::string, bool>> boolWKPreferences() const;
+ const std::unordered_map<std::string, bool>& boolWebPreferenceFeatures() const { return m_features.boolWebPreferenceFeatures; }
+ const std::unordered_map<std::string, double>& doubleWebPreferenceFeatures() const { return m_features.doubleWebPreferenceFeatures; }
+ const std::unordered_map<std::string, uint32_t>& uint32WebPreferenceFeatures() const { return m_features.uint32WebPreferenceFeatures; }
+ const std::unordered_map<std::string, std::string>& stringWebPreferenceFeatures() const { return m_features.stringWebPreferenceFeatures; }
bool hasSameInitializationOptions(const TestOptions&) const;
private:
- bool boolWebPreferenceFeatureValue(std::string key) const;
+ bool boolWebPreferenceFeatureValue(std::string key, bool defaultValue) const;
bool boolTestRunnerFeatureValue(std::string key) const;
double doubleTestRunnerFeatureValue(std::string key) const;
std::string stringTestRunnerFeatureValue(std::string key) const;
Modified: trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj (268603 => 268604)
--- trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2020-10-16 19:32:39 UTC (rev 268603)
+++ trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2020-10-16 19:37:06 UTC (rev 268604)
@@ -351,6 +351,10 @@
6510A78111EC643800410867 /* WebKitWeightWatcher900.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = WebKitWeightWatcher900.ttf; path = fonts/WebKitWeightWatcher900.ttf; sourceTree = "<group>"; };
65EB859D11EC67CC0034D300 /* ActivateFonts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ActivateFonts.h; sourceTree = "<group>"; };
65EB859F11EC67CC0034D300 /* ActivateFontsCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ActivateFontsCocoa.mm; sourceTree = "<group>"; };
+ 7C8A1F5625351EC600C5291E /* TestOptionsGeneratedKeys.h.erb */ = {isa = PBXFileReference; lastKnownFileType = text; path = TestOptionsGeneratedKeys.h.erb; sourceTree = "<group>"; };
+ 7C8A1F5725351EC600C5291E /* check-xcfilelists.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "check-xcfilelists.sh"; sourceTree = "<group>"; };
+ 7C8A1F5825351EC600C5291E /* generate-derived-sources.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "generate-derived-sources.sh"; sourceTree = "<group>"; };
+ 7CAA0E7625353BF500C519E5 /* TestOptionsGeneratedKeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestOptionsGeneratedKeys.h; sourceTree = "<group>"; };
7CFF9BC52534AF1D0008009F /* TestFeatures.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestFeatures.h; path = ../TestRunnerShared/TestFeatures.h; sourceTree = "<group>"; };
7CFF9BC62534AF1D0008009F /* TestFeatures.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TestFeatures.cpp; path = ../TestRunnerShared/TestFeatures.cpp; sourceTree = "<group>"; };
7CFF9BC72534AF1D0008009F /* TestCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TestCommand.cpp; path = ../TestRunnerShared/TestCommand.cpp; sourceTree = "<group>"; };
@@ -480,16 +484,17 @@
isa = PBXGroup;
children = (
49AEEF692407278200C87E4C /* Info.plist */,
- 0F18E71A1D6BC4BC0027E547 /* TestRunnerShared */,
BC952EC511F3C10F003398B4 /* DerivedSources.make */,
2EE52CEA1890A9A80010ED21 /* WebKitTestRunnerApp-Info.plist */,
BC99CBF11207642D00FDEE76 /* Shared */,
08FB7795FE84155DC02AAC07 /* TestRunner */,
+ 0F18E71A1D6BC4BC0027E547 /* TestRunnerShared */,
BC25183511D1571D002EBC01 /* InjectedBundle */,
BC793401118F7C8A005EA8E2 /* Configurations */,
08FB779DFE84155DC02AAC07 /* External Frameworks and Libraries */,
BC25194411D15DBE002EBC01 /* Resources */,
2EE52CE81890A9A80010ED21 /* WebKitTestRunnerApp */,
+ 7C8A1F5425351EC600C5291E /* Scripts */,
2EE52CE11890A9A80010ED21 /* Frameworks */,
1AB674ADFE9D54B511CA2CBB /* Products */,
);
@@ -499,6 +504,7 @@
08FB7795FE84155DC02AAC07 /* TestRunner */ = {
isa = PBXGroup;
children = (
+ 7CAA0E7525353BC500C519E5 /* Derived Sources */,
BC9192021333E4CD003011DC /* cg */,
0FEB90A11905BC4A000FDBF3 /* cocoa */,
2EE52D121890A9FB0010ED21 /* ios */,
@@ -750,6 +756,33 @@
path = mac;
sourceTree = "<group>";
};
+ 7C8A1F5425351EC600C5291E /* Scripts */ = {
+ isa = PBXGroup;
+ children = (
+ 7C8A1F5525351EC600C5291E /* PreferencesTemplates */,
+ 7C8A1F5725351EC600C5291E /* check-xcfilelists.sh */,
+ 7C8A1F5825351EC600C5291E /* generate-derived-sources.sh */,
+ );
+ path = Scripts;
+ sourceTree = "<group>";
+ };
+ 7C8A1F5525351EC600C5291E /* PreferencesTemplates */ = {
+ isa = PBXGroup;
+ children = (
+ 7C8A1F5625351EC600C5291E /* TestOptionsGeneratedKeys.h.erb */,
+ );
+ path = PreferencesTemplates;
+ sourceTree = "<group>";
+ };
+ 7CAA0E7525353BC500C519E5 /* Derived Sources */ = {
+ isa = PBXGroup;
+ children = (
+ 7CAA0E7625353BF500C519E5 /* TestOptionsGeneratedKeys.h */,
+ );
+ name = "Derived Sources";
+ path = DerivedSources/WebKitTestRunner;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
BC14E4E0120E02F900826C0C /* Controllers */ = {
isa = PBXGroup;
children = (
_______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
