Diff
Modified: trunk/Tools/ChangeLog (268494 => 268495)
--- trunk/Tools/ChangeLog 2020-10-14 22:47:26 UTC (rev 268494)
+++ trunk/Tools/ChangeLog 2020-10-14 22:52:56 UTC (rev 268495)
@@ -1,3 +1,26 @@
+2020-10-14 Sam Weinig <wei...@apple.com>
+
+ [Testing] Generate test header key map for DumpRenderTree
+ https://bugs.webkit.org/show_bug.cgi?id=217723
+
+ Reviewed by Tim Horton.
+
+ Copy test header command type generation from WebKitTestRunner to DumpRenderTree, to
+ begin support for using any WebPreference from DumpRenderTree. This does not actually
+ change any behavior yet, just updates the key mapping.
+
+ * DumpRenderTree/CMakeLists.txt:
+ * DumpRenderTree/DerivedSources-input.xcfilelist:
+ * DumpRenderTree/DerivedSources-output.xcfilelist:
+ * DumpRenderTree/DerivedSources.make:
+ * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
+ * DumpRenderTree/Scripts/PreferencesTemplates: Added.
+ * DumpRenderTree/Scripts/PreferencesTemplates/TestOptionsGeneratedKeys.h.erb: Added.
+ * DumpRenderTree/TestOptions.cpp:
+ (WTR::TestOptions::keyTypeMapping):
+ * DumpRenderTree/TestOptions.h:
+ * DumpRenderTree/mac/Configurations/Base.xcconfig:
+
2020-10-14 Alexey Proskuryakov <a...@apple.com>
Remove WebKitLauncher
Modified: trunk/Tools/DumpRenderTree/CMakeLists.txt (268494 => 268495)
--- trunk/Tools/DumpRenderTree/CMakeLists.txt 2020-10-14 22:47:26 UTC (rev 268494)
+++ trunk/Tools/DumpRenderTree/CMakeLists.txt 2020-10-14 22:52:56 UTC (rev 268495)
@@ -39,6 +39,29 @@
${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
)
+set(DumpRenderTree_WEB_PREFERENCES_TEMPLATES
+ ${DumpRenderTree_DIR}/Scripts/PreferencesTemplates/TestOptionsGeneratedKeys.h.erb
+)
+
+set(DumpRenderTree_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(${DumpRenderTree_WEB_PREFERENCES} PROPERTIES GENERATED TRUE)
+
+add_custom_command(
+ OUTPUT ${DumpRenderTree_DERIVED_SOURCES_DIR}/TestOptionsGeneratedKeys.h
+ DEPENDS ${DumpRenderTree_WEB_PREFERENCES_TEMPLATES} ${DumpRenderTree_WEB_PREFERENCES} WTF_CopyPreferences
+ COMMAND ${RUBY_EXECUTABLE} ${WTF_SCRIPTS_DIR}/GeneratePreferences.rb --frontend WebKitLegacy --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 "${DumpRenderTree_DERIVED_SOURCES_DIR}" --template ${DumpRenderTree_DIR}/Scripts/PreferencesTemplates/TestOptionsGeneratedKeys.h.erb
+ VERBATIM)
+
+list(APPEND DumpRenderTree_SOURCES
+ ${DumpRenderTree_DERIVED_SOURCES_DIR}/TestOptionsGeneratedKeys.h
+)
+
WEBKIT_EXECUTABLE_DECLARE(DumpRenderTree)
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
WEBKIT_EXECUTABLE(DumpRenderTree)
Modified: trunk/Tools/DumpRenderTree/DerivedSources-input.xcfilelist (268494 => 268495)
--- trunk/Tools/DumpRenderTree/DerivedSources-input.xcfilelist 2020-10-14 22:47:26 UTC (rev 268494)
+++ trunk/Tools/DumpRenderTree/DerivedSources-input.xcfilelist 2020-10-14 22:52:56 UTC (rev 268495)
@@ -1,6 +1,12 @@
# 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)/Bindings/CodeGeneratorDumpRenderTree.pm
+$(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/DumpRenderTree/DerivedSources-output.xcfilelist (268494 => 268495)
--- trunk/Tools/DumpRenderTree/DerivedSources-output.xcfilelist 2020-10-14 22:47:26 UTC (rev 268494)
+++ trunk/Tools/DumpRenderTree/DerivedSources-output.xcfilelist 2020-10-14 22:52:56 UTC (rev 268495)
@@ -1,3 +1,4 @@
# This file is generated by the generate-xcfilelists script.
$(BUILT_PRODUCTS_DIR)/DerivedSources/DumpRenderTree/JSUIScriptController.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/DumpRenderTree/JSUIScriptController.h
+$(BUILT_PRODUCTS_DIR)/DerivedSources/DumpRenderTree/TestOptionsGeneratedKeys.h
Modified: trunk/Tools/DumpRenderTree/DerivedSources.make (268494 => 268495)
--- trunk/Tools/DumpRenderTree/DerivedSources.make 2020-10-14 22:47:26 UTC (rev 268494)
+++ trunk/Tools/DumpRenderTree/DerivedSources.make 2020-10-14 22:52:56 UTC (rev 268495)
@@ -1,4 +1,4 @@
-# Copyright (C) 2016 Apple Inc. All rights reserved.
+# Copyright (C) 2016-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
@@ -21,6 +21,27 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
# THE POSSIBILITY OF SUCH DAMAGE.
+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 = \
+ $(DumpRenderTree)/Scripts/PreferencesTemplates/TestOptionsGeneratedKeys.h.erb \
+#
+WEB_PREFERENCES_FILES = $(basename $(notdir $(WEB_PREFERENCES_TEMPLATES)))
+WEB_PREFERENCES_PATTERNS = $(subst .,%,$(WEB_PREFERENCES_FILES))
+
+all : $(WEB_PREFERENCES_FILES)
+
+$(WEB_PREFERENCES_PATTERNS) : $(WTF_BUILD_SCRIPTS_DIR)/GeneratePreferences.rb $(WEB_PREFERENCES_TEMPLATES) $(WEB_PREFERENCES)
+ $(RUBY) $< --frontend WebKitLegacy --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))
+
+
UISCRIPTCONTEXT_DIR = $(DumpRenderTree)/../TestRunnerShared/UIScriptContext/Bindings
VPATH = \
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (268494 => 268495)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2020-10-14 22:47:26 UTC (rev 268494)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2020-10-14 22:52:56 UTC (rev 268495)
@@ -330,6 +330,10 @@
53CBB830134E42F3001CE6A4 /* CyclicRedundancyCheck.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CyclicRedundancyCheck.cpp; sourceTree = "<group>"; };
53CBB831134E42F3001CE6A4 /* CyclicRedundancyCheck.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CyclicRedundancyCheck.h; sourceTree = "<group>"; };
5DE8AE4313A2C15800D6A37D /* libWebCoreTestSupport.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libWebCoreTestSupport.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+ 7C44697F25377A020024290A /* TestOptionsGeneratedKeys.h.erb */ = {isa = PBXFileReference; lastKnownFileType = text; path = TestOptionsGeneratedKeys.h.erb; sourceTree = "<group>"; };
+ 7C44698025377A020024290A /* check-xcfilelists.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "check-xcfilelists.sh"; sourceTree = "<group>"; };
+ 7C44698125377A020024290A /* generate-derived-sources.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "generate-derived-sources.sh"; sourceTree = "<group>"; };
+ 7C44698525377E520024290A /* TestOptionsGeneratedKeys.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = TestOptionsGeneratedKeys.h; path = TestOptionsGeneratedKeys.h; sourceTree = "<group>"; };
7CBBC3221DDFCF9A00786B9D /* TestOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestOptions.h; sourceTree = "<group>"; };
7CFF9BBD2533BB240008009F /* TestFeatures.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TestFeatures.h; sourceTree = "<group>"; };
7CFF9BBE2533BB240008009F /* TestFeatures.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TestFeatures.cpp; sourceTree = "<group>"; };
@@ -497,6 +501,7 @@
isa = PBXGroup;
children = (
0F18E6F11D6B9C640027E547 /* DerivedSources.make */,
+ 7C44698225377C340024290A /* Derived Sources */,
3148A0651E6F90F400D3B316 /* TestRunnerShared */,
0F18E6E71D6B9BF50027E547 /* UIScriptContext */,
A1158D6A18927CE10088C17B /* ios */,
@@ -529,8 +534,9 @@
9345229B0BD12B2C0086EDA0 /* Resources */,
417DA9181373674D007C57FB /* WebCoreTestSupport */,
A803FF6409CAACC1009B2A37 /* Frameworks */,
+ 7C44697D25377A020024290A /* Scripts */,
+ BCB281ED0CFA711D007E533E /* Configurations */,
9340995508540CAF007F3BC8 /* Products */,
- BCB281ED0CFA711D007E533E /* Configurations */,
);
name = DumpRenderTree;
sourceTree = "<group>";
@@ -750,6 +756,33 @@
name = WebCoreTestSupport;
sourceTree = "<group>";
};
+ 7C44697D25377A020024290A /* Scripts */ = {
+ isa = PBXGroup;
+ children = (
+ 7C44697E25377A020024290A /* PreferencesTemplates */,
+ 7C44698025377A020024290A /* check-xcfilelists.sh */,
+ 7C44698125377A020024290A /* generate-derived-sources.sh */,
+ );
+ path = Scripts;
+ sourceTree = "<group>";
+ };
+ 7C44697E25377A020024290A /* PreferencesTemplates */ = {
+ isa = PBXGroup;
+ children = (
+ 7C44697F25377A020024290A /* TestOptionsGeneratedKeys.h.erb */,
+ );
+ path = PreferencesTemplates;
+ sourceTree = "<group>";
+ };
+ 7C44698225377C340024290A /* Derived Sources */ = {
+ isa = PBXGroup;
+ children = (
+ 7C44698525377E520024290A /* TestOptionsGeneratedKeys.h */,
+ );
+ name = "Derived Sources";
+ path = DerivedSources/DumpRenderTree;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
9340995508540CAF007F3BC8 /* Products */ = {
isa = PBXGroup;
children = (
Added: trunk/Tools/DumpRenderTree/Scripts/PreferencesTemplates/TestOptionsGeneratedKeys.h.erb (0 => 268495)
--- trunk/Tools/DumpRenderTree/Scripts/PreferencesTemplates/TestOptionsGeneratedKeys.h.erb (rev 0)
+++ trunk/Tools/DumpRenderTree/Scripts/PreferencesTemplates/TestOptionsGeneratedKeys.h.erb 2020-10-14 22:52:56 UTC (rev 268495)
@@ -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/DumpRenderTree/TestOptions.cpp (268494 => 268495)
--- trunk/Tools/DumpRenderTree/TestOptions.cpp 2020-10-14 22:47:26 UTC (rev 268494)
+++ trunk/Tools/DumpRenderTree/TestOptions.cpp 2020-10-14 22:52:56 UTC (rev 268495)
@@ -26,8 +26,7 @@
#include "config.h"
#include "TestOptions.h"
-#include "TestFeatures.h"
-#include <string>
+#include "TestOptionsGeneratedKeys.h"
namespace WTR {
@@ -34,17 +33,7 @@
const std::unordered_map<std::string, TestHeaderKeyType>& TestOptions::keyTypeMapping()
{
static const std::unordered_map<std::string, TestHeaderKeyType> map {
- { "AcceleratedDrawingEnabled", TestHeaderKeyType::BoolWebPreference },
- { "AllowCrossOriginSubresourcesToAskForCredentials", TestHeaderKeyType::BoolWebPreference },
- { "AllowTopNavigationToDataURLs", TestHeaderKeyType::BoolWebPreference },
- { "AttachmentElementEnabled", TestHeaderKeyType::BoolWebPreference },
- { "ColorFilterEnabled", TestHeaderKeyType::BoolWebPreference },
- { "InspectorAdditionsEnabled", TestHeaderKeyType::BoolWebPreference },
- { "IntersectionObserverEnabled", TestHeaderKeyType::BoolWebPreference },
- { "KeygenElementEnabled", TestHeaderKeyType::BoolWebPreference },
- { "MenuItemElementEnabled", TestHeaderKeyType::BoolWebPreference },
- { "ModernMediaControlsEnabled", TestHeaderKeyType::BoolWebPreference },
- { "UsesBackForwardCache", TestHeaderKeyType::BoolWebPreference },
+ GENERATED_WEB_PREFERENCE_KEY_TYPE_MAPPINGS
{ "dumpJSConsoleLogInStdErr", TestHeaderKeyType::BoolTestRunner },
{ "enableDragDestinationActionLoad", TestHeaderKeyType::BoolTestRunner },
Modified: trunk/Tools/DumpRenderTree/TestOptions.h (268494 => 268495)
--- trunk/Tools/DumpRenderTree/TestOptions.h 2020-10-14 22:47:26 UTC (rev 268494)
+++ trunk/Tools/DumpRenderTree/TestOptions.h 2020-10-14 22:52:56 UTC (rev 268495)
@@ -32,37 +32,47 @@
namespace WTR {
struct TestOptions {
+ // FIXME: Remove these and replace with access to TestFeatures set.
+ // Web Preferences
+ bool allowCrossOriginSubresourcesToAskForCredentials { false };
+ bool allowTopNavigationToDataURLs { true };
+ bool enableAcceleratedDrawing { false };
bool enableAttachmentElement { false };
- bool enableAcceleratedDrawing { false };
+ bool enableBackForwardCache { false };
+ bool enableColorFilter { false };
+ bool enableInspectorAdditions { false };
bool enableIntersectionObserver { false };
- bool useEphemeralSession { false };
- bool enableBackForwardCache { false };
+ bool enableKeygenElement { false };
bool enableMenuItemElement { false };
- bool enableKeygenElement { false };
bool enableModernMediaControls { true };
- bool enableDragDestinationActionLoad { false };
- bool layerBackedWebView { false };
- bool enableInspectorAdditions { false };
- bool dumpJSConsoleLogInStdErr { false };
- bool allowCrossOriginSubresourcesToAskForCredentials { false };
- bool enableColorFilter { false };
- bool enableSelectionAcrossShadowBoundaries { true };
- bool enableWebGPU { false };
+
+ // FIXME: Remove these and replace with access to TestFeatures set.
+ // Internal Features
bool enableCSSLogical { false };
bool enableLineHeightUnits { false };
+ bool enableSelectionAcrossShadowBoundaries { true };
+ bool layoutFormattingContextIntegrationEnabled { true };
+
+ // FIXME: Remove these and replace with access to TestFeatures set.
+ // Experimental Features
bool adClickAttributionEnabled { false };
- bool enableResizeObserver { false };
+ bool enableAspectRatioOfImgFromWidthAndHeight { false };
+ bool enableAsyncClipboardAPI { false };
bool enableCSSOMViewSmoothScrolling { false };
+ bool enableContactPickerAPI { false };
bool enableCoreMathML { false };
bool enableRequestIdleCallback { false };
- bool enableAsyncClipboardAPI { false };
- bool enableContactPickerAPI { false };
- bool layoutFormattingContextIntegrationEnabled { true };
- bool enableAspectRatioOfImgFromWidthAndHeight { false };
+ bool enableResizeObserver { false };
+ bool enableWebGPU { false };
+
+ // Test Runner Specific Features
+ bool dumpJSConsoleLogInStdErr { false };
+ bool enableDragDestinationActionLoad { false };
bool enableWebSQL { true };
- bool allowTopNavigationToDataURLs { true };
+ bool layerBackedWebView { false };
+ bool useEphemeralSession { false };
+ std::string additionalSupportedImageTypes;
std::string jscOptions;
- std::string additionalSupportedImageTypes;
explicit TestOptions(TestFeatures);
bool webViewIsCompatibleWithOptions(const TestOptions&) const;
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig (268494 => 268495)
--- trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2020-10-14 22:47:26 UTC (rev 268494)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2020-10-14 22:52:56 UTC (rev 268495)
@@ -103,6 +103,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);
@@ -129,6 +137,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 ForwardingHeaders $(HEADER_SEARCH_PATHS_$(WK_COCOA_TOUCH));
HEADER_SEARCH_PATHS_ = mac/InternalHeaders $(NEXT_ROOT)/usr/local/include/WebCoreTestSupport;
