Attachment 342377 Details for Bug 186463 – Patch to see if anything breaksh

[patch] Patch to see if anything breaksh

file_186463.txt (text/plain), 58.05 KB, created by mitz on 2018-06-09 19:05:59 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: mitz

Created: 2018-06-09 19:05:59 PDT

Size: 58.05 KB

patch

obsolete

>Index: Source/JavaScriptCore/Configurations/Base.xcconfig
>===================================================================
>--- Source/JavaScriptCore/Configurations/Base.xcconfig	(revision 232663)
>+++ Source/JavaScriptCore/Configurations/Base.xcconfig	(working copy)
>@@ -95,7 +95,6 @@ WARNING_CFLAGS = -Wall -Wextra -Wcast-qu
> HEADER_SEARCH_PATHS = . "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS);
> 
> TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
>-TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
> TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
> TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
> TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
>@@ -106,9 +105,8 @@ CODE_SIGN_IDENTITY = -;
> 
> SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
> 
>-WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
>-WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS)_$(USE_INTERNAL_SDK));
>-WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_YES_ = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(IPHONEOS_DEPLOYMENT_TARGET:base);
>+WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_$(USE_INTERNAL_SDK));
>+WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_ = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(IPHONEOS_DEPLOYMENT_TARGET:base);
> 
> FRAMEWORK_SEARCH_PATHS = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR) $(WK_PRIVATE_FRAMEWORK_STUBS_DIR);
> 
>Index: Source/JavaScriptCore/Configurations/DebugRelease.xcconfig
>===================================================================
>--- Source/JavaScriptCore/Configurations/DebugRelease.xcconfig	(revision 232663)
>+++ Source/JavaScriptCore/Configurations/DebugRelease.xcconfig	(working copy)
>@@ -30,7 +30,6 @@ ONLY_ACTIVE_ARCH = YES;
> TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
> 
> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
> MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
> MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
> MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
>Index: Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>===================================================================
>--- Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig	(revision 232663)
>+++ Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig	(working copy)
>@@ -43,8 +43,7 @@ ENABLE_ACCELERATED_OVERFLOW_SCROLLING_co
> ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(WK_PLATFORM_NAME));
> ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
> ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
>-ENABLE_APPLE_PAY_macosx = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
>-ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
>+ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY;
> 
> ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
> ENABLE_APPLE_PAY_SESSION_V3_iphoneos = ENABLE_APPLE_PAY_SESSION_V3;
>@@ -338,16 +337,7 @@ ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 
> 
> ENABLE_VIDEO = ENABLE_VIDEO;
> 
>-ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
>-ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_iphoneminimalsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_iphonesimulator = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_watchsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_appletvos = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_appletvsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_macosx = $(ENABLE_VIDEO_PRESENTATION_MODE$(WK_MACOS_1012));
>-ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE;
>+ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
> 
> ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
> 
>Index: Source/JavaScriptCore/Configurations/Version.xcconfig
>===================================================================
>--- Source/JavaScriptCore/Configurations/Version.xcconfig	(revision 232663)
>+++ Source/JavaScriptCore/Configurations/Version.xcconfig	(working copy)
>@@ -35,7 +35,6 @@ SHORT_VERSION_STRING = $(SHORT_VERSION_S
> // The system version prefix is based on the current system version.
> SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
> SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
> SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
> SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
> SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
>Index: Source/JavaScriptCore/Configurations/WebKitTargetConditionals.xcconfig
>===================================================================
>--- Source/JavaScriptCore/Configurations/WebKitTargetConditionals.xcconfig	(revision 232663)
>+++ Source/JavaScriptCore/Configurations/WebKitTargetConditionals.xcconfig	(working copy)
>@@ -48,40 +48,18 @@
> 
> // macOS
> 
>-WK_MACOS_BEFORE_1012 = $(WK_MACOS_BEFORE_1012_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-WK_MACOS_BEFORE_1012_101100 = YES;
>-
> WK_MACOS_BEFORE_1013 = $(WK_MACOS_BEFORE_1013_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-WK_MACOS_BEFORE_1013_101100 = YES;
> WK_MACOS_BEFORE_1013_101200 = YES;
> 
> WK_MACOS_BEFORE_1014 = $(WK_MACOS_BEFORE_1014_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-WK_MACOS_BEFORE_1014_101100 = YES;
> WK_MACOS_BEFORE_1014_101200 = YES;
> WK_MACOS_BEFORE_1014_101300 = YES;
> 
> WK_MACOS_BEFORE_1015 = $(WK_MACOS_BEFORE_1015_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-WK_MACOS_BEFORE_1015_101100 = YES;
> WK_MACOS_BEFORE_1015_101200 = YES;
> WK_MACOS_BEFORE_1015_101300 = YES;
> WK_MACOS_BEFORE_1015_101400 = YES;
> 
>-WK_MACOS_1012 = $(WK_MACOS_1012_$(WK_MACOS_BEFORE_1012));
>-WK_MACOS_1012_ = _MACOS_SINCE_1012;
>-WK_MACOS_1012_YES = _MACOS_BEFORE_1012;
>-
>-WK_MACOS_1012_1013 = $(WK_MACOS_1012_1013_$(WK_MACOS_BEFORE_1012));
>-WK_MACOS_1012_1013_ = $(WK_MACOS_1013);
>-WK_MACOS_1012_1013_YES = _MACOS_BEFORE_1012;
>-
>-WK_MACOS_1012_1014 = $(WK_MACOS_1012_1014_$(WK_MACOS_BEFORE_1012));
>-WK_MACOS_1012_1014_ = $(WK_MACOS_1014);
>-WK_MACOS_1012_1014_YES = _MACOS_BEFORE_1012;
>-
>-WK_MACOS_1012_1015 = $(WK_MACOS_1012_1015_$(WK_MACOS_BEFORE_1012));
>-WK_MACOS_1012_1015_ = $(WK_MACOS_1015);
>-WK_MACOS_1012_1015_YES = _MACOS_BEFORE_1012;
>-
> WK_MACOS_1013 = $(WK_MACOS_1013_$(WK_MACOS_BEFORE_1013));
> WK_MACOS_1013_ = _MACOS_SINCE_1013;
> WK_MACOS_1013_YES = _MACOS_BEFORE_1013;
>Index: Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
>===================================================================
>--- Source/ThirdParty/ANGLE/Configurations/Base.xcconfig	(revision 232663)
>+++ Source/ThirdParty/ANGLE/Configurations/Base.xcconfig	(working copy)
>@@ -55,7 +55,6 @@ WARNING_CFLAGS = -Wglobal-constructors -
> SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
> 
> TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
>-TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
> TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
> TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
> TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
>Index: Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig
>===================================================================
>--- Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig	(revision 232663)
>+++ Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig	(working copy)
>@@ -7,7 +7,6 @@ ONLY_ACTIVE_ARCH = YES;
> TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
> 
> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
> MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
> MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
> MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
>Index: Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig
>===================================================================
>--- Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig	(revision 232663)
>+++ Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig	(working copy)
>@@ -56,7 +56,6 @@ SUPPORTED_PLATFORMS = iphoneos iphonesim
> VALID_ARCHS = $(ARCHS_STANDARD_64_BIT);
> 
> TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
>-TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
> TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
> TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
> TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
>Index: Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig
>===================================================================
>--- Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig	(revision 232663)
>+++ Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig	(working copy)
>@@ -7,7 +7,6 @@ ONLY_ACTIVE_ARCH = YES;
> TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
> 
> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
> MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
> MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
> MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
>Index: Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
>===================================================================
>--- Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	(revision 232663)
>+++ Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	(working copy)
>@@ -35,10 +35,10 @@ SHORT_VERSION_STRING = $(SHORT_VERSION_S
> // The system version prefix is based on the current system version.
> SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
> SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-SYSTEM_VERSION_PREFIX_macosx_101000 = 10;
>-SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
> SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
> SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
>+SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
>+SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
> 
> // The production build always uses the full version with a system version prefix.
> BUNDLE_VERSION_Production = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);
>Index: Source/ThirdParty/libwebrtc/Configurations/WebKitTargetConditionals.xcconfig
>===================================================================
>--- Source/ThirdParty/libwebrtc/Configurations/WebKitTargetConditionals.xcconfig	(revision 232663)
>+++ Source/ThirdParty/libwebrtc/Configurations/WebKitTargetConditionals.xcconfig	(working copy)
>@@ -48,40 +48,18 @@
> 
> // macOS
> 
>-WK_MACOS_BEFORE_1012 = $(WK_MACOS_BEFORE_1012_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-WK_MACOS_BEFORE_1012_101100 = YES;
>-
> WK_MACOS_BEFORE_1013 = $(WK_MACOS_BEFORE_1013_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-WK_MACOS_BEFORE_1013_101100 = YES;
> WK_MACOS_BEFORE_1013_101200 = YES;
> 
> WK_MACOS_BEFORE_1014 = $(WK_MACOS_BEFORE_1014_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-WK_MACOS_BEFORE_1014_101100 = YES;
> WK_MACOS_BEFORE_1014_101200 = YES;
> WK_MACOS_BEFORE_1014_101300 = YES;
> 
> WK_MACOS_BEFORE_1015 = $(WK_MACOS_BEFORE_1015_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-WK_MACOS_BEFORE_1015_101100 = YES;
> WK_MACOS_BEFORE_1015_101200 = YES;
> WK_MACOS_BEFORE_1015_101300 = YES;
> WK_MACOS_BEFORE_1015_101400 = YES;
> 
>-WK_MACOS_1012 = $(WK_MACOS_1012_$(WK_MACOS_BEFORE_1012));
>-WK_MACOS_1012_ = _MACOS_SINCE_1012;
>-WK_MACOS_1012_YES = _MACOS_BEFORE_1012;
>-
>-WK_MACOS_1012_1013 = $(WK_MACOS_1012_1013_$(WK_MACOS_BEFORE_1012));
>-WK_MACOS_1012_1013_ = $(WK_MACOS_1013);
>-WK_MACOS_1012_1013_YES = _MACOS_BEFORE_1012;
>-
>-WK_MACOS_1012_1014 = $(WK_MACOS_1012_1014_$(WK_MACOS_BEFORE_1012));
>-WK_MACOS_1012_1014_ = $(WK_MACOS_1014);
>-WK_MACOS_1012_1014_YES = _MACOS_BEFORE_1012;
>-
>-WK_MACOS_1012_1015 = $(WK_MACOS_1012_1015_$(WK_MACOS_BEFORE_1012));
>-WK_MACOS_1012_1015_ = $(WK_MACOS_1015);
>-WK_MACOS_1012_1015_YES = _MACOS_BEFORE_1012;
>-
> WK_MACOS_1013 = $(WK_MACOS_1013_$(WK_MACOS_BEFORE_1013));
> WK_MACOS_1013_ = _MACOS_SINCE_1013;
> WK_MACOS_1013_YES = _MACOS_BEFORE_1013;
>Index: Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig
>===================================================================
>--- Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig	(revision 232663)
>+++ Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig	(working copy)
>@@ -20,7 +20,5 @@ GCC_PREPROCESSOR_DEFINITIONS[arch=x86_64
> EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *_sse.c *_sse2.c;
> EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = $(EXCLUDED_SOURCE_FILE_NAMES_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
> 
>-// El Capitan and iossimulator can't use SSE4 intrinsics, but Sierra and newer can.
>-EXCLUDED_SOURCE_FILE_NAMES_macosx_101100 = NSQ_sse.c VAD_sse.c VQ_WMat_EC_sse.c NSQ_del_dec_sse.c;
>-SSE4_FLAG[sdk=macosx*] = $(SSE4_FLAG$(WK_MACOS_1012));
>-SSE4_FLAG_MACOS_SINCE_1012 = OPUS_X86_MAY_HAVE_SSE4_1;
>+// The iOS Simulator can't use SSE4 intrinsics, but macOS can.
>+SSE4_FLAG[sdk=macosx*] = OPUS_X86_MAY_HAVE_SSE4_1;
>Index: Source/WTF/Configurations/Base.xcconfig
>===================================================================
>--- Source/WTF/Configurations/Base.xcconfig	(revision 232663)
>+++ Source/WTF/Configurations/Base.xcconfig	(working copy)
>@@ -96,7 +96,6 @@ SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$
> LIBRARY_SEARCH_PATHS = $(SDK_DIR)$(WTF_INSTALL_PATH_PREFIX)/usr/local/lib $(inherited);
> 
> TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
>-TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
> TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
> TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
> TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
>Index: Source/WTF/Configurations/DebugRelease.xcconfig
>===================================================================
>--- Source/WTF/Configurations/DebugRelease.xcconfig	(revision 232663)
>+++ Source/WTF/Configurations/DebugRelease.xcconfig	(working copy)
>@@ -29,7 +29,6 @@ ONLY_ACTIVE_ARCH = YES;
> TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
> 
> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
> MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
> MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
> MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
>Index: Source/WebCore/Configurations/Base.xcconfig
>===================================================================
>--- Source/WebCore/Configurations/Base.xcconfig	(revision 232663)
>+++ Source/WebCore/Configurations/Base.xcconfig	(working copy)
>@@ -84,7 +84,6 @@ GCC_WARN_UNUSED_VARIABLE = YES;
> WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wno-unknown-warning-option;
> 
> TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
>-TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
> TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
> TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
> TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
>Index: Source/WebCore/Configurations/DebugRelease.xcconfig
>===================================================================
>--- Source/WebCore/Configurations/DebugRelease.xcconfig	(revision 232663)
>+++ Source/WebCore/Configurations/DebugRelease.xcconfig	(working copy)
>@@ -30,7 +30,6 @@ ONLY_ACTIVE_ARCH = YES;
> TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
> 
> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
> MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
> MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
> MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
>Index: Source/WebCore/Configurations/FeatureDefines.xcconfig
>===================================================================
>--- Source/WebCore/Configurations/FeatureDefines.xcconfig	(revision 232663)
>+++ Source/WebCore/Configurations/FeatureDefines.xcconfig	(working copy)
>@@ -43,8 +43,7 @@ ENABLE_ACCELERATED_OVERFLOW_SCROLLING_co
> ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(WK_PLATFORM_NAME));
> ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
> ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
>-ENABLE_APPLE_PAY_macosx = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
>-ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
>+ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY;
> 
> ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
> ENABLE_APPLE_PAY_SESSION_V3_iphoneos = ENABLE_APPLE_PAY_SESSION_V3;
>@@ -338,16 +337,7 @@ ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 
> 
> ENABLE_VIDEO = ENABLE_VIDEO;
> 
>-ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
>-ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_iphoneminimalsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_iphonesimulator = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_watchsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_appletvos = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_appletvsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_macosx = $(ENABLE_VIDEO_PRESENTATION_MODE$(WK_MACOS_1012));
>-ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE;
>+ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
> 
> ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
> 
>Index: Source/WebCore/Configurations/Version.xcconfig
>===================================================================
>--- Source/WebCore/Configurations/Version.xcconfig	(revision 232663)
>+++ Source/WebCore/Configurations/Version.xcconfig	(working copy)
>@@ -35,7 +35,6 @@ SHORT_VERSION_STRING = $(SHORT_VERSION_S
> // The system version prefix is based on the current system version.
> SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
> SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
> SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
> SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
> SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
>Index: Source/WebCore/Configurations/WebCore.xcconfig
>===================================================================
>--- Source/WebCore/Configurations/WebCore.xcconfig	(revision 232663)
>+++ Source/WebCore/Configurations/WebCore.xcconfig	(working copy)
>@@ -27,10 +27,8 @@
> GCC_PREFIX_HEADER = WebCorePrefix.h;
> GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) BUILDING_WEBKIT U_DISABLE_RENAMING=1 U_SHOW_CPLUSPLUS_API=0 GL_SILENCE_DEPRECATION=1 GLES_SILENCE_DEPRECATION=1 $(inherited);
> 
>-WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
> WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
>-WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORKS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS));
>-WK_PRIVATE_FRAMEWORKS_DIR_iphone_YES = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
>+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
> 
> FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(FRAMEWORK_SEARCH_PATHS_ios_$(CONFIGURATION));
> FRAMEWORK_SEARCH_PATHS_ios_Debug = $(BUILT_PRODUCTS_DIR) $(WK_PRIVATE_FRAMEWORKS_DIR);
>Index: Source/WebCore/Configurations/WebKitTargetConditionals.xcconfig
>===================================================================
>--- Source/WebCore/Configurations/WebKitTargetConditionals.xcconfig	(revision 232663)
>+++ Source/WebCore/Configurations/WebKitTargetConditionals.xcconfig	(working copy)
>@@ -48,40 +48,18 @@
> 
> // macOS
> 
>-WK_MACOS_BEFORE_1012 = $(WK_MACOS_BEFORE_1012_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-WK_MACOS_BEFORE_1012_101100 = YES;
>-
> WK_MACOS_BEFORE_1013 = $(WK_MACOS_BEFORE_1013_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-WK_MACOS_BEFORE_1013_101100 = YES;
> WK_MACOS_BEFORE_1013_101200 = YES;
> 
> WK_MACOS_BEFORE_1014 = $(WK_MACOS_BEFORE_1014_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-WK_MACOS_BEFORE_1014_101100 = YES;
> WK_MACOS_BEFORE_1014_101200 = YES;
> WK_MACOS_BEFORE_1014_101300 = YES;
> 
> WK_MACOS_BEFORE_1015 = $(WK_MACOS_BEFORE_1015_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-WK_MACOS_BEFORE_1015_101100 = YES;
> WK_MACOS_BEFORE_1015_101200 = YES;
> WK_MACOS_BEFORE_1015_101300 = YES;
> WK_MACOS_BEFORE_1015_101400 = YES;
> 
>-WK_MACOS_1012 = $(WK_MACOS_1012_$(WK_MACOS_BEFORE_1012));
>-WK_MACOS_1012_ = _MACOS_SINCE_1012;
>-WK_MACOS_1012_YES = _MACOS_BEFORE_1012;
>-
>-WK_MACOS_1012_1013 = $(WK_MACOS_1012_1013_$(WK_MACOS_BEFORE_1012));
>-WK_MACOS_1012_1013_ = $(WK_MACOS_1013);
>-WK_MACOS_1012_1013_YES = _MACOS_BEFORE_1012;
>-
>-WK_MACOS_1012_1014 = $(WK_MACOS_1012_1014_$(WK_MACOS_BEFORE_1012));
>-WK_MACOS_1012_1014_ = $(WK_MACOS_1014);
>-WK_MACOS_1012_1014_YES = _MACOS_BEFORE_1012;
>-
>-WK_MACOS_1012_1015 = $(WK_MACOS_1012_1015_$(WK_MACOS_BEFORE_1012));
>-WK_MACOS_1012_1015_ = $(WK_MACOS_1015);
>-WK_MACOS_1012_1015_YES = _MACOS_BEFORE_1012;
>-
> WK_MACOS_1013 = $(WK_MACOS_1013_$(WK_MACOS_BEFORE_1013));
> WK_MACOS_1013_ = _MACOS_SINCE_1013;
> WK_MACOS_1013_YES = _MACOS_BEFORE_1013;
>Index: Source/WebCore/PAL/Configurations/Base.xcconfig
>===================================================================
>--- Source/WebCore/PAL/Configurations/Base.xcconfig	(revision 232663)
>+++ Source/WebCore/PAL/Configurations/Base.xcconfig	(working copy)
>@@ -84,7 +84,6 @@ GCC_WARN_UNUSED_VARIABLE = YES;
> WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wno-unknown-warning-option;
> 
> TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
>-TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
> TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
> TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
> TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
>Index: Source/WebCore/PAL/Configurations/DebugRelease.xcconfig
>===================================================================
>--- Source/WebCore/PAL/Configurations/DebugRelease.xcconfig	(revision 232663)
>+++ Source/WebCore/PAL/Configurations/DebugRelease.xcconfig	(working copy)
>@@ -30,7 +30,6 @@ ONLY_ACTIVE_ARCH = YES;
> TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
> 
> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
> MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
> MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
> MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
>Index: Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
>===================================================================
>--- Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig	(revision 232663)
>+++ Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig	(working copy)
>@@ -43,8 +43,7 @@ ENABLE_ACCELERATED_OVERFLOW_SCROLLING_co
> ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(WK_PLATFORM_NAME));
> ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
> ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
>-ENABLE_APPLE_PAY_macosx = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
>-ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
>+ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY;
> 
> ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
> ENABLE_APPLE_PAY_SESSION_V3_iphoneos = ENABLE_APPLE_PAY_SESSION_V3;
>@@ -338,16 +337,7 @@ ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 
> 
> ENABLE_VIDEO = ENABLE_VIDEO;
> 
>-ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
>-ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_iphoneminimalsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_iphonesimulator = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_watchsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_appletvos = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_appletvsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_macosx = $(ENABLE_VIDEO_PRESENTATION_MODE$(WK_MACOS_1012));
>-ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE;
>+ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
> 
> ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
> 
>Index: Source/WebCore/PAL/Configurations/PAL.xcconfig
>===================================================================
>--- Source/WebCore/PAL/Configurations/PAL.xcconfig	(revision 232663)
>+++ Source/WebCore/PAL/Configurations/PAL.xcconfig	(working copy)
>@@ -26,13 +26,8 @@
> 
> GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) $(inherited);
> 
>-WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
>-WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
>-WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORKS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS));
>-WK_PRIVATE_FRAMEWORKS_DIR_iphone_YES = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
>-
> FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(FRAMEWORK_SEARCH_PATHS_ios_$(CONFIGURATION));
>-FRAMEWORK_SEARCH_PATHS_ios_Debug = $(BUILT_PRODUCTS_DIR) $(WK_PRIVATE_FRAMEWORKS_DIR);
>+FRAMEWORK_SEARCH_PATHS_ios_Debug = $(BUILT_PRODUCTS_DIR);
> FRAMEWORK_SEARCH_PATHS_ios_Release = $(FRAMEWORK_SEARCH_PATHS_ios_Debug);
> FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR);
> 
>Index: Source/WebCore/PAL/Configurations/Version.xcconfig
>===================================================================
>--- Source/WebCore/PAL/Configurations/Version.xcconfig	(revision 232663)
>+++ Source/WebCore/PAL/Configurations/Version.xcconfig	(working copy)
>@@ -35,7 +35,6 @@ SHORT_VERSION_STRING = $(SHORT_VERSION_S
> // The system version prefix is based on the current system version.
> SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
> SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
> SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
> SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
> SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
>Index: Source/WebCore/PAL/Configurations/WebKitTargetConditionals.xcconfig
>===================================================================
>--- Source/WebCore/PAL/Configurations/WebKitTargetConditionals.xcconfig	(revision 232663)
>+++ Source/WebCore/PAL/Configurations/WebKitTargetConditionals.xcconfig	(working copy)
>@@ -48,40 +48,18 @@
> 
> // macOS
> 
>-WK_MACOS_BEFORE_1012 = $(WK_MACOS_BEFORE_1012_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-WK_MACOS_BEFORE_1012_101100 = YES;
>-
> WK_MACOS_BEFORE_1013 = $(WK_MACOS_BEFORE_1013_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-WK_MACOS_BEFORE_1013_101100 = YES;
> WK_MACOS_BEFORE_1013_101200 = YES;
> 
> WK_MACOS_BEFORE_1014 = $(WK_MACOS_BEFORE_1014_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-WK_MACOS_BEFORE_1014_101100 = YES;
> WK_MACOS_BEFORE_1014_101200 = YES;
> WK_MACOS_BEFORE_1014_101300 = YES;
> 
> WK_MACOS_BEFORE_1015 = $(WK_MACOS_BEFORE_1015_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-WK_MACOS_BEFORE_1015_101100 = YES;
> WK_MACOS_BEFORE_1015_101200 = YES;
> WK_MACOS_BEFORE_1015_101300 = YES;
> WK_MACOS_BEFORE_1015_101400 = YES;
> 
>-WK_MACOS_1012 = $(WK_MACOS_1012_$(WK_MACOS_BEFORE_1012));
>-WK_MACOS_1012_ = _MACOS_SINCE_1012;
>-WK_MACOS_1012_YES = _MACOS_BEFORE_1012;
>-
>-WK_MACOS_1012_1013 = $(WK_MACOS_1012_1013_$(WK_MACOS_BEFORE_1012));
>-WK_MACOS_1012_1013_ = $(WK_MACOS_1013);
>-WK_MACOS_1012_1013_YES = _MACOS_BEFORE_1012;
>-
>-WK_MACOS_1012_1014 = $(WK_MACOS_1012_1014_$(WK_MACOS_BEFORE_1012));
>-WK_MACOS_1012_1014_ = $(WK_MACOS_1014);
>-WK_MACOS_1012_1014_YES = _MACOS_BEFORE_1012;
>-
>-WK_MACOS_1012_1015 = $(WK_MACOS_1012_1015_$(WK_MACOS_BEFORE_1012));
>-WK_MACOS_1012_1015_ = $(WK_MACOS_1015);
>-WK_MACOS_1012_1015_YES = _MACOS_BEFORE_1012;
>-
> WK_MACOS_1013 = $(WK_MACOS_1013_$(WK_MACOS_BEFORE_1013));
> WK_MACOS_1013_ = _MACOS_SINCE_1013;
> WK_MACOS_1013_YES = _MACOS_BEFORE_1013;
>Index: Source/WebInspectorUI/Configurations/Base.xcconfig
>===================================================================
>--- Source/WebInspectorUI/Configurations/Base.xcconfig	(revision 232663)
>+++ Source/WebInspectorUI/Configurations/Base.xcconfig	(working copy)
>@@ -62,7 +62,6 @@ ENGINEERING_BUILD_DEFINES_1 = ENGINEERIN
> SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
> 
> TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
>-TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
> TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
> TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
> TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
>Index: Source/WebInspectorUI/Configurations/DebugRelease.xcconfig
>===================================================================
>--- Source/WebInspectorUI/Configurations/DebugRelease.xcconfig	(revision 232663)
>+++ Source/WebInspectorUI/Configurations/DebugRelease.xcconfig	(working copy)
>@@ -7,7 +7,6 @@ ONLY_ACTIVE_ARCH = YES;
> TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
> 
> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
> MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
> MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
> MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
>Index: Source/WebInspectorUI/Configurations/Version.xcconfig
>===================================================================
>--- Source/WebInspectorUI/Configurations/Version.xcconfig	(revision 232663)
>+++ Source/WebInspectorUI/Configurations/Version.xcconfig	(working copy)
>@@ -8,7 +8,6 @@ FULL_VERSION = $(MAJOR_VERSION).$(MINOR_
> // The system version prefix is based on the current system version.
> SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
> SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
> SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
> SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
> SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
>Index: Source/WebKit/Configurations/Base.xcconfig
>===================================================================
>--- Source/WebKit/Configurations/Base.xcconfig	(revision 232663)
>+++ Source/WebKit/Configurations/Base.xcconfig	(working copy)
>@@ -84,7 +84,6 @@ PREBINDING = NO;
> WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat-security -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
> 
> TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
>-TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
> TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
> TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
> TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
>@@ -117,8 +116,6 @@ CODE_SIGN_IDENTITY = -;
> 
> SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
> 
>-FRAMEWORK_CONTENT_DIRECTORY[sdk=macosx*] = Versions/A;
>-
> OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
> OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
> OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
>Index: Source/WebKit/Configurations/BaseTarget.xcconfig
>===================================================================
>--- Source/WebKit/Configurations/BaseTarget.xcconfig	(revision 232663)
>+++ Source/WebKit/Configurations/BaseTarget.xcconfig	(working copy)
>@@ -24,10 +24,8 @@
> #include "FeatureDefines.xcconfig"
> #include "Version.xcconfig"
> 
>-WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
> WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
>-WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORKS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS));
>-WK_PRIVATE_FRAMEWORKS_DIR_iphone_YES = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
>+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
> 
> FRAMEWORK_SEARCH_PATHS_base = "$(UMBRELLA_FRAMEWORKS_DIR)"
> FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(FRAMEWORK_SEARCH_PATHS_base) $(WK_PRIVATE_FRAMEWORKS_DIR);
>Index: Source/WebKit/Configurations/DebugRelease.xcconfig
>===================================================================
>--- Source/WebKit/Configurations/DebugRelease.xcconfig	(revision 232663)
>+++ Source/WebKit/Configurations/DebugRelease.xcconfig	(working copy)
>@@ -30,7 +30,6 @@ ONLY_ACTIVE_ARCH = YES;
> TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
> 
> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
> MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
> MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
> MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
>Index: Source/WebKit/Configurations/FeatureDefines.xcconfig
>===================================================================
>--- Source/WebKit/Configurations/FeatureDefines.xcconfig	(revision 232663)
>+++ Source/WebKit/Configurations/FeatureDefines.xcconfig	(working copy)
>@@ -43,8 +43,7 @@ ENABLE_ACCELERATED_OVERFLOW_SCROLLING_co
> ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(WK_PLATFORM_NAME));
> ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
> ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
>-ENABLE_APPLE_PAY_macosx = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
>-ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
>+ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY;
> 
> ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
> ENABLE_APPLE_PAY_SESSION_V3_iphoneos = ENABLE_APPLE_PAY_SESSION_V3;
>@@ -338,16 +337,7 @@ ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 
> 
> ENABLE_VIDEO = ENABLE_VIDEO;
> 
>-ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
>-ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_iphoneminimalsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_iphonesimulator = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_watchsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_appletvos = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_appletvsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_macosx = $(ENABLE_VIDEO_PRESENTATION_MODE$(WK_MACOS_1012));
>-ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE;
>+ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
> 
> ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
> 
>Index: Source/WebKit/Configurations/Version.xcconfig
>===================================================================
>--- Source/WebKit/Configurations/Version.xcconfig	(revision 232663)
>+++ Source/WebKit/Configurations/Version.xcconfig	(working copy)
>@@ -35,7 +35,6 @@ SHORT_VERSION_STRING = $(SHORT_VERSION_S
> // The system version prefix is based on the current system version.
> SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
> SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
> SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
> SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
> SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
>Index: Source/WebKit/Configurations/WebKitTargetConditionals.xcconfig
>===================================================================
>--- Source/WebKit/Configurations/WebKitTargetConditionals.xcconfig	(revision 232663)
>+++ Source/WebKit/Configurations/WebKitTargetConditionals.xcconfig	(working copy)
>@@ -48,40 +48,18 @@
> 
> // macOS
> 
>-WK_MACOS_BEFORE_1012 = $(WK_MACOS_BEFORE_1012_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-WK_MACOS_BEFORE_1012_101100 = YES;
>-
> WK_MACOS_BEFORE_1013 = $(WK_MACOS_BEFORE_1013_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-WK_MACOS_BEFORE_1013_101100 = YES;
> WK_MACOS_BEFORE_1013_101200 = YES;
> 
> WK_MACOS_BEFORE_1014 = $(WK_MACOS_BEFORE_1014_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-WK_MACOS_BEFORE_1014_101100 = YES;
> WK_MACOS_BEFORE_1014_101200 = YES;
> WK_MACOS_BEFORE_1014_101300 = YES;
> 
> WK_MACOS_BEFORE_1015 = $(WK_MACOS_BEFORE_1015_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-WK_MACOS_BEFORE_1015_101100 = YES;
> WK_MACOS_BEFORE_1015_101200 = YES;
> WK_MACOS_BEFORE_1015_101300 = YES;
> WK_MACOS_BEFORE_1015_101400 = YES;
> 
>-WK_MACOS_1012 = $(WK_MACOS_1012_$(WK_MACOS_BEFORE_1012));
>-WK_MACOS_1012_ = _MACOS_SINCE_1012;
>-WK_MACOS_1012_YES = _MACOS_BEFORE_1012;
>-
>-WK_MACOS_1012_1013 = $(WK_MACOS_1012_1013_$(WK_MACOS_BEFORE_1012));
>-WK_MACOS_1012_1013_ = $(WK_MACOS_1013);
>-WK_MACOS_1012_1013_YES = _MACOS_BEFORE_1012;
>-
>-WK_MACOS_1012_1014 = $(WK_MACOS_1012_1014_$(WK_MACOS_BEFORE_1012));
>-WK_MACOS_1012_1014_ = $(WK_MACOS_1014);
>-WK_MACOS_1012_1014_YES = _MACOS_BEFORE_1012;
>-
>-WK_MACOS_1012_1015 = $(WK_MACOS_1012_1015_$(WK_MACOS_BEFORE_1012));
>-WK_MACOS_1012_1015_ = $(WK_MACOS_1015);
>-WK_MACOS_1012_1015_YES = _MACOS_BEFORE_1012;
>-
> WK_MACOS_1013 = $(WK_MACOS_1013_$(WK_MACOS_BEFORE_1013));
> WK_MACOS_1013_ = _MACOS_SINCE_1013;
> WK_MACOS_1013_YES = _MACOS_BEFORE_1013;
>Index: Source/WebKitLegacy/mac/Configurations/Base.xcconfig
>===================================================================
>--- Source/WebKitLegacy/mac/Configurations/Base.xcconfig	(revision 232663)
>+++ Source/WebKitLegacy/mac/Configurations/Base.xcconfig	(working copy)
>@@ -85,7 +85,6 @@ PREBINDING = NO;
> WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat-security -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
> 
> TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
>-TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
> TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
> TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
> TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
>Index: Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig
>===================================================================
>--- Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig	(revision 232663)
>+++ Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig	(working copy)
>@@ -30,7 +30,6 @@ ONLY_ACTIVE_ARCH = YES;
> TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
> 
> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
> MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
> MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
> MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
>Index: Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
>===================================================================
>--- Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig	(revision 232663)
>+++ Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig	(working copy)
>@@ -43,8 +43,7 @@ ENABLE_ACCELERATED_OVERFLOW_SCROLLING_co
> ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(WK_PLATFORM_NAME));
> ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
> ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
>-ENABLE_APPLE_PAY_macosx = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
>-ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
>+ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY;
> 
> ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
> ENABLE_APPLE_PAY_SESSION_V3_iphoneos = ENABLE_APPLE_PAY_SESSION_V3;
>@@ -338,16 +337,7 @@ ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 
> 
> ENABLE_VIDEO = ENABLE_VIDEO;
> 
>-ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
>-ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_iphoneminimalsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_iphonesimulator = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_watchsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_appletvos = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_appletvsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_macosx = $(ENABLE_VIDEO_PRESENTATION_MODE$(WK_MACOS_1012));
>-ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE;
>+ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
> 
> ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
> 
>Index: Source/WebKitLegacy/mac/Configurations/Version.xcconfig
>===================================================================
>--- Source/WebKitLegacy/mac/Configurations/Version.xcconfig	(revision 232663)
>+++ Source/WebKitLegacy/mac/Configurations/Version.xcconfig	(working copy)
>@@ -35,7 +35,6 @@ SHORT_VERSION_STRING = $(SHORT_VERSION_S
> // The system version prefix is based on the current system version.
> SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
> SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
> SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
> SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
> SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
>Index: Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
>===================================================================
>--- Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig	(revision 232663)
>+++ Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig	(working copy)
>@@ -33,10 +33,8 @@ EXPORTED_SYMBOLS_FILE_cocoatouch = $(BUI
> EXPORTED_SYMBOLS_FILE_[arch=i386] = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.i386.exp;
> EXPORTED_SYMBOLS_FILE_[arch=x86_64] = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.LP64.exp;
> 
>-WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
> WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
>-WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORKS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS));
>-WK_PRIVATE_FRAMEWORKS_DIR_iphone_YES = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
>+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
> 
> FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
> FRAMEWORK_SEARCH_PATHS_COCOA_TOUCH_YES = $(FRAMEWORK_SEARCH_PATHS_ios_$(CONFIGURATION));
>Index: Source/WebKitLegacy/mac/Configurations/WebKitTargetConditionals.xcconfig
>===================================================================
>--- Source/WebKitLegacy/mac/Configurations/WebKitTargetConditionals.xcconfig	(revision 232663)
>+++ Source/WebKitLegacy/mac/Configurations/WebKitTargetConditionals.xcconfig	(working copy)
>@@ -48,40 +48,18 @@
> 
> // macOS
> 
>-WK_MACOS_BEFORE_1012 = $(WK_MACOS_BEFORE_1012_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-WK_MACOS_BEFORE_1012_101100 = YES;
>-
> WK_MACOS_BEFORE_1013 = $(WK_MACOS_BEFORE_1013_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-WK_MACOS_BEFORE_1013_101100 = YES;
> WK_MACOS_BEFORE_1013_101200 = YES;
> 
> WK_MACOS_BEFORE_1014 = $(WK_MACOS_BEFORE_1014_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-WK_MACOS_BEFORE_1014_101100 = YES;
> WK_MACOS_BEFORE_1014_101200 = YES;
> WK_MACOS_BEFORE_1014_101300 = YES;
> 
> WK_MACOS_BEFORE_1015 = $(WK_MACOS_BEFORE_1015_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-WK_MACOS_BEFORE_1015_101100 = YES;
> WK_MACOS_BEFORE_1015_101200 = YES;
> WK_MACOS_BEFORE_1015_101300 = YES;
> WK_MACOS_BEFORE_1015_101400 = YES;
> 
>-WK_MACOS_1012 = $(WK_MACOS_1012_$(WK_MACOS_BEFORE_1012));
>-WK_MACOS_1012_ = _MACOS_SINCE_1012;
>-WK_MACOS_1012_YES = _MACOS_BEFORE_1012;
>-
>-WK_MACOS_1012_1013 = $(WK_MACOS_1012_1013_$(WK_MACOS_BEFORE_1012));
>-WK_MACOS_1012_1013_ = $(WK_MACOS_1013);
>-WK_MACOS_1012_1013_YES = _MACOS_BEFORE_1012;
>-
>-WK_MACOS_1012_1014 = $(WK_MACOS_1012_1014_$(WK_MACOS_BEFORE_1012));
>-WK_MACOS_1012_1014_ = $(WK_MACOS_1014);
>-WK_MACOS_1012_1014_YES = _MACOS_BEFORE_1012;
>-
>-WK_MACOS_1012_1015 = $(WK_MACOS_1012_1015_$(WK_MACOS_BEFORE_1012));
>-WK_MACOS_1012_1015_ = $(WK_MACOS_1015);
>-WK_MACOS_1012_1015_YES = _MACOS_BEFORE_1012;
>-
> WK_MACOS_1013 = $(WK_MACOS_1013_$(WK_MACOS_BEFORE_1013));
> WK_MACOS_1013_ = _MACOS_SINCE_1013;
> WK_MACOS_1013_YES = _MACOS_BEFORE_1013;
>Index: Source/bmalloc/Configurations/Base.xcconfig
>===================================================================
>--- Source/bmalloc/Configurations/Base.xcconfig	(revision 232663)
>+++ Source/bmalloc/Configurations/Base.xcconfig	(working copy)
>@@ -93,7 +93,6 @@ PREBINDING = NO;
> WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
> 
> TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
>-TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
> TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
> TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
> TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
>Index: Source/bmalloc/Configurations/DebugRelease.xcconfig
>===================================================================
>--- Source/bmalloc/Configurations/DebugRelease.xcconfig	(revision 232663)
>+++ Source/bmalloc/Configurations/DebugRelease.xcconfig	(working copy)
>@@ -29,7 +29,6 @@ ONLY_ACTIVE_ARCH = YES;
> TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
> 
> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
> MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
> MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
> MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
>Index: Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
>===================================================================
>--- Tools/DumpRenderTree/mac/Configurations/Base.xcconfig	(revision 232663)
>+++ Tools/DumpRenderTree/mac/Configurations/Base.xcconfig	(working copy)
>@@ -33,9 +33,8 @@ WK_NOT_ = YES;
> WK_NOT_YES = NO;
> 
> WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
>-WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
>-WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS)_$(USE_INTERNAL_SDK));
>-WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_YES_ = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
>+WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_$(USE_INTERNAL_SDK));
>+WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_ = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
> 
> FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR);
> 
>@@ -87,7 +86,6 @@ DEBUG_DEFINES_normal = NDEBUG;
> DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
> 
> TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
>-TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
> TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
> TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
> TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
>Index: Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig
>===================================================================
>--- Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig	(revision 232663)
>+++ Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig	(working copy)
>@@ -30,7 +30,6 @@ ONLY_ACTIVE_ARCH = YES;
> TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
> 
> MACOSX_DEPLOYMENT_TARGET[sdk=macosx*] = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
> MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
> MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
> MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
>Index: Tools/MiniBrowser/Configurations/Base.xcconfig
>===================================================================
>--- Tools/MiniBrowser/Configurations/Base.xcconfig	(revision 232663)
>+++ Tools/MiniBrowser/Configurations/Base.xcconfig	(working copy)
>@@ -67,7 +67,6 @@ GCC_NO_COMMON_BLOCKS = YES;
> SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
> 
> TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
>-TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
> TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
> TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
> TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
>Index: Tools/MiniBrowser/Configurations/DebugRelease.xcconfig
>===================================================================
>--- Tools/MiniBrowser/Configurations/DebugRelease.xcconfig	(revision 232663)
>+++ Tools/MiniBrowser/Configurations/DebugRelease.xcconfig	(working copy)
>@@ -30,7 +30,6 @@ ONLY_ACTIVE_ARCH = YES;
> TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
> 
> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
>-MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
> MACOSX_DEPLOYMENT_TARGET_101200 = 10.12;
> MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
> MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
>Index: Tools/TestWebKitAPI/Configurations/Base.xcconfig
>===================================================================
>--- Tools/TestWebKitAPI/Configurations/Base.xcconfig	(revision 232663)
>+++ Tools/TestWebKitAPI/Configurations/Base.xcconfig	(working copy)
>@@ -78,7 +78,6 @@ DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURREN
> SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
> 
> TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
>-TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
> TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
> TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
> TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
>Index: Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig
>===================================================================
>--- Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig	(revision 232663)
>+++ Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig	(working copy)
>@@ -30,7 +30,6 @@ ONLY_ACTIVE_ARCH = YES;
> TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
> 
> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
>-MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
> MACOSX_DEPLOYMENT_TARGET_101200 = 10.12;
> MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
> MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
>Index: Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
>===================================================================
>--- Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig	(revision 232663)
>+++ Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig	(working copy)
>@@ -43,8 +43,7 @@ ENABLE_ACCELERATED_OVERFLOW_SCROLLING_co
> ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(WK_PLATFORM_NAME));
> ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
> ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
>-ENABLE_APPLE_PAY_macosx = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
>-ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
>+ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY;
> 
> ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
> ENABLE_APPLE_PAY_SESSION_V3_iphoneos = ENABLE_APPLE_PAY_SESSION_V3;
>@@ -338,16 +337,7 @@ ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 
> 
> ENABLE_VIDEO = ENABLE_VIDEO;
> 
>-ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
>-ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_iphoneminimalsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_iphonesimulator = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_watchsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_appletvos = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_appletvsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
>-ENABLE_VIDEO_PRESENTATION_MODE_macosx = $(ENABLE_VIDEO_PRESENTATION_MODE$(WK_MACOS_1012));
>-ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE;
>+ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
> 
> ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
> 
>Index: Tools/TestWebKitAPI/Configurations/WebKitTargetConditionals.xcconfig
>===================================================================
>--- Tools/TestWebKitAPI/Configurations/WebKitTargetConditionals.xcconfig	(revision 232663)
>+++ Tools/TestWebKitAPI/Configurations/WebKitTargetConditionals.xcconfig	(working copy)
>@@ -48,40 +48,18 @@
> 
> // macOS
> 
>-WK_MACOS_BEFORE_1012 = $(WK_MACOS_BEFORE_1012_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-WK_MACOS_BEFORE_1012_101100 = YES;
>-
> WK_MACOS_BEFORE_1013 = $(WK_MACOS_BEFORE_1013_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-WK_MACOS_BEFORE_1013_101100 = YES;
> WK_MACOS_BEFORE_1013_101200 = YES;
> 
> WK_MACOS_BEFORE_1014 = $(WK_MACOS_BEFORE_1014_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-WK_MACOS_BEFORE_1014_101100 = YES;
> WK_MACOS_BEFORE_1014_101200 = YES;
> WK_MACOS_BEFORE_1014_101300 = YES;
> 
> WK_MACOS_BEFORE_1015 = $(WK_MACOS_BEFORE_1015_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>-WK_MACOS_BEFORE_1015_101100 = YES;
> WK_MACOS_BEFORE_1015_101200 = YES;
> WK_MACOS_BEFORE_1015_101300 = YES;
> WK_MACOS_BEFORE_1015_101400 = YES;
> 
>-WK_MACOS_1012 = $(WK_MACOS_1012_$(WK_MACOS_BEFORE_1012));
>-WK_MACOS_1012_ = _MACOS_SINCE_1012;
>-WK_MACOS_1012_YES = _MACOS_BEFORE_1012;
>-
>-WK_MACOS_1012_1013 = $(WK_MACOS_1012_1013_$(WK_MACOS_BEFORE_1012));
>-WK_MACOS_1012_1013_ = $(WK_MACOS_1013);
>-WK_MACOS_1012_1013_YES = _MACOS_BEFORE_1012;
>-
>-WK_MACOS_1012_1014 = $(WK_MACOS_1012_1014_$(WK_MACOS_BEFORE_1012));
>-WK_MACOS_1012_1014_ = $(WK_MACOS_1014);
>-WK_MACOS_1012_1014_YES = _MACOS_BEFORE_1012;
>-
>-WK_MACOS_1012_1015 = $(WK_MACOS_1012_1015_$(WK_MACOS_BEFORE_1012));
>-WK_MACOS_1012_1015_ = $(WK_MACOS_1015);
>-WK_MACOS_1012_1015_YES = _MACOS_BEFORE_1012;
>-
> WK_MACOS_1013 = $(WK_MACOS_1013_$(WK_MACOS_BEFORE_1013));
> WK_MACOS_1013_ = _MACOS_SINCE_1013;
> WK_MACOS_1013_YES = _MACOS_BEFORE_1013;
>Index: Tools/WebKitTestRunner/Configurations/Base.xcconfig
>===================================================================
>--- Tools/WebKitTestRunner/Configurations/Base.xcconfig	(revision 232663)
>+++ Tools/WebKitTestRunner/Configurations/Base.xcconfig	(working copy)
>@@ -61,7 +61,6 @@ DEBUG_DEFINES_normal = NDEBUG;
> DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
> 
> TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
>-TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
> TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
> TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
> TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
>@@ -87,9 +86,8 @@ WK_NOT_ = YES;
> WK_NOT_YES = NO;
> 
> WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
>-WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
>-WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS)_$(USE_INTERNAL_SDK));
>-WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_YES_ = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
>+WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_$(USE_INTERNAL_SDK));
>+WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_ = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
> 
> FRAMEWORK_SEARCH_PATHS[sdk=mac*] = $(inherited) $(WK_PRIVATE_FRAMEWORK_STUBS_DIR) $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
> FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(inherited) $(WK_PRIVATE_FRAMEWORK_STUBS_DIR);
>Index: Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig
>===================================================================
>--- Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig	(revision 232663)
>+++ Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig	(working copy)
>@@ -30,7 +30,6 @@ ONLY_ACTIVE_ARCH = YES;
> TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
> 
> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
>-MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
> MACOSX_DEPLOYMENT_TARGET_101200 = 10.12;
> MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
> MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;

Actions: View | Formatted Diff | Diff

Attachments on bug 186463: 342368 | 342369 | 342377 | 342379