Attachment 372973 Details for Bug 199245 – Patch

[patch] Patch

for-review-os-3.txt (text/plain), 144.87 KB, created by Beth Dakin on 2019-06-26 17:24:45 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Beth Dakin

Created: 2019-06-26 17:24:45 PDT

Size: 144.87 KB

patch

obsolete

>Index: PerformanceTests/ChangeLog
>===================================================================
>--- PerformanceTests/ChangeLog	(revision 246846)
>+++ PerformanceTests/ChangeLog	(working copy)
>@@ -1,3 +1,13 @@
>+2019-06-26  Beth Dakin  <bdakin@apple.com>
>+
>+        Upstream use of MACCATALYST
>+        https://bugs.webkit.org/show_bug.cgi?id=199245
>+        rdar://problem/51687723
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * MediaTime/Configurations/SDKVariant.xcconfig:
>+
> 2019-06-20  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         [GTK] Remove support for GTK2 plugins
>Index: PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig
>===================================================================
>--- PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig	(revision 246846)
>+++ PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig	(working copy)
>@@ -30,7 +30,7 @@ WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /Sy
> WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
> 
> WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = maccatalyst;
> WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
> 
> WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>Index: Source/JavaScriptCore/ChangeLog
>===================================================================
>--- Source/JavaScriptCore/ChangeLog	(revision 246846)
>+++ Source/JavaScriptCore/ChangeLog	(working copy)
>@@ -1,3 +1,16 @@
>+2019-06-26  Beth Dakin  <bdakin@apple.com>
>+
>+        Upstream use of MACCATALYST
>+        https://bugs.webkit.org/show_bug.cgi?id=199245
>+        rdar://problem/51687723
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/Base.xcconfig:
>+        * Configurations/FeatureDefines.xcconfig:
>+        * Configurations/JavaScriptCore.xcconfig:
>+        * Configurations/SDKVariant.xcconfig:
>+
> 2019-06-26  Keith Miller  <keith_miller@apple.com>
> 
>         remove unneeded didBecomePrototype() calls
>Index: Source/JavaScriptCore/Configurations/Base.xcconfig
>===================================================================
>--- Source/JavaScriptCore/Configurations/Base.xcconfig	(revision 246846)
>+++ Source/JavaScriptCore/Configurations/Base.xcconfig	(working copy)
>@@ -171,7 +171,7 @@ WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_MA
> 
> WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
> WK_COCOA_TOUCH_iphoneos = cocoatouch;
>-WK_COCOA_TOUCH_iosmac = cocoatouch;
>+WK_COCOA_TOUCH_maccatalyst = cocoatouch;
> WK_COCOA_TOUCH_iphonesimulator = cocoatouch;
> WK_COCOA_TOUCH_watchos = cocoatouch;
> WK_COCOA_TOUCH_watchsimulator = cocoatouch;
>Index: Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>===================================================================
>--- Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig	(revision 246846)
>+++ Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig	(working copy)
>@@ -69,9 +69,9 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE
> ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
> 
> ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
>-ENABLE_CONTENT_FILTERING_iosmac = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
>+ENABLE_CONTENT_FILTERING_maccatalyst = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
>@@ -90,7 +90,7 @@ ENABLE_CSS_CONIC_GRADIENTS_iphonesimulat
> ENABLE_CSS_CONIC_GRADIENTS_iphonesimulator[sdk=iphone*11.*] = ;
> ENABLE_CSS_CONIC_GRADIENTS_watchos = ENABLE_CSS_CONIC_GRADIENTS;
> ENABLE_CSS_CONIC_GRADIENTS_watchsimulator = ENABLE_CSS_CONIC_GRADIENTS;
>-ENABLE_CSS_CONIC_GRADIENTS_iosmac = ENABLE_CSS_CONIC_GRADIENTS;
>+ENABLE_CSS_CONIC_GRADIENTS_maccatalyst = ENABLE_CSS_CONIC_GRADIENTS;
> ENABLE_CSS_CONIC_GRADIENTS_macosx = $(ENABLE_CSS_CONIC_GRADIENTS$(WK_MACOS_1014));
> ENABLE_CSS_CONIC_GRADIENTS_MACOS_SINCE_1014 = ENABLE_CSS_CONIC_GRADIENTS;
> 
>@@ -117,7 +117,7 @@ ENABLE_CUSTOM_SCHEME_HANDLER = ;
> ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME));
> ENABLE_DARK_MODE_CSS_iphoneos = ENABLE_DARK_MODE_CSS;
> ENABLE_DARK_MODE_CSS_iphonesimulator = ENABLE_DARK_MODE_CSS;
>-ENABLE_DARK_MODE_CSS_iosmac = ENABLE_DARK_MODE_CSS;
>+ENABLE_DARK_MODE_CSS_maccatalyst = ENABLE_DARK_MODE_CSS;
> ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS;
> 
> ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
>@@ -127,7 +127,7 @@ ENABLE_DATALIST_ELEMENT = ENABLE_DATALIS
> ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
> ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
> ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
>-ENABLE_DATA_INTERACTION_iosmac = ENABLE_DATA_INTERACTION;
>+ENABLE_DATA_INTERACTION_maccatalyst = ENABLE_DATA_INTERACTION;
> 
> ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_PLATFORM_NAME));
> ENABLE_DEVICE_ORIENTATION_iphoneos = ENABLE_DEVICE_ORIENTATION;
>@@ -140,7 +140,7 @@ ENABLE_DEVICE_ORIENTATION_appletvsimulat
> ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(WK_PLATFORM_NAME));
> ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
> ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
>-ENABLE_DRAG_SUPPORT_iosmac = ENABLE_DRAG_SUPPORT;
>+ENABLE_DRAG_SUPPORT_maccatalyst = ENABLE_DRAG_SUPPORT;
> 
> ENABLE_ENCRYPTED_MEDIA = $(ENABLE_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME));
> ENABLE_ENCRYPTED_MEDIA_iphoneos = ENABLE_ENCRYPTED_MEDIA;
>@@ -158,14 +158,14 @@ ENABLE_EXPERIMENTAL_FEATURES_YES = ENABL
> ENABLE_FAST_JIT_PERMISSIONS = $(ENABLE_FAST_JIT_PERMISSIONS_$(WK_PLATFORM_NAME));
> ENABLE_FAST_JIT_PERMISSIONS_iphoneos[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSIONS_iphoneos_$(USE_INTERNAL_SDK));
> ENABLE_FAST_JIT_PERMISSIONS_iphoneos_YES = ENABLE_FAST_JIT_PERMISSIONS;
>-ENABLE_FAST_JIT_PERMISSIONS_iosmac = ;
>+ENABLE_FAST_JIT_PERMISSIONS_maccatalyst = ;
> 
> ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
> 
> ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(WK_PLATFORM_NAME))
> ENABLE_FTL_JIT_macosx = ENABLE_FTL_JIT;
> ENABLE_FTL_JIT_iphoneos = ENABLE_FTL_JIT;
>-ENABLE_FTL_JIT_iosmac = ENABLE_FTL_JIT;
>+ENABLE_FTL_JIT_maccatalyst = ENABLE_FTL_JIT;
> ENABLE_FTL_JIT_watchos = ENABLE_FTL_JIT;
> ENABLE_FTL_JIT_appletvos = ENABLE_FTL_JIT;
> 
>@@ -177,16 +177,16 @@ ENABLE_FULLSCREEN_API_macosx = ENABLE_FU
> 
> ENABLE_GAMEPAD = $(ENABLE_GAMEPAD_$(WK_PLATFORM_NAME));
> ENABLE_GAMEPAD_iphoneos = ENABLE_GAMEPAD;
>-ENABLE_GAMEPAD_iosmac = ENABLE_GAMEPAD;
> ENABLE_GAMEPAD_iphonesimulator = ENABLE_GAMEPAD;
> ENABLE_GAMEPAD_appletvos = ENABLE_GAMEPAD;
> ENABLE_GAMEPAD_appletvsimulator = ENABLE_GAMEPAD;
>+ENABLE_GAMEPAD_maccatalyst = ENABLE_GAMEPAD;
> ENABLE_GAMEPAD_macosx = ENABLE_GAMEPAD;
> 
> ENABLE_GEOLOCATION = $(ENABLE_GEOLOCATION_$(WK_PLATFORM_NAME));
> ENABLE_GEOLOCATION_iphoneos = ENABLE_GEOLOCATION;
>-ENABLE_GEOLOCATION_iosmac = ENABLE_GEOLOCATION;
> ENABLE_GEOLOCATION_iphonesimulator = ENABLE_GEOLOCATION;
>+ENABLE_GEOLOCATION_maccatalyst = ENABLE_GEOLOCATION;
> ENABLE_GEOLOCATION_macosx = ENABLE_GEOLOCATION;
> 
> ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(WK_PLATFORM_NAME));
>@@ -319,9 +319,9 @@ ENABLE_PDFKIT_PLUGIN = $(ENABLE_PDFKIT_P
> ENABLE_PDFKIT_PLUGIN_macosx = ENABLE_PDFKIT_PLUGIN;
> 
> ENABLE_POINTER_EVENTS = $(ENABLE_POINTER_EVENTS_$(WK_PLATFORM_NAME));
>-ENABLE_POINTER_EVENTS_iosmac = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_iphoneos = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_iphonesimulator = ENABLE_POINTER_EVENTS;
>+ENABLE_POINTER_EVENTS_maccatalyst = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_macosx = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_watchos = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_watchsimulator = ENABLE_POINTER_EVENTS;
>@@ -385,8 +385,8 @@ ENABLE_USER_MESSAGE_HANDLERS = ENABLE_US
> 
> ENABLE_VARIATION_FONTS = $(ENABLE_VARIATION_FONTS_$(WK_PLATFORM_NAME));
> ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
>-ENABLE_VARIATION_FONTS_iosmac = ENABLE_VARIATION_FONTS;
> ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
>+ENABLE_VARIATION_FONTS_maccatalyst = ENABLE_VARIATION_FONTS;
> ENABLE_VARIATION_FONTS_macosx = $(ENABLE_VARIATION_FONTS$(WK_MACOS_1013));
> ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 = ENABLE_VARIATION_FONTS;
> 
>Index: Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig
>===================================================================
>--- Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig	(revision 246846)
>+++ Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig	(working copy)
>@@ -25,7 +25,7 @@
> #include "Version.xcconfig"
> 
> DEFINES_MODULE = $(DEFINES_MODULE_$(WK_PLATFORM_NAME))
>-DEFINES_MODULE_iosmac = YES;
>+DEFINES_MODULE_maccatalyst = YES;
> DEFINES_MODULE_ = NO;
> MODULEMAP_FILE = $(SRCROOT)/JavaScriptCore.modulemap;
> 
>Index: Source/JavaScriptCore/Configurations/SDKVariant.xcconfig
>===================================================================
>--- Source/JavaScriptCore/Configurations/SDKVariant.xcconfig	(revision 246846)
>+++ Source/JavaScriptCore/Configurations/SDKVariant.xcconfig	(working copy)
>@@ -30,7 +30,7 @@ WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /Sy
> WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
> 
> WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = maccatalyst;
> WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
> 
> WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>Index: Source/ThirdParty/ANGLE/ChangeLog
>===================================================================
>--- Source/ThirdParty/ANGLE/ChangeLog	(revision 246846)
>+++ Source/ThirdParty/ANGLE/ChangeLog	(working copy)
>@@ -1,3 +1,13 @@
>+2019-06-26  Beth Dakin  <bdakin@apple.com>
>+
>+        Upstream use of MACCATALYST
>+        https://bugs.webkit.org/show_bug.cgi?id=199245
>+        rdar://problem/51687723
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/SDKVariant.xcconfig:
>+
> 2019-06-25  Kenneth Russell  <kbr@chromium.org>
> 
>         Script which adjusts include paths in ANGLE's copied headers breaks incremental builds
>Index: Source/ThirdParty/ANGLE/Configurations/SDKVariant.xcconfig
>===================================================================
>--- Source/ThirdParty/ANGLE/Configurations/SDKVariant.xcconfig	(revision 246846)
>+++ Source/ThirdParty/ANGLE/Configurations/SDKVariant.xcconfig	(working copy)
>@@ -30,7 +30,7 @@ WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /Sy
> WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
> 
> WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = maccatalyst;
> WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
> 
> WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>Index: Source/ThirdParty/libwebrtc/ChangeLog
>===================================================================
>--- Source/ThirdParty/libwebrtc/ChangeLog	(revision 246846)
>+++ Source/ThirdParty/libwebrtc/ChangeLog	(working copy)
>@@ -1,3 +1,13 @@
>+2019-06-26  Beth Dakin  <bdakin@apple.com>
>+
>+        Upstream use of MACCATALYST
>+        https://bugs.webkit.org/show_bug.cgi?id=199245
>+        rdar://problem/51687723
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/SDKVariant.xcconfig:
>+
> 2019-06-25  Youenn Fablet  <youenn@apple.com>
> 
>         Close sockets with too high file descriptor
>Index: Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig
>===================================================================
>--- Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig	(revision 246846)
>+++ Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig	(working copy)
>@@ -30,7 +30,7 @@ WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /Sy
> WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
> 
> WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = maccatalyst;
> WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
> 
> WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>Index: Source/WTF/ChangeLog
>===================================================================
>--- Source/WTF/ChangeLog	(revision 246846)
>+++ Source/WTF/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+2019-06-26  Beth Dakin  <bdakin@apple.com>
>+
>+        Upstream use of MACCATALYST
>+        https://bugs.webkit.org/show_bug.cgi?id=199245
>+        rdar://problem/51687723
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/SDKVariant.xcconfig:
>+        * wtf/FeatureDefines.h:
>+        * wtf/Platform.h:
>+
> 2019-06-26  Myles C. Maxfield  <mmaxfield@apple.com>
> 
>         REGRESSION: ( r246394 ) webgpu/whlsl-buffer-fragment.html and webgpu/whlsl-buffer-vertex.html are failing
>Index: Source/WTF/Configurations/SDKVariant.xcconfig
>===================================================================
>--- Source/WTF/Configurations/SDKVariant.xcconfig	(revision 246846)
>+++ Source/WTF/Configurations/SDKVariant.xcconfig	(working copy)
>@@ -30,7 +30,7 @@ WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /Sy
> WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
> 
> WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = maccatalyst;
> WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
> 
> WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>Index: Source/WTF/wtf/FeatureDefines.h
>===================================================================
>--- Source/WTF/wtf/FeatureDefines.h	(revision 246846)
>+++ Source/WTF/wtf/FeatureDefines.h	(working copy)
>@@ -54,13 +54,13 @@
> #if PLATFORM(IOS_FAMILY)
> 
> #if !defined(ENABLE_AIRPLAY_PICKER)
>-#if !PLATFORM(IOSMAC)
>+#if !PLATFORM(MACCATALYST)
> #define ENABLE_AIRPLAY_PICKER 1
> #endif
> #endif
> 
> #if !defined(ENABLE_APPLE_PAY_REMOTE_UI)
>-#if !PLATFORM(APPLETV) && !PLATFORM(IOSMAC) && !PLATFORM(WATCHOS)
>+#if !PLATFORM(APPLETV) && !PLATFORM(MACCATALYST) && !PLATFORM(WATCHOS)
> #define ENABLE_APPLE_PAY_REMOTE_UI 1
> #endif
> #endif
>@@ -172,13 +172,13 @@ the public iOS SDK. See <https://webkit.
> #endif
> 
> #if !defined(ENABLE_WKPDFVIEW)
>-#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV) && !PLATFORM(IOSMAC) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000
>+#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV) && !PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000
> #define ENABLE_WKPDFVIEW 1
> #endif
> #endif
> 
> #if !defined(HAVE_PDFHOSTVIEWCONTROLLER_SNAPSHOTTING)
>-#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV) && !PLATFORM(IOSMAC) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000
>+#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV) && !PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000
> #define HAVE_PDFHOSTVIEWCONTROLLER_SNAPSHOTTING 1
> #endif
> #endif
>@@ -316,7 +316,7 @@ the public iOS SDK. See <https://webkit.
> #if PLATFORM(COCOA)
> 
> #if !defined(ENABLE_LEGACY_ENCRYPTED_MEDIA)
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
> #define ENABLE_LEGACY_ENCRYPTED_MEDIA 0
> #else
> #define ENABLE_LEGACY_ENCRYPTED_MEDIA 1
>Index: Source/WTF/wtf/Platform.h
>===================================================================
>--- Source/WTF/wtf/Platform.h	(revision 246846)
>+++ Source/WTF/wtf/Platform.h	(working copy)
>@@ -369,8 +369,8 @@
> #include <TargetConditionals.h>
> #endif
> 
>-/* OS(IOS_FAMILY) - iOS family, including iOS, iOSMac, tvOS, watchOS */
>-/* OS(IOS) - iOS only, not including iOSMac */
>+/* OS(IOS_FAMILY) - iOS family, including iOS, macCatalyst, tvOS, watchOS */
>+/* OS(IOS) - iOS only, not including macCatalyst */
> /* OS(MAC_OS_X) - macOS (not including iOS family) */
> #if OS(DARWIN)
> #if TARGET_OS_IOS && !(defined(TARGET_OS_IOSMAC) && TARGET_OS_IOSMAC)
>@@ -537,7 +537,7 @@
> #define WTF_PLATFORM_IOS_FAMILY_SIMULATOR 1
> #endif
> #if defined(TARGET_OS_IOSMAC) && TARGET_OS_IOSMAC
>-#define WTF_PLATFORM_IOSMAC 1
>+#define WTF_PLATFORM_MACCATALYST 1
> #endif
> #elif OS(WINDOWS)
> #define WTF_PLATFORM_WIN 1
>@@ -1071,12 +1071,12 @@
> #define USE_SYSTEM_PREVIEW 1
> #endif
> 
>-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOSMAC)
>+#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
> #define HAVE_CELESTIAL 1
> #define HAVE_CORE_ANIMATION_RENDER_SERVER 1
> #endif
> 
>-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOSMAC) && !PLATFORM(APPLETV)
>+#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST) && !PLATFORM(APPLETV)
> #define HAVE_PARENTAL_CONTROLS_WITH_UNBLOCK_HANDLER 1
> #endif
> 
>@@ -1085,7 +1085,7 @@
> #define USE_AVFOUNDATION 1
> #define USE_PROTECTION_SPACE_AUTH_CALLBACK 1
> 
>-#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV) && !PLATFORM(IOSMAC)
>+#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV) && !PLATFORM(MACCATALYST)
> #define ENABLE_DATA_DETECTION 1
> #endif
> 
>@@ -1104,7 +1104,7 @@
> #define USE_OPENGL 1
> #define USE_OPENGL_ES 0
> #define USE_ANGLE 0
>-#elif PLATFORM(IOSMAC) && __has_include(<OpenGL/OpenGL.h>)
>+#elif PLATFORM(MACCATALYST) && __has_include(<OpenGL/OpenGL.h>)
> #define USE_OPENGL 1
> #define USE_OPENGL_ES 0
> #define USE_ANGLE 0
>@@ -1277,7 +1277,7 @@
> #define HAVE_IOSURFACE 1
> #endif
> 
>-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR) && !PLATFORM(IOSMAC)
>+#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR) && !PLATFORM(MACCATALYST)
> #define HAVE_IOSURFACE_ACCELERATOR 1
> #endif
> 
>@@ -1376,7 +1376,7 @@
> #define USE_LIBWEBRTC 1
> #endif
> 
>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || PLATFORM(IOS) || PLATFORM(IOSMAC) || USE(GCRYPT)
>+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || PLATFORM(IOS) || PLATFORM(MACCATALYST) || USE(GCRYPT)
> #define HAVE_RSA_PSS 1
> #endif
> 
>@@ -1388,7 +1388,7 @@
> #define HAVE_HSTS_STORAGE_PATH 1
> #endif
> 
>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || PLATFORM(IOS) || PLATFORM(IOSMAC)
>+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || PLATFORM(IOS) || PLATFORM(MACCATALYST)
> #define HAVE_URL_FORMATTING 1
> #endif
> 
>@@ -1396,11 +1396,11 @@
> #define HAVE_STACK_BOUNDS_FOR_NEW_THREAD 1
> #endif
> 
>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || PLATFORM(IOS) || PLATFORM(IOSMAC)
>+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || PLATFORM(IOS) || PLATFORM(MACCATALYST)
> #define HAVE_AVCONTENTKEYSESSION 1
> #endif
> 
>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || PLATFORM(IOS) || PLATFORM(IOSMAC)
>+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || PLATFORM(IOS) || PLATFORM(MACCATALYST)
> #define HAVE_SEC_KEY_PROXY 1
> #endif
> 
>@@ -1550,7 +1550,7 @@
> #define HAVE_UI_WK_DOCUMENT_CONTEXT 1
> #endif
> 
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
> #define ENABLE_PLATFORM_DRIVEN_TEXT_CHECKING 1
> #endif
> 
>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 246846)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,57 @@
>+2019-06-26  Beth Dakin  <bdakin@apple.com>
>+
>+        Upstream use of MACCATALYST
>+        https://bugs.webkit.org/show_bug.cgi?id=199245
>+        rdar://problem/51687723
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/Base.xcconfig:
>+        * Configurations/FeatureDefines.xcconfig:
>+        * Configurations/SDKVariant.xcconfig:
>+        * Configurations/WebCore.xcconfig:
>+        * Modules/geolocation/ios/GeolocationPositionIOS.mm:
>+        (WebCore::GeolocationPosition::GeolocationPosition):
>+        * editing/cocoa/DictionaryLookup.mm:
>+        (-[WebRevealHighlight drawHighlightContentForItem:context:]):
>+        (WebCore::showPopupOrCreateAnimationController):
>+        * editing/cocoa/WebContentReaderCocoa.mm:
>+        * page/Navigator.h:
>+        * page/SettingsBase.cpp:
>+        (WebCore::SettingsBase::defaultContentChangeObserverEnabled):
>+        * page/cocoa/MemoryReleaseCocoa.mm:
>+        (WebCore::platformReleaseMemory):
>+        * platform/audio/ios/AudioSessionIOS.mm:
>+        (WebCore::AudioSession::setCategory):
>+        (WebCore::AudioSession::routingContextUID const):
>+        * platform/cocoa/ParentalControlsContentFilter.mm:
>+        (WebCore::canHandleResponse):
>+        * platform/graphics/avfoundation/objc/AVAssetMIMETypeCache.mm:
>+        (WebCore::AVAssetMIMETypeCache::isAvailable const):
>+        * platform/graphics/avfoundation/objc/AVStreamDataParserMIMETypeCache.mm:
>+        (WebCore::AVStreamDataParserMIMETypeCache::isAvailable const):
>+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
>+        (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayer):
>+        (WebCore::MediaPlayerPrivateAVFoundationObjC::setShouldDisableSleep):
>+        * platform/graphics/cv/ImageTransferSessionVT.h:
>+        * platform/graphics/cv/ImageTransferSessionVT.mm:
>+        (WebCore::cvPixelFormatOpenGLKey):
>+        (WebCore::ImageTransferSessionVT::ImageTransferSessionVT):
>+        * platform/ios/PasteboardIOS.mm:
>+        (WebCore::Pasteboard::readPasteboardWebContentDataForType):
>+        (WebCore::Pasteboard::supportedWebContentPasteboardTypes):
>+        * platform/ios/PlatformPasteboardIOS.mm:
>+        (WebCore::registerItemToPasteboard):
>+        (WebCore::PlatformPasteboard::write):
>+        * platform/ios/VideoFullscreenInterfaceAVKit.mm:
>+        (-[WebAVPlayerLayer setVideoGravity:]):
>+        * platform/ios/WebItemProviderPasteboard.mm:
>+        (-[WebItemProviderRegistrationInfoList itemProvider]):
>+        (-[WebItemProviderLoadResult canBeRepresentedAsFileUpload]):
>+        (-[WebItemProviderPasteboard numberOfFiles]):
>+        * platform/network/cf/CertificateInfoCFNet.cpp:
>+        (WebCore::CertificateInfo::summaryInfo const):
>+
> 2019-06-26  Myles C. Maxfield  <mmaxfield@apple.com>
> 
>         REGRESSION: ( r246394 ) webgpu/whlsl-buffer-fragment.html and webgpu/whlsl-buffer-vertex.html are failing
>Index: Source/WebCore/Configurations/Base.xcconfig
>===================================================================
>--- Source/WebCore/Configurations/Base.xcconfig	(revision 246846)
>+++ Source/WebCore/Configurations/Base.xcconfig	(working copy)
>@@ -131,8 +131,8 @@ LLVM_TARGET_TRIPLE_SUFFIX = $(inherited)
> 
> WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
> WK_COCOA_TOUCH_iphoneos = cocoatouch;
>-WK_COCOA_TOUCH_iosmac = cocoatouch;
> WK_COCOA_TOUCH_iphonesimulator = cocoatouch;
>+WK_COCOA_TOUCH_maccatalyst = cocoatouch;
> WK_COCOA_TOUCH_watchos = cocoatouch;
> WK_COCOA_TOUCH_watchsimulator = cocoatouch;
> WK_COCOA_TOUCH_appletvos = cocoatouch;
>Index: Source/WebCore/Configurations/FeatureDefines.xcconfig
>===================================================================
>--- Source/WebCore/Configurations/FeatureDefines.xcconfig	(revision 246846)
>+++ Source/WebCore/Configurations/FeatureDefines.xcconfig	(working copy)
>@@ -69,9 +69,9 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE
> ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
> 
> ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
>-ENABLE_CONTENT_FILTERING_iosmac = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
>+ENABLE_CONTENT_FILTERING_maccatalyst = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
>@@ -90,7 +90,7 @@ ENABLE_CSS_CONIC_GRADIENTS_iphonesimulat
> ENABLE_CSS_CONIC_GRADIENTS_iphonesimulator[sdk=iphone*11.*] = ;
> ENABLE_CSS_CONIC_GRADIENTS_watchos = ENABLE_CSS_CONIC_GRADIENTS;
> ENABLE_CSS_CONIC_GRADIENTS_watchsimulator = ENABLE_CSS_CONIC_GRADIENTS;
>-ENABLE_CSS_CONIC_GRADIENTS_iosmac = ENABLE_CSS_CONIC_GRADIENTS;
>+ENABLE_CSS_CONIC_GRADIENTS_maccatalyst = ENABLE_CSS_CONIC_GRADIENTS;
> ENABLE_CSS_CONIC_GRADIENTS_macosx = $(ENABLE_CSS_CONIC_GRADIENTS$(WK_MACOS_1014));
> ENABLE_CSS_CONIC_GRADIENTS_MACOS_SINCE_1014 = ENABLE_CSS_CONIC_GRADIENTS;
> 
>@@ -117,7 +117,7 @@ ENABLE_CUSTOM_SCHEME_HANDLER = ;
> ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME));
> ENABLE_DARK_MODE_CSS_iphoneos = ENABLE_DARK_MODE_CSS;
> ENABLE_DARK_MODE_CSS_iphonesimulator = ENABLE_DARK_MODE_CSS;
>-ENABLE_DARK_MODE_CSS_iosmac = ENABLE_DARK_MODE_CSS;
>+ENABLE_DARK_MODE_CSS_maccatalyst = ENABLE_DARK_MODE_CSS;
> ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS;
> 
> ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
>@@ -127,7 +127,7 @@ ENABLE_DATALIST_ELEMENT = ENABLE_DATALIS
> ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
> ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
> ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
>-ENABLE_DATA_INTERACTION_iosmac = ENABLE_DATA_INTERACTION;
>+ENABLE_DATA_INTERACTION_maccatalyst = ENABLE_DATA_INTERACTION;
> 
> ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_PLATFORM_NAME));
> ENABLE_DEVICE_ORIENTATION_iphoneos = ENABLE_DEVICE_ORIENTATION;
>@@ -140,7 +140,7 @@ ENABLE_DEVICE_ORIENTATION_appletvsimulat
> ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(WK_PLATFORM_NAME));
> ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
> ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
>-ENABLE_DRAG_SUPPORT_iosmac = ENABLE_DRAG_SUPPORT;
>+ENABLE_DRAG_SUPPORT_maccatalyst = ENABLE_DRAG_SUPPORT;
> 
> ENABLE_ENCRYPTED_MEDIA = $(ENABLE_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME));
> ENABLE_ENCRYPTED_MEDIA_iphoneos = ENABLE_ENCRYPTED_MEDIA;
>@@ -158,14 +158,14 @@ ENABLE_EXPERIMENTAL_FEATURES_YES = ENABL
> ENABLE_FAST_JIT_PERMISSIONS = $(ENABLE_FAST_JIT_PERMISSIONS_$(WK_PLATFORM_NAME));
> ENABLE_FAST_JIT_PERMISSIONS_iphoneos[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSIONS_iphoneos_$(USE_INTERNAL_SDK));
> ENABLE_FAST_JIT_PERMISSIONS_iphoneos_YES = ENABLE_FAST_JIT_PERMISSIONS;
>-ENABLE_FAST_JIT_PERMISSIONS_iosmac = ;
>+ENABLE_FAST_JIT_PERMISSIONS_maccatalyst = ;
> 
> ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
> 
> ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(WK_PLATFORM_NAME))
> ENABLE_FTL_JIT_macosx = ENABLE_FTL_JIT;
> ENABLE_FTL_JIT_iphoneos = ENABLE_FTL_JIT;
>-ENABLE_FTL_JIT_iosmac = ENABLE_FTL_JIT;
>+ENABLE_FTL_JIT_maccatalyst = ENABLE_FTL_JIT;
> ENABLE_FTL_JIT_watchos = ENABLE_FTL_JIT;
> ENABLE_FTL_JIT_appletvos = ENABLE_FTL_JIT;
> 
>@@ -177,16 +177,16 @@ ENABLE_FULLSCREEN_API_macosx = ENABLE_FU
> 
> ENABLE_GAMEPAD = $(ENABLE_GAMEPAD_$(WK_PLATFORM_NAME));
> ENABLE_GAMEPAD_iphoneos = ENABLE_GAMEPAD;
>-ENABLE_GAMEPAD_iosmac = ENABLE_GAMEPAD;
> ENABLE_GAMEPAD_iphonesimulator = ENABLE_GAMEPAD;
> ENABLE_GAMEPAD_appletvos = ENABLE_GAMEPAD;
> ENABLE_GAMEPAD_appletvsimulator = ENABLE_GAMEPAD;
>+ENABLE_GAMEPAD_maccatalyst = ENABLE_GAMEPAD;
> ENABLE_GAMEPAD_macosx = ENABLE_GAMEPAD;
> 
> ENABLE_GEOLOCATION = $(ENABLE_GEOLOCATION_$(WK_PLATFORM_NAME));
> ENABLE_GEOLOCATION_iphoneos = ENABLE_GEOLOCATION;
>-ENABLE_GEOLOCATION_iosmac = ENABLE_GEOLOCATION;
> ENABLE_GEOLOCATION_iphonesimulator = ENABLE_GEOLOCATION;
>+ENABLE_GEOLOCATION_maccatalyst = ENABLE_GEOLOCATION;
> ENABLE_GEOLOCATION_macosx = ENABLE_GEOLOCATION;
> 
> ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(WK_PLATFORM_NAME));
>@@ -319,9 +319,9 @@ ENABLE_PDFKIT_PLUGIN = $(ENABLE_PDFKIT_P
> ENABLE_PDFKIT_PLUGIN_macosx = ENABLE_PDFKIT_PLUGIN;
> 
> ENABLE_POINTER_EVENTS = $(ENABLE_POINTER_EVENTS_$(WK_PLATFORM_NAME));
>-ENABLE_POINTER_EVENTS_iosmac = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_iphoneos = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_iphonesimulator = ENABLE_POINTER_EVENTS;
>+ENABLE_POINTER_EVENTS_maccatalyst = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_macosx = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_watchos = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_watchsimulator = ENABLE_POINTER_EVENTS;
>@@ -385,8 +385,8 @@ ENABLE_USER_MESSAGE_HANDLERS = ENABLE_US
> 
> ENABLE_VARIATION_FONTS = $(ENABLE_VARIATION_FONTS_$(WK_PLATFORM_NAME));
> ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
>-ENABLE_VARIATION_FONTS_iosmac = ENABLE_VARIATION_FONTS;
> ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
>+ENABLE_VARIATION_FONTS_maccatalyst = ENABLE_VARIATION_FONTS;
> ENABLE_VARIATION_FONTS_macosx = $(ENABLE_VARIATION_FONTS$(WK_MACOS_1013));
> ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 = ENABLE_VARIATION_FONTS;
> 
>Index: Source/WebCore/Configurations/SDKVariant.xcconfig
>===================================================================
>--- Source/WebCore/Configurations/SDKVariant.xcconfig	(revision 246846)
>+++ Source/WebCore/Configurations/SDKVariant.xcconfig	(working copy)
>@@ -30,7 +30,7 @@ WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /Sy
> WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
> 
> WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = maccatalyst;
> WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
> 
> WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>Index: Source/WebCore/Configurations/WebCore.xcconfig
>===================================================================
>--- Source/WebCore/Configurations/WebCore.xcconfig	(revision 246846)
>+++ Source/WebCore/Configurations/WebCore.xcconfig	(working copy)
>@@ -90,9 +90,9 @@ WK_GRAPHICS_SERVICES_LDFLAGS_cocoatouch 
> 
> WK_IOSURFACE_LDFLAGS = $(WK_IOSURFACE_LDFLAGS_$(WK_PLATFORM_NAME));
> WK_IOSURFACE_LDFLAGS_iphoneos = -framework IOSurface -framework IOSurfaceAccelerator;
>-WK_IOSURFACE_LDFLAGS_iosmac = -framework IOSurface;
> WK_IOSURFACE_LDFLAGS_watchos = $(WK_IOSURFACE_LDFLAGS_iphoneos);
> WK_IOSURFACE_LDFLAGS_appletvos = $(WK_IOSURFACE_LDFLAGS_iphoneos);
>+WK_IOSURFACE_LDFLAGS_maccatalyst = -framework IOSurface;
> WK_IOSURFACE_LDFLAGS_macosx = -framework IOSurface;
> 
> WK_LIBWEBRTC_LDFLAGS = $(WK_LIBWEBRTC_LDFLAGS_$(ENABLE_WEB_RTC));
>@@ -106,12 +106,12 @@ WK_MOBILE_GESTALT_LDFLAGS_cocoatouch = -
> 
> WK_OPENGL_LDFLAGS = $(WK_OPENGL_LDFLAGS_$(WK_PLATFORM_NAME));
> WK_OPENGL_LDFLAGS_iphoneos = -framework OpenGLES;
>-WK_OPENGL_LDFLAGS_iosmac = -framework OpenGL;
> WK_OPENGL_LDFLAGS_iphonesimulator = -framework OpenGLES;
> WK_OPENGL_LDFLAGS_watchos = $(WK_OPENGL_LDFLAGS_iphoneos);
> WK_OPENGL_LDFLAGS_watchsimulator = $(WK_OPENGL_LDFLAGS_iphonesimulator);
> WK_OPENGL_LDFLAGS_appletvos = $(WK_OPENGL_LDFLAGS_iphoneos);
> WK_OPENGL_LDFLAGS_appletvsimulator = $(WK_OPENGL_LDFLAGS_iphonesimulator);
>+WK_OPENGL_LDFLAGS_maccatalyst = -framework OpenGL;
> WK_OPENGL_LDFLAGS_macosx = -framework OpenGL;
> 
> WK_SYSTEM_CONFIGURATION_LDFLAGS = $(WK_SYSTEM_CONFIGURATION_LDFLAGS_$(WK_PLATFORM_NAME));
>@@ -185,12 +185,12 @@ TEXT_BASED_API_FILE = WebCore.tbd
> 
> WK_HAVE_URL_FORMATTING = $(WK_HAVE_URL_FORMATTING_$(WK_PLATFORM_NAME));
> WK_HAVE_URL_FORMATTING_iphoneos = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
>-WK_HAVE_URL_FORMATTING_iosmac = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
> WK_HAVE_URL_FORMATTING_iphonesimulator = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
> WK_HAVE_URL_FORMATTING_watchos = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
> WK_HAVE_URL_FORMATTING_watchsimulator = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
> WK_HAVE_URL_FORMATTING_appletvos = NO
> WK_HAVE_URL_FORMATTING_appletvsimulator = NO;
>+WK_HAVE_URL_FORMATTING_maccatalyst = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
> WK_HAVE_URL_FORMATTING_macosx = $(WK_HAVE_URL_FORMATTING$(WK_MACOS_1014));
> WK_HAVE_URL_FORMATTING_MACOS_SINCE_1014 = YES;
> WK_HAVE_URL_FORMATTING_IOS_SINCE_12 = YES;
>Index: Source/WebCore/Modules/geolocation/ios/GeolocationPositionIOS.mm
>===================================================================
>--- Source/WebCore/Modules/geolocation/ios/GeolocationPositionIOS.mm	(revision 246846)
>+++ Source/WebCore/Modules/geolocation/ios/GeolocationPositionIOS.mm	(working copy)
>@@ -46,7 +46,7 @@ GeolocationPosition::GeolocationPosition
>         speed = location.speed;
>     if (location.course >= 0.0)
>         heading = location.course;
>-#if !PLATFORM(IOSMAC)
>+#if !PLATFORM(MACCATALYST)
>     if (location.floor)
>         floorLevel = location.floor.level;
> #endif
>Index: Source/WebCore/PAL/ChangeLog
>===================================================================
>--- Source/WebCore/PAL/ChangeLog	(revision 246846)
>+++ Source/WebCore/PAL/ChangeLog	(working copy)
>@@ -1,3 +1,16 @@
>+2019-06-26  Beth Dakin  <bdakin@apple.com>
>+
>+        Upstream use of MACCATALYST
>+        https://bugs.webkit.org/show_bug.cgi?id=199245
>+        rdar://problem/51687723
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/Base.xcconfig:
>+        * Configurations/FeatureDefines.xcconfig:
>+        * Configurations/SDKVariant.xcconfig:
>+        * pal/spi/mac/AVFoundationSPI.h:
>+
> 2019-06-25  Alex Christensen  <achristensen@webkit.org>
> 
>         Make HTTPCookieAcceptPolicy an enum class
>Index: Source/WebCore/PAL/Configurations/Base.xcconfig
>===================================================================
>--- Source/WebCore/PAL/Configurations/Base.xcconfig	(revision 246846)
>+++ Source/WebCore/PAL/Configurations/Base.xcconfig	(working copy)
>@@ -128,8 +128,8 @@ OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
> 
> WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
> WK_COCOA_TOUCH_iphoneos = cocoatouch;
>-WK_COCOA_TOUCH_iosmac = cocoatouch;
> WK_COCOA_TOUCH_iphonesimulator = cocoatouch;
>+WK_COCOA_TOUCH_maccatalyst = cocoatouch;
> WK_COCOA_TOUCH_watchos = cocoatouch;
> WK_COCOA_TOUCH_watchsimulator = cocoatouch;
> WK_COCOA_TOUCH_appletvos = cocoatouch;
>Index: Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
>===================================================================
>--- Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig	(revision 246846)
>+++ Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig	(working copy)
>@@ -69,9 +69,9 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE
> ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
> 
> ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
>-ENABLE_CONTENT_FILTERING_iosmac = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
>+ENABLE_CONTENT_FILTERING_maccatalyst = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
>@@ -90,7 +90,7 @@ ENABLE_CSS_CONIC_GRADIENTS_iphonesimulat
> ENABLE_CSS_CONIC_GRADIENTS_iphonesimulator[sdk=iphone*11.*] = ;
> ENABLE_CSS_CONIC_GRADIENTS_watchos = ENABLE_CSS_CONIC_GRADIENTS;
> ENABLE_CSS_CONIC_GRADIENTS_watchsimulator = ENABLE_CSS_CONIC_GRADIENTS;
>-ENABLE_CSS_CONIC_GRADIENTS_iosmac = ENABLE_CSS_CONIC_GRADIENTS;
>+ENABLE_CSS_CONIC_GRADIENTS_maccatalyst = ENABLE_CSS_CONIC_GRADIENTS;
> ENABLE_CSS_CONIC_GRADIENTS_macosx = $(ENABLE_CSS_CONIC_GRADIENTS$(WK_MACOS_1014));
> ENABLE_CSS_CONIC_GRADIENTS_MACOS_SINCE_1014 = ENABLE_CSS_CONIC_GRADIENTS;
> 
>@@ -117,7 +117,7 @@ ENABLE_CUSTOM_SCHEME_HANDLER = ;
> ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME));
> ENABLE_DARK_MODE_CSS_iphoneos = ENABLE_DARK_MODE_CSS;
> ENABLE_DARK_MODE_CSS_iphonesimulator = ENABLE_DARK_MODE_CSS;
>-ENABLE_DARK_MODE_CSS_iosmac = ENABLE_DARK_MODE_CSS;
>+ENABLE_DARK_MODE_CSS_maccatalyst = ENABLE_DARK_MODE_CSS;
> ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS;
> 
> ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
>@@ -127,7 +127,7 @@ ENABLE_DATALIST_ELEMENT = ENABLE_DATALIS
> ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
> ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
> ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
>-ENABLE_DATA_INTERACTION_iosmac = ENABLE_DATA_INTERACTION;
>+ENABLE_DATA_INTERACTION_maccatalyst = ENABLE_DATA_INTERACTION;
> 
> ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_PLATFORM_NAME));
> ENABLE_DEVICE_ORIENTATION_iphoneos = ENABLE_DEVICE_ORIENTATION;
>@@ -140,7 +140,7 @@ ENABLE_DEVICE_ORIENTATION_appletvsimulat
> ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(WK_PLATFORM_NAME));
> ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
> ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
>-ENABLE_DRAG_SUPPORT_iosmac = ENABLE_DRAG_SUPPORT;
>+ENABLE_DRAG_SUPPORT_maccatalyst = ENABLE_DRAG_SUPPORT;
> 
> ENABLE_ENCRYPTED_MEDIA = $(ENABLE_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME));
> ENABLE_ENCRYPTED_MEDIA_iphoneos = ENABLE_ENCRYPTED_MEDIA;
>@@ -158,14 +158,14 @@ ENABLE_EXPERIMENTAL_FEATURES_YES = ENABL
> ENABLE_FAST_JIT_PERMISSIONS = $(ENABLE_FAST_JIT_PERMISSIONS_$(WK_PLATFORM_NAME));
> ENABLE_FAST_JIT_PERMISSIONS_iphoneos[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSIONS_iphoneos_$(USE_INTERNAL_SDK));
> ENABLE_FAST_JIT_PERMISSIONS_iphoneos_YES = ENABLE_FAST_JIT_PERMISSIONS;
>-ENABLE_FAST_JIT_PERMISSIONS_iosmac = ;
>+ENABLE_FAST_JIT_PERMISSIONS_maccatalyst = ;
> 
> ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
> 
> ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(WK_PLATFORM_NAME))
> ENABLE_FTL_JIT_macosx = ENABLE_FTL_JIT;
> ENABLE_FTL_JIT_iphoneos = ENABLE_FTL_JIT;
>-ENABLE_FTL_JIT_iosmac = ENABLE_FTL_JIT;
>+ENABLE_FTL_JIT_maccatalyst = ENABLE_FTL_JIT;
> ENABLE_FTL_JIT_watchos = ENABLE_FTL_JIT;
> ENABLE_FTL_JIT_appletvos = ENABLE_FTL_JIT;
> 
>@@ -177,16 +177,16 @@ ENABLE_FULLSCREEN_API_macosx = ENABLE_FU
> 
> ENABLE_GAMEPAD = $(ENABLE_GAMEPAD_$(WK_PLATFORM_NAME));
> ENABLE_GAMEPAD_iphoneos = ENABLE_GAMEPAD;
>-ENABLE_GAMEPAD_iosmac = ENABLE_GAMEPAD;
> ENABLE_GAMEPAD_iphonesimulator = ENABLE_GAMEPAD;
> ENABLE_GAMEPAD_appletvos = ENABLE_GAMEPAD;
> ENABLE_GAMEPAD_appletvsimulator = ENABLE_GAMEPAD;
>+ENABLE_GAMEPAD_maccatalyst = ENABLE_GAMEPAD;
> ENABLE_GAMEPAD_macosx = ENABLE_GAMEPAD;
> 
> ENABLE_GEOLOCATION = $(ENABLE_GEOLOCATION_$(WK_PLATFORM_NAME));
> ENABLE_GEOLOCATION_iphoneos = ENABLE_GEOLOCATION;
>-ENABLE_GEOLOCATION_iosmac = ENABLE_GEOLOCATION;
> ENABLE_GEOLOCATION_iphonesimulator = ENABLE_GEOLOCATION;
>+ENABLE_GEOLOCATION_maccatalyst = ENABLE_GEOLOCATION;
> ENABLE_GEOLOCATION_macosx = ENABLE_GEOLOCATION;
> 
> ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(WK_PLATFORM_NAME));
>@@ -319,9 +319,9 @@ ENABLE_PDFKIT_PLUGIN = $(ENABLE_PDFKIT_P
> ENABLE_PDFKIT_PLUGIN_macosx = ENABLE_PDFKIT_PLUGIN;
> 
> ENABLE_POINTER_EVENTS = $(ENABLE_POINTER_EVENTS_$(WK_PLATFORM_NAME));
>-ENABLE_POINTER_EVENTS_iosmac = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_iphoneos = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_iphonesimulator = ENABLE_POINTER_EVENTS;
>+ENABLE_POINTER_EVENTS_maccatalyst = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_macosx = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_watchos = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_watchsimulator = ENABLE_POINTER_EVENTS;
>@@ -385,8 +385,8 @@ ENABLE_USER_MESSAGE_HANDLERS = ENABLE_US
> 
> ENABLE_VARIATION_FONTS = $(ENABLE_VARIATION_FONTS_$(WK_PLATFORM_NAME));
> ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
>-ENABLE_VARIATION_FONTS_iosmac = ENABLE_VARIATION_FONTS;
> ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
>+ENABLE_VARIATION_FONTS_maccatalyst = ENABLE_VARIATION_FONTS;
> ENABLE_VARIATION_FONTS_macosx = $(ENABLE_VARIATION_FONTS$(WK_MACOS_1013));
> ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 = ENABLE_VARIATION_FONTS;
> 
>Index: Source/WebCore/PAL/Configurations/SDKVariant.xcconfig
>===================================================================
>--- Source/WebCore/PAL/Configurations/SDKVariant.xcconfig	(revision 246846)
>+++ Source/WebCore/PAL/Configurations/SDKVariant.xcconfig	(working copy)
>@@ -30,7 +30,7 @@ WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /Sy
> WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
> 
> WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = maccatalyst;
> WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
> 
> WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>Index: Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h
>===================================================================
>--- Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h	(revision 246846)
>+++ Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h	(working copy)
>@@ -312,7 +312,7 @@ @interface AVVideoPerformanceMetrics (AV
> @end
> #endif
> 
>-#if !USE(APPLE_INTERNAL_SDK) && PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR) && !PLATFORM(IOSMAC)
>+#if !USE(APPLE_INTERNAL_SDK) && PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR) && !PLATFORM(MACCATALYST)
> #import <AVFoundation/AVAudioSession.h>
> 
> NS_ASSUME_NONNULL_BEGIN
>Index: Source/WebCore/editing/cocoa/DictionaryLookup.mm
>===================================================================
>--- Source/WebCore/editing/cocoa/DictionaryLookup.mm	(revision 246846)
>+++ Source/WebCore/editing/cocoa/DictionaryLookup.mm	(working copy)
>@@ -59,11 +59,11 @@
> #import <PDFKit/PDFKit.h>
> #endif
> 
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
> #import <UIKitMacHelper/UINSRevealController.h>
> SOFT_LINK_PRIVATE_FRAMEWORK(UIKitMacHelper)
> SOFT_LINK(UIKitMacHelper, UINSSharedRevealController, id<UINSRevealController>, (void), ())
>-#endif // PLATFORM(IOSMAC)
>+#endif // PLATFORM(MACCATALYST)
> 
> #if ENABLE(REVEAL)
> SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(Reveal)
>@@ -159,7 +159,7 @@ - (void)revealContext:(RVPresentingConte
> 
> @end
> 
>-#elif PLATFORM(IOSMAC) // PLATFORM(MAC)
>+#elif PLATFORM(MACCATALYST) // PLATFORM(MAC)
> 
> @interface WebRevealHighlight <UIRVPresenterHighlightDelegate> : NSObject {
> @private
>@@ -246,8 +246,8 @@ - (void)drawHighlightContentForItem:(RVI
>     WebCore::CGContextStateSaver saveState(context);
>     CGAffineTransform contextTransform = CGContextGetCTM(context);
>     CGFloat backingScale = contextTransform.a;
>-    CGFloat iOSMacScaleFactor = [PAL::getUIApplicationClass() sharedApplication]._iOSMacScale;
>-    CGAffineTransform transform = CGAffineTransformMakeScale(iOSMacScaleFactor * backingScale, iOSMacScaleFactor * backingScale);
>+    CGFloat macCatalystScaleFactor = [PAL::getUIApplicationClass() sharedApplication]._iOSMacScale;
>+    CGAffineTransform transform = CGAffineTransformMakeScale(macCatalystScaleFactor * backingScale, macCatalystScaleFactor * backingScale);
>     CGContextSetCTM(context, transform);
>     
>     for (NSValue *v in rects) {
>@@ -260,7 +260,7 @@ - (void)drawHighlightContentForItem:(RVI
> 
> @end
> 
>-#endif // PLATFORM(IOSMAC)
>+#endif // PLATFORM(MACCATALYST)
> 
> #endif // ENABLE(REVEAL)
> 
>@@ -494,7 +494,7 @@ static WKRevealController showPopupOrCre
>     [presenter revealItem:item.get() documentContext:nil presentingContext:context.get() options:nil];
>     return nil;
>     
>-#elif PLATFORM(IOSMAC)
>+#elif PLATFORM(MACCATALYST)
>     
>     UNUSED_PARAM(textIndicatorInstallationCallback);
>     UNUSED_PARAM(rootViewToViewConversionCallback);
>Index: Source/WebCore/editing/cocoa/WebContentReaderCocoa.mm
>===================================================================
>--- Source/WebCore/editing/cocoa/WebContentReaderCocoa.mm	(revision 246846)
>+++ Source/WebCore/editing/cocoa/WebContentReaderCocoa.mm	(working copy)
>@@ -89,7 +89,7 @@ SOFT_LINK(WebKitLegacy, _WebCreateFragme
> 
> namespace WebCore {
> 
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
> 
> static FragmentAndResources createFragment(Frame&, NSAttributedString *)
> {
>Index: Source/WebCore/page/Navigator.h
>===================================================================
>--- Source/WebCore/page/Navigator.h	(revision 246846)
>+++ Source/WebCore/page/Navigator.h	(working copy)
>@@ -56,7 +56,7 @@ public:
>     void getStorageUpdates();
> 
> #if ENABLE(POINTER_EVENTS)
>-#if ENABLE(IOS_TOUCH_EVENTS) && !PLATFORM(IOSMAC)
>+#if ENABLE(IOS_TOUCH_EVENTS) && !PLATFORM(MACCATALYST)
>     int maxTouchPoints() const { return 5; }
> #else
>     int maxTouchPoints() const { return 0; }
>Index: Source/WebCore/page/SettingsBase.cpp
>===================================================================
>--- Source/WebCore/page/SettingsBase.cpp	(revision 246846)
>+++ Source/WebCore/page/SettingsBase.cpp	(working copy)
>@@ -109,7 +109,7 @@ bool SettingsBase::defaultDownloadableBi
> 
> bool SettingsBase::defaultContentChangeObserverEnabled()
> {
>-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOSMAC)
>+#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
>     return true;
> #else
>     return false;
>Index: Source/WebCore/page/cocoa/MemoryReleaseCocoa.mm
>===================================================================
>--- Source/WebCore/page/cocoa/MemoryReleaseCocoa.mm	(revision 246846)
>+++ Source/WebCore/page/cocoa/MemoryReleaseCocoa.mm	(working copy)
>@@ -49,7 +49,7 @@ void platformReleaseMemory(Critical)
> #endif
>     clearFontFamilySpecificationCoreTextCache();
> 
>-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR) && !PLATFORM(IOSMAC)
>+#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR) && !PLATFORM(MACCATALYST)
>     // FIXME: Remove this call to GSFontInitialize() once <rdar://problem/32886715> is fixed.
>     GSFontInitialize();
>     GSFontPurgeFontCache();
>Index: Source/WebCore/platform/audio/ios/AudioSessionIOS.mm
>===================================================================
>--- Source/WebCore/platform/audio/ios/AudioSessionIOS.mm	(revision 246846)
>+++ Source/WebCore/platform/audio/ios/AudioSessionIOS.mm	(working copy)
>@@ -125,7 +125,7 @@ void AudioSession::setCategory(CategoryT
> 
>     NSError *error = nil;
>     [[PAL::getAVAudioSessionClass() sharedInstance] setCategory:categoryString mode:categoryMode routeSharingPolicy:static_cast<AVAudioSessionRouteSharingPolicy>(policy) options:options error:&error];
>-#if !PLATFORM(IOS_FAMILY_SIMULATOR) && !PLATFORM(IOSMAC)
>+#if !PLATFORM(IOS_FAMILY_SIMULATOR) && !PLATFORM(MACCATALYST)
>     ASSERT(!error);
> #endif
> }
>@@ -168,7 +168,7 @@ ALLOW_DEPRECATED_DECLARATIONS_END
> 
> String AudioSession::routingContextUID() const
> {
>-#if !PLATFORM(IOS_FAMILY_SIMULATOR) && !PLATFORM(IOSMAC) && !PLATFORM(WATCHOS)
>+#if !PLATFORM(IOS_FAMILY_SIMULATOR) && !PLATFORM(MACCATALYST) && !PLATFORM(WATCHOS)
>     return [[PAL::getAVAudioSessionClass() sharedInstance] routingContextUID];
> #else
>     return emptyString();
>Index: Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm
>===================================================================
>--- Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm	(revision 246846)
>+++ Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm	(working copy)
>@@ -55,7 +55,7 @@ std::unique_ptr<ParentalControlsContentF
> 
> static inline bool canHandleResponse(const ResourceResponse& response)
> {
>-#if PLATFORM(MAC) || PLATFORM(IOSMAC)
>+#if PLATFORM(MAC) || PLATFORM(MACCATALYST)
>     return response.url().protocolIs("https");
> #else
>     return response.url().protocolIsInHTTPFamily();
>Index: Source/WebCore/platform/graphics/avfoundation/objc/AVAssetMIMETypeCache.mm
>===================================================================
>--- Source/WebCore/platform/graphics/avfoundation/objc/AVAssetMIMETypeCache.mm	(revision 246846)
>+++ Source/WebCore/platform/graphics/avfoundation/objc/AVAssetMIMETypeCache.mm	(working copy)
>@@ -33,7 +33,7 @@
> #import <pal/cocoa/AVFoundationSoftLink.h>
> #import <wtf/HashSet.h>
> 
>-#if !PLATFORM(IOSMAC)
>+#if !PLATFORM(MACCATALYST)
> SOFT_LINK_FRAMEWORK_OPTIONAL_PREFLIGHT(AVFoundation)
> #endif
> 
>@@ -89,7 +89,7 @@ bool AVAssetMIMETypeCache::canDecodeType
> bool AVAssetMIMETypeCache::isAvailable() const
> {
> #if ENABLE(VIDEO) && USE(AVFOUNDATION)
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
>     // FIXME: This should be using AVFoundationLibraryIsAvailable() instead, but doing so causes soft-linking
>     // to subsequently fail on certain symbols. See <rdar://problem/42224780> for more details.
>     return PAL::isAVFoundationFrameworkAvailable();
>Index: Source/WebCore/platform/graphics/avfoundation/objc/AVStreamDataParserMIMETypeCache.mm
>===================================================================
>--- Source/WebCore/platform/graphics/avfoundation/objc/AVStreamDataParserMIMETypeCache.mm	(revision 246846)
>+++ Source/WebCore/platform/graphics/avfoundation/objc/AVStreamDataParserMIMETypeCache.mm	(working copy)
>@@ -34,7 +34,7 @@
> #import <pal/cocoa/AVFoundationSoftLink.h>
> #import <wtf/HashSet.h>
> 
>-#if !PLATFORM(IOSMAC)
>+#if !PLATFORM(MACCATALYST)
> SOFT_LINK_FRAMEWORK_OPTIONAL_PREFLIGHT(AVFoundation)
> #endif
> 
>@@ -89,7 +89,7 @@ bool AVStreamDataParserMIMETypeCache::ca
> bool AVStreamDataParserMIMETypeCache::isAvailable() const
> {
> #if ENABLE(VIDEO) && USE(AVFOUNDATION)
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
>     // FIXME: This should be using AVFoundationLibraryIsAvailable() instead, but doing so causes soft-linking
>     // to subsequently fail on certain symbols. See <rdar://problem/42224780> for more details.
>     if (!PAL::AVFoundationLibrary())
>Index: Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
>===================================================================
>--- Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm	(revision 246846)
>+++ Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm	(working copy)
>@@ -889,7 +889,7 @@ void MediaPlayerPrivateAVFoundationObjC:
>     }
> #endif
> 
>-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR) && !PLATFORM(IOSMAC)
>+#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR) && !PLATFORM(MACCATALYST)
>     setShouldDisableSleep(player()->shouldDisableSleep());
> #endif
> 
>@@ -3139,7 +3139,7 @@ void MediaPlayerPrivateAVFoundationObjC:
> 
> void MediaPlayerPrivateAVFoundationObjC::setShouldDisableSleep(bool flag)
> {
>-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR) && !PLATFORM(IOSMAC)
>+#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR) && !PLATFORM(MACCATALYST)
>     ALLOW_DEPRECATED_DECLARATIONS_BEGIN
>     [m_avPlayer _setPreventsSleepDuringVideoPlayback:flag];
>     ALLOW_DEPRECATED_DECLARATIONS_END
>Index: Source/WebCore/platform/graphics/cv/ImageTransferSessionVT.h
>===================================================================
>--- Source/WebCore/platform/graphics/cv/ImageTransferSessionVT.h	(revision 246846)
>+++ Source/WebCore/platform/graphics/cv/ImageTransferSessionVT.h	(working copy)
>@@ -51,7 +51,7 @@ public:
>     RefPtr<MediaSample> createMediaSample(CGImageRef, const MediaTime&, const IntSize&, MediaSample::VideoRotation = MediaSample::VideoRotation::None, bool mirrored = false);
>     RefPtr<MediaSample> createMediaSample(CMSampleBufferRef, const IntSize&, MediaSample::VideoRotation = MediaSample::VideoRotation::None, bool mirrored = false);
> 
>-#if HAVE(IOSURFACE) && !PLATFORM(IOSMAC)
>+#if HAVE(IOSURFACE) && !PLATFORM(MACCATALYST)
>     WEBCORE_EXPORT RefPtr<MediaSample> createMediaSample(IOSurfaceRef, const MediaTime&, const IntSize&, MediaSample::VideoRotation = MediaSample::VideoRotation::None, bool mirrored = false);
> #endif
> 
>@@ -60,7 +60,7 @@ public:
> private:
>     WEBCORE_EXPORT explicit ImageTransferSessionVT(uint32_t pixelFormat);
> 
>-#if HAVE(IOSURFACE) && !PLATFORM(IOSMAC)
>+#if HAVE(IOSURFACE) && !PLATFORM(MACCATALYST)
>     CFDictionaryRef ioSurfacePixelBufferCreationOptions(IOSurfaceRef);
>     RetainPtr<CMSampleBufferRef> createCMSampleBuffer(IOSurfaceRef, const MediaTime&, const IntSize&);
>     RetainPtr<CVPixelBufferRef> createPixelBuffer(IOSurfaceRef, const IntSize&);
>Index: Source/WebCore/platform/graphics/cv/ImageTransferSessionVT.mm
>===================================================================
>--- Source/WebCore/platform/graphics/cv/ImageTransferSessionVT.mm	(revision 246846)
>+++ Source/WebCore/platform/graphics/cv/ImageTransferSessionVT.mm	(working copy)
>@@ -34,7 +34,7 @@
> #import <CoreMedia/CMSampleBuffer.h>
> #import <pal/cf/CoreMediaSoftLink.h>
> 
>-#if HAVE(IOSURFACE) && !PLATFORM(IOSMAC)
>+#if HAVE(IOSURFACE) && !PLATFORM(MACCATALYST)
> #include <pal/spi/cocoa/IOSurfaceSPI.h>
> #endif
> 
>@@ -45,7 +45,7 @@ using namespace PAL;
> 
> static inline CFStringRef cvPixelFormatOpenGLKey()
> {
>-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOSMAC)
>+#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
>     return kCVPixelFormatOpenGLESCompatibility;
> #else
>     return kCVPixelBufferOpenGLCompatibilityKey;
>@@ -71,7 +71,7 @@ ImageTransferSessionVT::ImageTransferSes
>     if (status != kCVReturnSuccess)
>         RELEASE_LOG(Media, "ImageTransferSessionVT::ImageTransferSessionVT: VTSessionSetProperty(kVTPixelTransferPropertyKey_RealTime) failed with error %d", static_cast<int>(status));
> 
>-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOSMAC)
>+#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
>     status = VTSessionSetProperty(transferSession, kVTPixelTransferPropertyKey_EnableHardwareAcceleratedTransfer, @(YES));
>     if (status != kCVReturnSuccess)
>         RELEASE_LOG(Media, "ImageTransferSessionVT::ImageTransferSessionVT: VTSessionSetProperty(kVTPixelTransferPropertyKey_EnableHardwareAcceleratedTransfer) failed with error %d", static_cast<int>(status));
>@@ -265,7 +265,7 @@ RetainPtr<CMSampleBufferRef> ImageTransf
>     return createCMSampleBuffer(pixelBuffer.get(), sampleTime, size);
> }
> 
>-#if HAVE(IOSURFACE) && !PLATFORM(IOSMAC)
>+#if HAVE(IOSURFACE) && !PLATFORM(MACCATALYST)
> 
> #if PLATFORM(MAC)
> static int32_t roundUpToMacroblockMultiple(int32_t size)
>@@ -350,7 +350,7 @@ RefPtr<MediaSample> ImageTransferSession
>     return MediaSampleAVFObjC::create(resizedBuffer.get(), sample.videoRotation(), sample.videoMirrored());
> }
> 
>-#if HAVE(IOSURFACE) && !PLATFORM(IOSMAC)
>+#if HAVE(IOSURFACE) && !PLATFORM(MACCATALYST)
> RefPtr<MediaSample> ImageTransferSessionVT::createMediaSample(IOSurfaceRef surface, const MediaTime& sampleTime, const IntSize& size, MediaSample::VideoRotation rotation, bool mirrored)
> {
>     auto sampleBuffer = createCMSampleBuffer(surface, sampleTime, size);
>Index: Source/WebCore/platform/ios/PasteboardIOS.mm
>===================================================================
>--- Source/WebCore/platform/ios/PasteboardIOS.mm	(revision 246846)
>+++ Source/WebCore/platform/ios/PasteboardIOS.mm	(working copy)
>@@ -205,7 +205,7 @@ Pasteboard::ReaderResult Pasteboard::rea
>         return ReaderResult::DidNotReadType;
>     }
> 
>-#if !PLATFORM(IOSMAC)
>+#if !PLATFORM(MACCATALYST)
>     if ([type isEqualToString:(__bridge NSString *)kUTTypeFlatRTFD]) {
>         RefPtr<SharedBuffer> buffer = strategy.readBufferFromPasteboard(itemIndex, kUTTypeFlatRTFD, m_pasteboardName);
>         if (m_changeCount != changeCount())
>@@ -219,7 +219,7 @@ Pasteboard::ReaderResult Pasteboard::rea
>             return ReaderResult::PasteboardWasChangedExternally;
>         return buffer && reader.readRTF(*buffer) ? ReaderResult::ReadType : ReaderResult::DidNotReadType;
>     }
>-#endif // !PLATFORM(IOSMAC)
>+#endif // !PLATFORM(MACCATALYST)
> 
>     if ([supportedImageTypes() containsObject:type]) {
>         RefPtr<SharedBuffer> buffer = strategy.readBufferFromPasteboard(itemIndex, type, m_pasteboardName);
>@@ -375,11 +375,11 @@ void Pasteboard::readRespectingUTIFideli
> NSArray *Pasteboard::supportedWebContentPasteboardTypes()
> {
>     return @[
>-#if !PLATFORM(IOSMAC)
>+#if !PLATFORM(MACCATALYST)
>         WebArchivePboardType,
> #endif
>         (__bridge NSString *)kUTTypeWebArchive,
>-#if !PLATFORM(IOSMAC)
>+#if !PLATFORM(MACCATALYST)
>         (__bridge NSString *)kUTTypeFlatRTFD,
>         (__bridge NSString *)kUTTypeRTF,
> #endif
>Index: Source/WebCore/platform/ios/PlatformPasteboardIOS.mm
>===================================================================
>--- Source/WebCore/platform/ios/PlatformPasteboardIOS.mm	(revision 246846)
>+++ Source/WebCore/platform/ios/PlatformPasteboardIOS.mm	(working copy)
>@@ -48,8 +48,8 @@
> #import <wtf/text/StringHash.h>
> 
> #define PASTEBOARD_SUPPORTS_ITEM_PROVIDERS (PLATFORM(IOS_FAMILY) && !(PLATFORM(WATCHOS) || PLATFORM(APPLETV)))
>-#define PASTEBOARD_SUPPORTS_PRESENTATION_STYLE_AND_TEAM_DATA (PASTEBOARD_SUPPORTS_ITEM_PROVIDERS && !PLATFORM(IOSMAC))
>-#define NSURL_SUPPORTS_TITLE (!PLATFORM(IOSMAC))
>+#define PASTEBOARD_SUPPORTS_PRESENTATION_STYLE_AND_TEAM_DATA (PASTEBOARD_SUPPORTS_ITEM_PROVIDERS && !PLATFORM(MACCATALYST))
>+#define NSURL_SUPPORTS_TITLE (!PLATFORM(MACCATALYST))
> 
> namespace WebCore {
> 
>@@ -305,8 +305,8 @@ static NSString *webIOSPastePboardType =
> 
> static void registerItemToPasteboard(WebItemProviderRegistrationInfoList *representationsToRegister, id <AbstractPasteboard> pasteboard)
> {
>-#if PLATFORM(IOSMAC)
>-    // In iOSMac, -[UIPasteboard setItemProviders:] is not yet supported, so we fall back to setting an item dictionary when
>+#if PLATFORM(MACCATALYST)
>+    // In macCatalyst, -[UIPasteboard setItemProviders:] is not yet supported, so we fall back to setting an item dictionary when
>     // populating the pasteboard upon copy.
>     if ([pasteboard isKindOfClass:PAL::getUIPasteboardClass()]) {
>         auto itemDictionary = adoptNS([[NSMutableDictionary alloc] init]);
>@@ -317,7 +317,7 @@ static void registerItemToPasteboard(Web
>         [pasteboard setItems:@[ itemDictionary.get() ]];
>         return;
>     }
>-#endif // PLATFORM(IOSMAC)
>+#endif // PLATFORM(MACCATALYST)
> 
>     if (NSItemProvider *itemProvider = representationsToRegister.itemProvider)
>         [pasteboard setItemProviders:@[ itemProvider ]];
>@@ -364,7 +364,7 @@ void PlatformPasteboard::write(const Pas
> {
>     auto representationsToRegister = adoptNS([[WebItemProviderRegistrationInfoList alloc] init]);
> 
>-#if !PLATFORM(IOSMAC)
>+#if !PLATFORM(MACCATALYST)
>     [representationsToRegister addData:[webIOSPastePboardType dataUsingEncoding:NSUTF8StringEncoding] forType:webIOSPastePboardType];
> #endif
> 
>@@ -374,7 +374,7 @@ void PlatformPasteboard::write(const Pas
> 
>     if (content.dataInWebArchiveFormat) {
>         auto webArchiveData = content.dataInWebArchiveFormat->createNSData();
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
>         NSString *webArchiveType = (__bridge NSString *)kUTTypeWebArchive;
> #else
>         // FIXME: We should additionally register "com.apple.webarchive" once <rdar://problem/46830277> is fixed.
>Index: Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm
>===================================================================
>--- Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm	(revision 246846)
>+++ Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm	(working copy)
>@@ -321,7 +321,7 @@ - (void)resolveBounds
> 
> - (void)setVideoGravity:(NSString *)videoGravity
> {
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
>     // FIXME<rdar://46011230>: remove this #if once this radar lands.
>     if (!videoGravity)
>         videoGravity = AVLayerVideoGravityResizeAspect;
>Index: Source/WebCore/platform/ios/WebItemProviderPasteboard.mm
>===================================================================
>--- Source/WebCore/platform/ios/WebItemProviderPasteboard.mm	(revision 246846)
>+++ Source/WebCore/platform/ios/WebItemProviderPasteboard.mm	(working copy)
>@@ -293,7 +293,7 @@ - (void)enumerateItems:(void (^)(id <Web
>         block([self itemAtIndex:index], index);
> }
> 
>-#if !PLATFORM(IOSMAC)
>+#if !PLATFORM(MACCATALYST)
> static UIPreferredPresentationStyle uiPreferredPresentationStyle(WebPreferredPresentationStyle style)
> {
>     switch (style) {
>@@ -319,7 +319,7 @@ - (NSItemProvider *)itemProvider
>     for (id <WebItemProviderRegistrar> representation in _representations.get())
>         [representation registerItemProvider:itemProvider.get()];
>     [itemProvider setSuggestedName:self.suggestedName];
>-#if !PLATFORM(IOSMAC)
>+#if !PLATFORM(MACCATALYST)
>     [itemProvider setPreferredPresentationSize:self.preferredPresentationSize];
>     [itemProvider setPreferredPresentationStyle:uiPreferredPresentationStyle(self.preferredPresentationStyle)];
>     [itemProvider setTeamData:self.teamData];
>@@ -383,7 +383,7 @@ - (BOOL)canBeRepresentedAsFileUpload
>     if ([_itemProvider web_containsFileURLAndFileUploadContent])
>         return YES;
> 
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
>     return NO;
> #else
>     return [_itemProvider preferredPresentationStyle] != UIPreferredPresentationStyleInline;
>@@ -664,7 +664,7 @@ - (NSInteger)numberOfFiles
> {
>     NSInteger numberOfFiles = 0;
>     for (NSItemProvider *itemProvider in _itemProviders.get()) {
>-#if !PLATFORM(IOSMAC)
>+#if !PLATFORM(MACCATALYST)
>         // First, check if the source has explicitly indicated that this item should or should not be treated as an attachment.
>         if (itemProvider.preferredPresentationStyle == UIPreferredPresentationStyleInline)
>             continue;
>Index: Source/WebCore/platform/network/cf/CertificateInfoCFNet.cpp
>===================================================================
>--- Source/WebCore/platform/network/cf/CertificateInfoCFNet.cpp	(revision 246846)
>+++ Source/WebCore/platform/network/cf/CertificateInfoCFNet.cpp	(working copy)
>@@ -101,7 +101,7 @@ Optional<CertificateInfo::SummaryInfo> C
> 
>     SummaryInfo summaryInfo;
> 
>-#if PLATFORM(COCOA) && !PLATFORM(IOS_FAMILY_SIMULATOR) && !PLATFORM(IOSMAC)
>+#if PLATFORM(COCOA) && !PLATFORM(IOS_FAMILY_SIMULATOR) && !PLATFORM(MACCATALYST)
>     auto leafCertificate = checked_cf_cast<SecCertificateRef>(CFArrayGetValueAtIndex(chain, 0));
> 
>     auto subjectCF = adoptCF(SecCertificateCopySubjectSummary(leafCertificate));
>Index: Source/WebInspectorUI/ChangeLog
>===================================================================
>--- Source/WebInspectorUI/ChangeLog	(revision 246846)
>+++ Source/WebInspectorUI/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2019-06-26  Beth Dakin  <bdakin@apple.com>
>+
>+        Upstream use of MACCATALYST
>+        https://bugs.webkit.org/show_bug.cgi?id=199245
>+        rdar://problem/51687723
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/Base.xcconfig:
>+        * Configurations/SDKVariant.xcconfig:
>+
> 2019-06-25  Matt Baker  <mattbaker@apple.com>
> 
>         Web Inspector: Elements: show shadow DOM by default
>Index: Source/WebInspectorUI/Configurations/Base.xcconfig
>===================================================================
>--- Source/WebInspectorUI/Configurations/Base.xcconfig	(revision 246846)
>+++ Source/WebInspectorUI/Configurations/Base.xcconfig	(working copy)
>@@ -100,8 +100,8 @@ WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_MA
> 
> WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
> WK_COCOA_TOUCH_iphoneos = cocoatouch;
>-WK_COCOA_TOUCH_iosmac = cocoatouch;
> WK_COCOA_TOUCH_iphonesimulator = cocoatouch;
>+WK_COCOA_TOUCH_maccatalyst = cocoatouch;
> WK_COCOA_TOUCH_watchos = cocoatouch;
> WK_COCOA_TOUCH_watchsimulator = cocoatouch;
> WK_COCOA_TOUCH_appletvos = cocoatouch;
>Index: Source/WebInspectorUI/Configurations/SDKVariant.xcconfig
>===================================================================
>--- Source/WebInspectorUI/Configurations/SDKVariant.xcconfig	(revision 246846)
>+++ Source/WebInspectorUI/Configurations/SDKVariant.xcconfig	(working copy)
>@@ -30,7 +30,7 @@ WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /Sy
> WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
> 
> WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = maccatalyst;
> WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
> 
> WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 246846)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,85 @@
>+2019-06-26  Beth Dakin  <bdakin@apple.com>
>+
>+        Upstream use of MACCATALYST
>+        https://bugs.webkit.org/show_bug.cgi?id=199245
>+        rdar://problem/51687723
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/Base.xcconfig:
>+        * Configurations/FeatureDefines.xcconfig:
>+        * Configurations/Network-iOSMac.entitlements: Removed.
>+        * Configurations/Network-macCatalyst.entitlements: Copied from Source/WebKit/Configurations/Network-iOSMac.entitlements.
>+        * Configurations/NetworkService.xcconfig:
>+        * Configurations/SDKVariant.xcconfig:
>+        * Configurations/WebContent-iOSMac.entitlements: Removed.
>+        * Configurations/WebContent-macCatalyst.entitlements: Copied from Source/WebKit/Configurations/WebContent-iOSMac.entitlements.
>+        * Configurations/WebContentService.xcconfig:
>+        * Configurations/WebKit.xcconfig:
>+        * NetworkProcess/ios/NetworkProcessIOS.mm:
>+        * NetworkProcess/mac/NetworkProcessMac.mm:
>+        (WebKit::NetworkProcess::initializeProcess):
>+        (WebKit::NetworkProcess::initializeProcessName):
>+        * Platform/mac/LayerHostingContext.mm:
>+        (WebKit::LayerHostingContext::createForExternalHostingProcess):
>+        * Platform/spi/ios/ManagedConfigurationSPI.h:
>+        * Platform/spi/ios/UIKitSPI.h:
>+        * Shared/WebPreferencesDefaultValues.cpp:
>+        (WebKit::defaultCustomPasteboardDataEnabled):
>+        * Shared/ios/AuxiliaryProcessIOS.mm:
>+        (WebKit::AuxiliaryProcess::initializeSandbox):
>+        * Shared/ios/InteractionInformationAtPosition.h:
>+        * Shared/ios/InteractionInformationAtPosition.mm:
>+        (WebKit::InteractionInformationAtPosition::encode const):
>+        (WebKit::InteractionInformationAtPosition::decode):
>+        * Shared/mac/AuxiliaryProcessMac.mm:
>+        (WebKit::enableSandboxStyleFileQuarantine):
>+        * Shared/mac/CodeSigning.mm:
>+        * UIProcess/API/Cocoa/WKWebView.mm:
>+        (-[WKWebView _webViewPrintFormatter]):
>+        * UIProcess/API/Cocoa/WKWebViewInternal.h:
>+        * UIProcess/API/Cocoa/WKWebViewPrivate.h:
>+        * UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm:
>+        (WebKit::RemoteLayerTreeHost::updateLayerTree):
>+        * UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.mm:
>+        (-[WKRemoteView initWithFrame:contextID:]):
>+        * UIProcess/_WKWebViewPrintFormatter.mm:
>+        * UIProcess/_WKWebViewPrintFormatterInternal.h:
>+        * UIProcess/ios/WKActionSheetAssistant.mm:
>+        (-[WKActionSheetAssistant _elementActionForDDAction:]):
>+        * UIProcess/ios/WKContentView.mm:
>+        (-[WKContentView _commonInitializationWithProcessPool:configuration:]):
>+        * UIProcess/ios/WKContentViewInteraction.h:
>+        * UIProcess/ios/WKContentViewInteraction.mm:
>+        (-[WKContentView setupInteraction]):
>+        (-[WKContentView cleanupInteraction]):
>+        (-[WKContentView _removeDefaultGestureRecognizers]):
>+        (-[WKContentView _addDefaultGestureRecognizers]):
>+        (-[WKContentView _showTapHighlight]):
>+        (-[WKContentView gestureRecognizer:canBePreventedByGestureRecognizer:]):
>+        (-[WKContentView gestureRecognizer:shouldRecognizeSimultaneouslyWithGestureRecognizer:]):
>+        (-[WKContentView canPerformActionForWebView:withSender:]):
>+        (-[WKContentView _defineForWebView:]):
>+        (-[WKContentView setSelectedTextRange:]):
>+        (-[WKContentView closestPositionToPoint:]):
>+        (-[WKContentView _showShareSheet:inRect:completionHandler:]):
>+        * UIProcess/ios/WebPageProxyIOS.mm:
>+        (WebKit::desktopClassBrowsingSupported):
>+        (WebKit::desktopClassBrowsingRecommended):
>+        * UIProcess/ios/forms/WKFileUploadPanel.mm:
>+        (-[WKFileUploadPanel _showDocumentPickerMenu]):
>+        * WebKit.xcodeproj/project.pbxproj:
>+        * WebProcess/WebPage/Cocoa/TextCheckingControllerProxy.mm:
>+        * WebProcess/WebPage/Cocoa/WebPageCocoa.mm:
>+        (WebKit::WebPage::dictionaryPopupInfoForRange):
>+        * WebProcess/WebPage/ios/WebPageIOS.mm:
>+        (WebKit::WebPage::platformEditorState const):
>+        (WebKit::WebPage::selectWithGesture):
>+        (WebKit::selectionPositionInformation):
>+        * WebProcess/cocoa/WebProcessCocoa.mm:
>+        (WebKit::WebProcess::initializeSandbox):
>+        * WebProcess/com.apple.WebProcess.sb.in:
>+
> 2019-06-26  Zalan Bujtas  <zalan@apple.com>
> 
>         [ContentChangeObserver] Dispatch synthetic mouse event asynchronously in completePendingSyntheticClickForContentChangeObserver
>Index: Source/WebKit/Configurations/Base.xcconfig
>===================================================================
>--- Source/WebKit/Configurations/Base.xcconfig	(revision 246846)
>+++ Source/WebKit/Configurations/Base.xcconfig	(working copy)
>@@ -139,8 +139,8 @@ LLVM_TARGET_TRIPLE_SUFFIX = $(inherited)
> 
> WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
> WK_COCOA_TOUCH_iphoneos = cocoatouch;
>-WK_COCOA_TOUCH_iosmac = cocoatouch;
> WK_COCOA_TOUCH_iphonesimulator = cocoatouch;
>+WK_COCOA_TOUCH_maccatalyst = cocoatouch;
> WK_COCOA_TOUCH_watchos = cocoatouch;
> WK_COCOA_TOUCH_watchsimulator = cocoatouch;
> WK_COCOA_TOUCH_appletvos = cocoatouch;
>Index: Source/WebKit/Configurations/FeatureDefines.xcconfig
>===================================================================
>--- Source/WebKit/Configurations/FeatureDefines.xcconfig	(revision 246846)
>+++ Source/WebKit/Configurations/FeatureDefines.xcconfig	(working copy)
>@@ -69,9 +69,9 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE
> ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
> 
> ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
>-ENABLE_CONTENT_FILTERING_iosmac = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
>+ENABLE_CONTENT_FILTERING_maccatalyst = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
>@@ -90,7 +90,7 @@ ENABLE_CSS_CONIC_GRADIENTS_iphonesimulat
> ENABLE_CSS_CONIC_GRADIENTS_iphonesimulator[sdk=iphone*11.*] = ;
> ENABLE_CSS_CONIC_GRADIENTS_watchos = ENABLE_CSS_CONIC_GRADIENTS;
> ENABLE_CSS_CONIC_GRADIENTS_watchsimulator = ENABLE_CSS_CONIC_GRADIENTS;
>-ENABLE_CSS_CONIC_GRADIENTS_iosmac = ENABLE_CSS_CONIC_GRADIENTS;
>+ENABLE_CSS_CONIC_GRADIENTS_maccatalyst = ENABLE_CSS_CONIC_GRADIENTS;
> ENABLE_CSS_CONIC_GRADIENTS_macosx = $(ENABLE_CSS_CONIC_GRADIENTS$(WK_MACOS_1014));
> ENABLE_CSS_CONIC_GRADIENTS_MACOS_SINCE_1014 = ENABLE_CSS_CONIC_GRADIENTS;
> 
>@@ -117,7 +117,7 @@ ENABLE_CUSTOM_SCHEME_HANDLER = ;
> ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME));
> ENABLE_DARK_MODE_CSS_iphoneos = ENABLE_DARK_MODE_CSS;
> ENABLE_DARK_MODE_CSS_iphonesimulator = ENABLE_DARK_MODE_CSS;
>-ENABLE_DARK_MODE_CSS_iosmac = ENABLE_DARK_MODE_CSS;
>+ENABLE_DARK_MODE_CSS_maccatalyst = ENABLE_DARK_MODE_CSS;
> ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS;
> 
> ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
>@@ -127,7 +127,7 @@ ENABLE_DATALIST_ELEMENT = ENABLE_DATALIS
> ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
> ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
> ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
>-ENABLE_DATA_INTERACTION_iosmac = ENABLE_DATA_INTERACTION;
>+ENABLE_DATA_INTERACTION_maccatalyst = ENABLE_DATA_INTERACTION;
> 
> ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_PLATFORM_NAME));
> ENABLE_DEVICE_ORIENTATION_iphoneos = ENABLE_DEVICE_ORIENTATION;
>@@ -140,7 +140,7 @@ ENABLE_DEVICE_ORIENTATION_appletvsimulat
> ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(WK_PLATFORM_NAME));
> ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
> ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
>-ENABLE_DRAG_SUPPORT_iosmac = ENABLE_DRAG_SUPPORT;
>+ENABLE_DRAG_SUPPORT_maccatalyst = ENABLE_DRAG_SUPPORT;
> 
> ENABLE_ENCRYPTED_MEDIA = $(ENABLE_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME));
> ENABLE_ENCRYPTED_MEDIA_iphoneos = ENABLE_ENCRYPTED_MEDIA;
>@@ -158,14 +158,14 @@ ENABLE_EXPERIMENTAL_FEATURES_YES = ENABL
> ENABLE_FAST_JIT_PERMISSIONS = $(ENABLE_FAST_JIT_PERMISSIONS_$(WK_PLATFORM_NAME));
> ENABLE_FAST_JIT_PERMISSIONS_iphoneos[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSIONS_iphoneos_$(USE_INTERNAL_SDK));
> ENABLE_FAST_JIT_PERMISSIONS_iphoneos_YES = ENABLE_FAST_JIT_PERMISSIONS;
>-ENABLE_FAST_JIT_PERMISSIONS_iosmac = ;
>+ENABLE_FAST_JIT_PERMISSIONS_maccatalyst = ;
> 
> ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
> 
> ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(WK_PLATFORM_NAME))
> ENABLE_FTL_JIT_macosx = ENABLE_FTL_JIT;
> ENABLE_FTL_JIT_iphoneos = ENABLE_FTL_JIT;
>-ENABLE_FTL_JIT_iosmac = ENABLE_FTL_JIT;
>+ENABLE_FTL_JIT_maccatalyst = ENABLE_FTL_JIT;
> ENABLE_FTL_JIT_watchos = ENABLE_FTL_JIT;
> ENABLE_FTL_JIT_appletvos = ENABLE_FTL_JIT;
> 
>@@ -177,16 +177,16 @@ ENABLE_FULLSCREEN_API_macosx = ENABLE_FU
> 
> ENABLE_GAMEPAD = $(ENABLE_GAMEPAD_$(WK_PLATFORM_NAME));
> ENABLE_GAMEPAD_iphoneos = ENABLE_GAMEPAD;
>-ENABLE_GAMEPAD_iosmac = ENABLE_GAMEPAD;
> ENABLE_GAMEPAD_iphonesimulator = ENABLE_GAMEPAD;
> ENABLE_GAMEPAD_appletvos = ENABLE_GAMEPAD;
> ENABLE_GAMEPAD_appletvsimulator = ENABLE_GAMEPAD;
>+ENABLE_GAMEPAD_maccatalyst = ENABLE_GAMEPAD;
> ENABLE_GAMEPAD_macosx = ENABLE_GAMEPAD;
> 
> ENABLE_GEOLOCATION = $(ENABLE_GEOLOCATION_$(WK_PLATFORM_NAME));
> ENABLE_GEOLOCATION_iphoneos = ENABLE_GEOLOCATION;
>-ENABLE_GEOLOCATION_iosmac = ENABLE_GEOLOCATION;
> ENABLE_GEOLOCATION_iphonesimulator = ENABLE_GEOLOCATION;
>+ENABLE_GEOLOCATION_maccatalyst = ENABLE_GEOLOCATION;
> ENABLE_GEOLOCATION_macosx = ENABLE_GEOLOCATION;
> 
> ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(WK_PLATFORM_NAME));
>@@ -319,9 +319,9 @@ ENABLE_PDFKIT_PLUGIN = $(ENABLE_PDFKIT_P
> ENABLE_PDFKIT_PLUGIN_macosx = ENABLE_PDFKIT_PLUGIN;
> 
> ENABLE_POINTER_EVENTS = $(ENABLE_POINTER_EVENTS_$(WK_PLATFORM_NAME));
>-ENABLE_POINTER_EVENTS_iosmac = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_iphoneos = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_iphonesimulator = ENABLE_POINTER_EVENTS;
>+ENABLE_POINTER_EVENTS_maccatalyst = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_macosx = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_watchos = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_watchsimulator = ENABLE_POINTER_EVENTS;
>@@ -385,8 +385,8 @@ ENABLE_USER_MESSAGE_HANDLERS = ENABLE_US
> 
> ENABLE_VARIATION_FONTS = $(ENABLE_VARIATION_FONTS_$(WK_PLATFORM_NAME));
> ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
>-ENABLE_VARIATION_FONTS_iosmac = ENABLE_VARIATION_FONTS;
> ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
>+ENABLE_VARIATION_FONTS_maccatalyst = ENABLE_VARIATION_FONTS;
> ENABLE_VARIATION_FONTS_macosx = $(ENABLE_VARIATION_FONTS$(WK_MACOS_1013));
> ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 = ENABLE_VARIATION_FONTS;
> 
>Index: Source/WebKit/Configurations/Network-iOSMac.entitlements
>===================================================================
>--- Source/WebKit/Configurations/Network-iOSMac.entitlements	(revision 246846)
>+++ Source/WebKit/Configurations/Network-iOSMac.entitlements	(nonexistent)
>@@ -1,14 +0,0 @@
>-<?xml version="1.0" encoding="UTF-8"?>
>-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
>-<plist version="1.0">
>-<dict>
>-	<key>seatbelt-profiles</key>
>-	<array>
>-		<string>com.apple.WebKit.Networking</string>
>-	</array>
>-	<key>com.apple.security.network.client</key>
>-	<true/>
>-	<key>com.apple.private.network.socket-delegate</key>
>-	<true/>
>-</dict>
>-</plist>
>Index: Source/WebKit/Configurations/Network-macCatalyst.entitlements
>===================================================================
>--- Source/WebKit/Configurations/Network-macCatalyst.entitlements	(revision 246846)	(from Source/WebKit/Configurations/Network-iOSMac.entitlements:246846)
>+++ Source/WebKit/Configurations/Network-macCatalyst.entitlements	(working copy)
>@@ -0,0 +1,14 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
>+<plist version="1.0">
>+<dict>
>+	<key>seatbelt-profiles</key>
>+	<array>
>+		<string>com.apple.WebKit.Networking</string>
>+	</array>
>+	<key>com.apple.security.network.client</key>
>+	<true/>
>+	<key>com.apple.private.network.socket-delegate</key>
>+	<true/>
>+</dict>
>+</plist>
>Index: Source/WebKit/Configurations/NetworkService.xcconfig
>===================================================================
>--- Source/WebKit/Configurations/NetworkService.xcconfig	(revision 246846)
>+++ Source/WebKit/Configurations/NetworkService.xcconfig	(working copy)
>@@ -30,7 +30,7 @@ WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_wat
> WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_watchsimulator = Network-iOS;
> WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_appletvos = Network-iOS;
> WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_appletvsimulator = Network-iOS;
>-WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_iosmac = Network-iOSMac;
>+WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_maccatalyst = Network-macCatalyst;
> 
> PRODUCT_NAME = com.apple.WebKit.Networking;
> PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
>Index: Source/WebKit/Configurations/SDKVariant.xcconfig
>===================================================================
>--- Source/WebKit/Configurations/SDKVariant.xcconfig	(revision 246846)
>+++ Source/WebKit/Configurations/SDKVariant.xcconfig	(working copy)
>@@ -30,7 +30,7 @@ WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /Sy
> WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
> 
> WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = maccatalyst;
> WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
> 
> WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>Index: Source/WebKit/Configurations/WebContent-iOSMac.entitlements
>===================================================================
>--- Source/WebKit/Configurations/WebContent-iOSMac.entitlements	(revision 246846)
>+++ Source/WebKit/Configurations/WebContent-iOSMac.entitlements	(nonexistent)
>@@ -1,12 +0,0 @@
>-<?xml version="1.0" encoding="UTF-8"?>
>-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
>-<plist version="1.0">
>-<dict>
>-	<key>seatbelt-profiles</key>
>-	<array>
>-		<string>com.apple.WebKit.WebContent</string>
>-	</array>
>-	<key>com.apple.security.cs.allow-jit</key>
>-	<true/>
>-</dict>
>-</plist>
>Index: Source/WebKit/Configurations/WebContent-macCatalyst.entitlements
>===================================================================
>--- Source/WebKit/Configurations/WebContent-macCatalyst.entitlements	(revision 246846)	(from Source/WebKit/Configurations/WebContent-iOSMac.entitlements:246846)
>+++ Source/WebKit/Configurations/WebContent-macCatalyst.entitlements	(working copy)
>@@ -0,0 +1,12 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
>+<plist version="1.0">
>+<dict>
>+	<key>seatbelt-profiles</key>
>+	<array>
>+		<string>com.apple.WebKit.WebContent</string>
>+	</array>
>+	<key>com.apple.security.cs.allow-jit</key>
>+	<true/>
>+</dict>
>+</plist>
>Index: Source/WebKit/Configurations/WebContentService.xcconfig
>===================================================================
>--- Source/WebKit/Configurations/WebContentService.xcconfig	(revision 246846)
>+++ Source/WebKit/Configurations/WebContentService.xcconfig	(working copy)
>@@ -30,7 +30,7 @@ WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_wat
> WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_watchsimulator = WebContent-iOS;
> WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_appletvos = WebContent-iOS;
> WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_appletvsimulator = WebContent-iOS;
>-WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_iosmac = WebContent-iOSMac;
>+WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_maccatalyst = WebContent-macCatalyst;
> 
> PRODUCT_NAME = $(PRODUCT_NAME_$(WK_XPC_SERVICE_VARIANT));
> PRODUCT_NAME_ = $(PRODUCT_NAME_Normal);
>Index: Source/WebKit/Configurations/WebKit.xcconfig
>===================================================================
>--- Source/WebKit/Configurations/WebKit.xcconfig	(revision 246846)
>+++ Source/WebKit/Configurations/WebKit.xcconfig	(working copy)
>@@ -71,7 +71,7 @@ WK_GRAPHICS_SERVICES_LDFLAGS_cocoatouch 
> 
> WK_IOSURFACE_LDFLAGS = $(WK_IOSURFACE_LDFLAGS_$(WK_PLATFORM_NAME));
> WK_IOSURFACE_LDFLAGS_iphoneos = -framework IOSurface;
>-WK_IOSURFACE_LDFLAGS_iosmac = $(WK_IOSURFACE_LDFLAGS_iphoneos);
>+WK_IOSURFACE_LDFLAGS_maccatalyst = $(WK_IOSURFACE_LDFLAGS_iphoneos);
> WK_IOSURFACE_LDFLAGS_watchos = $(WK_IOSURFACE_LDFLAGS_iphoneos);
> WK_IOSURFACE_LDFLAGS_appletvos = $(WK_IOSURFACE_LDFLAGS_iphoneos);
> WK_IOSURFACE_LDFLAGS_macosx = -framework IOSurface;
>@@ -91,7 +91,7 @@ WK_LIBSANDBOX_LDFLAGS_macosx = -lsandbox
> 
> WK_OPENGL_LDFLAGS = $(WK_OPENGL_LDFLAGS_$(WK_PLATFORM_NAME));
> WK_OPENGL_LDFLAGS_iphoneos = -framework OpenGLES;
>-WK_OPENGL_LDFLAGS_iosmac = -framework OpenGL;
>+WK_OPENGL_LDFLAGS_maccatalyst = -framework OpenGL;
> WK_OPENGL_LDFLAGS_iphonesimulator = -framework OpenGLES;
> WK_OPENGL_LDFLAGS_watchos = $(WK_OPENGL_LDFLAGS_iphoneos);
> WK_OPENGL_LDFLAGS_watchsimulator = $(WK_OPENGL_LDFLAGS_iphonesimulator);
>@@ -177,7 +177,7 @@ WK_HAVE_DEVICE_IDENTITY_iphoneos = YES;
> 
> WK_HAVE_URL_FORMATTING = $(WK_HAVE_URL_FORMATTING_$(WK_PLATFORM_NAME));
> WK_HAVE_URL_FORMATTING_iphoneos = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
>-WK_HAVE_URL_FORMATTING_iosmac = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
>+WK_HAVE_URL_FORMATTING_maccatalyst = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
> WK_HAVE_URL_FORMATTING_iphonesimulator = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
> WK_HAVE_URL_FORMATTING_watchos = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
> WK_HAVE_URL_FORMATTING_watchsimulator = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
>Index: Source/WebKit/NetworkProcess/ios/NetworkProcessIOS.mm
>===================================================================
>--- Source/WebKit/NetworkProcess/ios/NetworkProcessIOS.mm	(revision 246846)
>+++ Source/WebKit/NetworkProcess/ios/NetworkProcessIOS.mm	(working copy)
>@@ -26,7 +26,7 @@
> #import "config.h"
> #import "NetworkProcess.h"
> 
>-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOSMAC)
>+#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
> 
> #import "NetworkCache.h"
> #import "NetworkProcessCreationParameters.h"
>Index: Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm
>===================================================================
>--- Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm	(revision 246846)
>+++ Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm	(working copy)
>@@ -26,7 +26,7 @@
> #import "config.h"
> #import "NetworkProcess.h"
> 
>-#if PLATFORM(MAC) || PLATFORM(IOSMAC)
>+#if PLATFORM(MAC) || PLATFORM(MACCATALYST)
> 
> #import "NetworkCache.h"
> #import "NetworkProcessCreationParameters.h"
>@@ -53,7 +53,7 @@ using namespace WebCore;
> 
> void NetworkProcess::initializeProcess(const AuxiliaryProcessInitializationParameters&)
> {
>-#if PLATFORM(MAC) && !PLATFORM(IOSMAC)
>+#if PLATFORM(MAC) && !PLATFORM(MACCATALYST)
>     // Having a window server connection in this process would result in spin logs (<rdar://problem/13239119>).
>     OSStatus error = SetApplicationIsDaemon(true);
>     ASSERT_UNUSED(error, error == noErr);
>@@ -64,7 +64,7 @@ void NetworkProcess::initializeProcess(c
> 
> void NetworkProcess::initializeProcessName(const AuxiliaryProcessInitializationParameters& parameters)
> {
>-#if !PLATFORM(IOSMAC)
>+#if !PLATFORM(MACCATALYST)
>     NSString *applicationName = [NSString stringWithFormat:WEB_UI_STRING("%@ Networking", "visible name of the network process. The argument is the application name."), (NSString *)parameters.uiProcessName];
>     _LSSetApplicationInformationItem(kLSDefaultSessionID, _LSGetCurrentApplicationASN(), _kLSDisplayNameKey, (CFStringRef)applicationName, nullptr);
> #endif
>@@ -113,7 +113,7 @@ void NetworkProcess::platformTerminate()
>     }
> }
> 
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
> bool NetworkProcess::parentProcessHasServiceWorkerEntitlement() const
> {
>     return true;
>Index: Source/WebKit/Platform/mac/LayerHostingContext.mm
>===================================================================
>--- Source/WebKit/Platform/mac/LayerHostingContext.mm	(revision 246846)
>+++ Source/WebKit/Platform/mac/LayerHostingContext.mm	(working copy)
>@@ -55,7 +55,7 @@ std::unique_ptr<LayerHostingContext> Lay
>     auto layerHostingContext = std::make_unique<LayerHostingContext>();
>     layerHostingContext->m_layerHostingMode = LayerHostingMode::OutOfProcess;
> 
>-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOSMAC)
>+#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
>     // Use a very large display ID to ensure that the context is never put on-screen 
>     // without being explicitly parented. See <rdar://problem/16089267> for details.
>     layerHostingContext->m_context = [CAContext remoteContextWithOptions:@{
>@@ -65,7 +65,7 @@ std::unique_ptr<LayerHostingContext> Lay
>         kCAContextDisplayId : @10000
> #endif
>     }];
>-#elif !PLATFORM(IOSMAC) && ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
>+#elif !PLATFORM(MACCATALYST) && ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
>     [CAContext setAllowsCGSConnections:NO];
>     layerHostingContext->m_context = [CAContext remoteContextWithOptions:@{
>         kCAContextCIFilterBehavior :  @"ignore",
>Index: Source/WebKit/Platform/spi/ios/ManagedConfigurationSPI.h
>===================================================================
>--- Source/WebKit/Platform/spi/ios/ManagedConfigurationSPI.h	(revision 246846)
>+++ Source/WebKit/Platform/spi/ios/ManagedConfigurationSPI.h	(working copy)
>@@ -23,7 +23,7 @@
>  * THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOSMAC)
>+#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
> 
> #if USE(APPLE_INTERNAL_SDK)
> 
>@@ -58,4 +58,4 @@ typedef enum MCRestrictedBoolType {
> 
> #endif
> 
>-#endif // PLATFORM(IOS_FAMILY) && !PLATFORM(IOSMAC)
>+#endif // PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
>Index: Source/WebKit/Platform/spi/ios/UIKitSPI.h
>===================================================================
>--- Source/WebKit/Platform/spi/ios/UIKitSPI.h	(revision 246846)
>+++ Source/WebKit/Platform/spi/ios/UIKitSPI.h	(working copy)
>@@ -516,7 +516,7 @@ typedef NS_ENUM (NSInteger, _UIBackdropM
>     _UIBackdropMaskViewAll = _UIBackdropMaskViewGrayscaleTint | _UIBackdropMaskViewColorTint | _UIBackdropMaskViewFilters,
> };
> 
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
> typedef NS_ENUM(NSUInteger, UIFocusRingType) {
>     UIFocusRingTypeNone = 1,
> };
>@@ -537,7 +537,7 @@ typedef NS_ENUM(NSUInteger, UIFocusRingT
> - (void)_removeAllAnimations:(BOOL)includeSubviews;
> - (UIColor *)_inheritedInteractionTintColor;
> - (NSString *)recursiveDescription;
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
> @property (nonatomic, getter=_focusRingType, setter=_setFocusRingType:) UIFocusRingType focusRingType;
> #endif
> @end
>Index: Source/WebKit/Shared/WebPreferencesDefaultValues.cpp
>===================================================================
>--- Source/WebKit/Shared/WebPreferencesDefaultValues.cpp	(revision 246846)
>+++ Source/WebKit/Shared/WebPreferencesDefaultValues.cpp	(working copy)
>@@ -48,7 +48,7 @@ bool defaultPassiveTouchListenersAsDefau
> 
> bool defaultCustomPasteboardDataEnabled()
> {
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
>     return true;
> #elif PLATFORM(IOS_FAMILY)
>     return WebCore::IOSApplication::isMobileSafari() || dyld_get_program_sdk_version() >= DYLD_IOS_VERSION_11_3;
>Index: Source/WebKit/Shared/ios/AuxiliaryProcessIOS.mm
>===================================================================
>--- Source/WebKit/Shared/ios/AuxiliaryProcessIOS.mm	(revision 246846)
>+++ Source/WebKit/Shared/ios/AuxiliaryProcessIOS.mm	(working copy)
>@@ -26,7 +26,7 @@
> #import "config.h"
> #import "AuxiliaryProcess.h"
> 
>-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOSMAC)
>+#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
> 
> #import "SandboxInitializationParameters.h"
> #import "XPCServiceEntryPoint.h"
>@@ -63,7 +63,7 @@ void AuxiliaryProcess::initializeSandbox
>         sandboxParameters.setUserDirectorySuffix(defaultUserDirectorySuffix);
>     }
> 
>-#if !PLATFORM(IOSMAC)
>+#if !PLATFORM(MACCATALYST)
>     String sandboxImportPath = "/usr/local/share/sandbox/imports";
>     sandboxParameters.addPathParameter("IMPORT_DIR", FileSystem::fileSystemRepresentation(sandboxImportPath).data());
> #endif
>Index: Source/WebKit/Shared/ios/InteractionInformationAtPosition.h
>===================================================================
>--- Source/WebKit/Shared/ios/InteractionInformationAtPosition.h	(revision 246846)
>+++ Source/WebKit/Shared/ios/InteractionInformationAtPosition.h	(working copy)
>@@ -73,7 +73,7 @@ struct InteractionInformationAtPosition 
>     String title;
>     String idAttribute;
>     WebCore::IntRect bounds;
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
>     WebCore::IntRect caretRect;
> #endif
>     RefPtr<ShareableBitmap> image;
>Index: Source/WebKit/Shared/ios/InteractionInformationAtPosition.mm
>===================================================================
>--- Source/WebKit/Shared/ios/InteractionInformationAtPosition.mm	(revision 246846)
>+++ Source/WebKit/Shared/ios/InteractionInformationAtPosition.mm	(working copy)
>@@ -62,7 +62,7 @@ void InteractionInformationAtPosition::e
>     encoder << title;
>     encoder << idAttribute;
>     encoder << bounds;
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
>     encoder << caretRect;
> #endif
>     encoder << textBefore;
>@@ -143,7 +143,7 @@ bool InteractionInformationAtPosition::d
>     if (!decoder.decode(result.bounds))
>         return false;
>     
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
>     if (!decoder.decode(result.caretRect))
>         return false;
> #endif
>Index: Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm
>===================================================================
>--- Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm	(revision 246846)
>+++ Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm	(working copy)
>@@ -25,7 +25,7 @@
> 
> #import "config.h"
> 
>-#if PLATFORM(MAC) || PLATFORM(IOSMAC)
>+#if PLATFORM(MAC) || PLATFORM(MACCATALYST)
> #import "AuxiliaryProcess.h"
> 
> #import "CodeSigning.h"
>@@ -66,7 +66,7 @@
> #define USE_CACHE_COMPILED_SANDBOX 0
> #endif
> 
>-#if PLATFORM(IOSMAC) && USE(APPLE_INTERNAL_SDK)
>+#if PLATFORM(MACCATALYST) && USE(APPLE_INTERNAL_SDK)
> enum LSSessionID {
>     kLSDefaultSessionID = -2,
> };
>@@ -163,7 +163,7 @@ void AuxiliaryProcess::platformInitializ
> 
> static OSStatus enableSandboxStyleFileQuarantine()
> {
>-#if !PLATFORM(IOSMAC)
>+#if !PLATFORM(MACCATALYST)
>     qtn_proc_t quarantineProperties = qtn_proc_alloc();
>     auto quarantinePropertiesDeleter = makeScopeExit([quarantineProperties]() {
>         qtn_proc_free(quarantineProperties);
>@@ -685,7 +685,7 @@ void AuxiliaryProcess::stopNSAppRunLoop(
> }
> #endif
> 
>-#if !PLATFORM(IOSMAC) && ENABLE(WEBPROCESS_NSRUNLOOP)
>+#if !PLATFORM(MACCATALYST) && ENABLE(WEBPROCESS_NSRUNLOOP)
> void AuxiliaryProcess::stopNSRunLoop()
> {
>     ASSERT([NSRunLoop mainRunLoop]);
>Index: Source/WebKit/Shared/mac/CodeSigning.mm
>===================================================================
>--- Source/WebKit/Shared/mac/CodeSigning.mm	(revision 246846)
>+++ Source/WebKit/Shared/mac/CodeSigning.mm	(working copy)
>@@ -26,7 +26,7 @@
> #include "config.h"
> #include "CodeSigning.h"
> 
>-#if PLATFORM(MAC) || PLATFORM(IOSMAC)
>+#if PLATFORM(MAC) || PLATFORM(MACCATALYST)
> 
> #include <wtf/RetainPtr.h>
> #include <wtf/spi/cocoa/SecuritySPI.h>
>Index: Source/WebKit/UIProcess/_WKWebViewPrintFormatter.mm
>===================================================================
>--- Source/WebKit/UIProcess/_WKWebViewPrintFormatter.mm	(revision 246846)
>+++ Source/WebKit/UIProcess/_WKWebViewPrintFormatter.mm	(working copy)
>@@ -26,7 +26,7 @@
> #import "config.h"
> #import "_WKWebViewPrintFormatterInternal.h"
> 
>-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOSMAC)
>+#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
> 
> #import "WKWebViewInternal.h"
> #import "_WKFrameHandle.h"
>@@ -116,4 +116,4 @@ - (void)drawInRect:(CGRect)rect forPageA
> 
> @end
> 
>-#endif // PLATFORM(IOS_FAMILY) && !PLATFORM(IOSMAC)
>+#endif // PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
>Index: Source/WebKit/UIProcess/_WKWebViewPrintFormatterInternal.h
>===================================================================
>--- Source/WebKit/UIProcess/_WKWebViewPrintFormatterInternal.h	(revision 246846)
>+++ Source/WebKit/UIProcess/_WKWebViewPrintFormatterInternal.h	(working copy)
>@@ -25,7 +25,7 @@
> 
> #import "_WKWebViewPrintFormatter.h"
> 
>-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOSMAC)
>+#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
> 
> @interface UIPrintFormatter ()
> - (CGRect)_pageContentRect:(BOOL)firstPage;
>@@ -41,4 +41,4 @@
> @property (nonatomic, readonly) CGPDFDocumentRef _wk_printedDocument;
> @end
> 
>-#endif // PLATFORM(IOS_FAMILY) && !PLATFORM(IOSMAC)
>+#endif // PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
>Index: Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>===================================================================
>--- Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm	(revision 246846)
>+++ Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm	(working copy)
>@@ -6355,13 +6355,13 @@ - (NSString *)_suggestedFilenameForDispl
> 
> - (_WKWebViewPrintFormatter *)_webViewPrintFormatter
> {
>-#if !PLATFORM(IOSMAC)
>+#if !PLATFORM(MACCATALYST)
>     UIViewPrintFormatter *viewPrintFormatter = self.viewPrintFormatter;
>     ASSERT([viewPrintFormatter isKindOfClass:[_WKWebViewPrintFormatter class]]);
>     return (_WKWebViewPrintFormatter *)viewPrintFormatter;
> #else
>     return nil;
>-#endif // PLATFORM(IOSMAC)
>+#endif // PLATFORM(MACCATALYST)
> }
> 
> static WebCore::UserInterfaceLayoutDirection toUserInterfaceLayoutDirection(UISemanticContentAttribute contentAttribute)
>@@ -7461,7 +7461,7 @@ - (IBAction)stopLoading:(id)sender
> 
> #endif // PLATFORM(MAC)
> 
>-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOSMAC)
>+#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
> @implementation WKWebView (_WKWebViewPrintFormatter)
> 
> - (Class)_printFormatterClass
>Index: Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h
>===================================================================
>--- Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h	(revision 246846)
>+++ Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h	(working copy)
>@@ -199,7 +199,7 @@ WKWebView* fromWebPageProxy(WebKit::WebP
> @end
> #endif
> 
>-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOSMAC)
>+#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
> @interface WKWebView (_WKWebViewPrintFormatter)
> @property (nonatomic, readonly) id <_WKWebViewPrintProvider> _printProvider;
> @end
>Index: Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h
>===================================================================
>--- Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h	(revision 246846)
>+++ Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h	(working copy)
>@@ -429,7 +429,7 @@ typedef NS_OPTIONS(NSUInteger, _WKRectEd
> 
> @end
> 
>-#if TARGET_OS_IOS || (defined(TARGET_OS_IOSMAC) && TARGET_OS_IOSMAC) || TARGET_OS_TV
>+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH
> @interface WKWebView (FullScreenAPI_Private)
> -(BOOL)hasFullScreenWindowController;
> -(void)closeFullScreenWindowController;
>Index: Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm
>===================================================================
>--- Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm	(revision 246846)
>+++ Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm	(working copy)
>@@ -88,7 +88,7 @@ bool RemoteLayerTreeHost::updateLayerTre
>     };
>     Vector<LayerAndClone> clonesToUpdate;
> 
>-#if PLATFORM(MAC) || PLATFORM(IOSMAC)
>+#if PLATFORM(MAC) || PLATFORM(MACCATALYST)
>     // Can't use the iOS code on macOS yet: rdar://problem/31247730
>     auto layerContentsType = RemoteLayerBackingStore::LayerContentsType::IOSurface;
> #else
>Index: Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.mm
>===================================================================
>--- Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.mm	(revision 246846)
>+++ Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.mm	(working copy)
>@@ -210,7 +210,7 @@ - (instancetype)initWithFrame:(CGRect)fr
>     if ((self = [super initWithFrame:frame])) {
>         CALayerHost *layer = (CALayerHost *)self.layer;
>         layer.contextId = contextID;
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
>         // When running iOS apps on macOS, kCAContextIgnoresHitTest isn't respected; instead, we avoid
>         // hit-testing to the remote context by disabling hit-testing on its host layer. See
>         // <rdar://problem/40591107> for more details.
>Index: Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm
>===================================================================
>--- Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm	(revision 246846)
>+++ Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm	(working copy)
>@@ -175,7 +175,7 @@ - (UIView *)hostViewForSheet
> 
> - (_WKElementAction *)_elementActionForDDAction:(DDAction *)action
> {
>-#if PLATFORM(IOS) && !PLATFORM(IOSMAC)
>+#if PLATFORM(IOS) && !PLATFORM(MACCATALYST)
>     auto retainedSelf = retainPtr(self);
>     _WKElementAction *elementAction = [_WKElementAction elementActionWithTitle:action.localizedName actionHandler:^(_WKActivatedElementInfo *actionInfo) {
>         retainedSelf->_isPresentingDDUserInterface = action.hasUserInterface;
>Index: Source/WebKit/UIProcess/ios/WKContentView.mm
>===================================================================
>--- Source/WebKit/UIProcess/ios/WKContentView.mm	(revision 246846)
>+++ Source/WebKit/UIProcess/ios/WKContentView.mm	(working copy)
>@@ -194,7 +194,7 @@ - (instancetype)_commonInitializationWit
> 
>     self.layer.hitTestsAsOpaque = YES;
> 
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
>     [self _setFocusRingType:UIFocusRingTypeNone];
> #endif
> 
>@@ -699,7 +699,7 @@ - (void)_applicationDidBecomeActive:(NSN
> 
> #pragma mark Printing
> 
>-#if !PLATFORM(IOSMAC)
>+#if !PLATFORM(MACCATALYST)
> 
> @interface WKContentView (_WKWebViewPrintFormatter) <_WKWebViewPrintProvider>
> @end
>@@ -767,6 +767,6 @@ - (CGPDFDocumentRef)_wk_printedDocument
> 
> @end
> 
>-#endif // !PLATFORM(IOSMAC)
>+#endif // !PLATFORM(MACCATALYST)
> 
> #endif // PLATFORM(IOS_FAMILY)
>Index: Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
>===================================================================
>--- Source/WebKit/UIProcess/ios/WKContentViewInteraction.h	(revision 246846)
>+++ Source/WebKit/UIProcess/ios/WKContentViewInteraction.h	(working copy)
>@@ -220,7 +220,7 @@ struct WKAutoCorrectionData {
>     RetainPtr<UITapGestureRecognizer> _stylusSingleTapGestureRecognizer;
>     RetainPtr<WKInspectorNodeSearchGestureRecognizer> _inspectorNodeSearchGestureRecognizer;
> 
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
>     RetainPtr<UIHoverGestureRecognizer> _hoverGestureRecognizer;
>     RetainPtr<_UILookupGestureRecognizer> _lookupGestureRecognizer;
>     CGPoint _lastHoverLocation;
>Index: Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>===================================================================
>--- Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	(revision 246846)
>+++ Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	(working copy)
>@@ -123,7 +123,7 @@
> #import <WebCore/WebItemProviderPasteboard.h>
> #endif
> 
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
> #import "NativeWebMouseEvent.h"
> #import <UIKit/UIHoverGestureRecognizer.h>
> #import <UIKit/_UILookupGestureRecognizer.h>
>@@ -146,7 +146,7 @@
> #import <WebCore/TouchAction.h>
> #endif
> 
>-#if !PLATFORM(IOSMAC)
>+#if !PLATFORM(MACCATALYST)
> #import "ManagedConfigurationSPI.h"
> #import <wtf/SoftLinking.h>
> 
>@@ -734,7 +734,7 @@ - (void)setupInteraction
>     [_touchEventGestureRecognizer setDelegate:self];
>     [self addGestureRecognizer:_touchEventGestureRecognizer.get()];
> 
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
>     _hoverGestureRecognizer = adoptNS([[UIHoverGestureRecognizer alloc] initWithTarget:self action:@selector(_hoverGestureRecognizerChanged:)]);
>     [_hoverGestureRecognizer setDelegate:self];
>     [self addGestureRecognizer:_hoverGestureRecognizer.get()];
>@@ -869,7 +869,7 @@ - (void)cleanupInteraction
>     [_touchEventGestureRecognizer setDelegate:nil];
>     [self removeGestureRecognizer:_touchEventGestureRecognizer.get()];
> 
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
>     [_hoverGestureRecognizer setDelegate:nil];
>     [self removeGestureRecognizer:_hoverGestureRecognizer.get()];
>     
>@@ -972,7 +972,7 @@ - (void)_removeDefaultGestureRecognizers
>     [self removeGestureRecognizer:_twoFingerDoubleTapGestureRecognizer.get()];
>     [self removeGestureRecognizer:_twoFingerSingleTapGestureRecognizer.get()];
>     [self removeGestureRecognizer:_stylusSingleTapGestureRecognizer.get()];
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
>     [self removeGestureRecognizer:_hoverGestureRecognizer.get()];
>     [self removeGestureRecognizer:_lookupGestureRecognizer.get()];
> #endif
>@@ -988,7 +988,7 @@ - (void)_addDefaultGestureRecognizers
>     [self addGestureRecognizer:_twoFingerDoubleTapGestureRecognizer.get()];
>     [self addGestureRecognizer:_twoFingerSingleTapGestureRecognizer.get()];
>     [self addGestureRecognizer:_stylusSingleTapGestureRecognizer.get()];
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
>     [self addGestureRecognizer:_hoverGestureRecognizer.get()];
>     [self addGestureRecognizer:_lookupGestureRecognizer.get()];
> #endif
>@@ -1513,7 +1513,7 @@ - (void)_updateTapHighlight
> - (void)_showTapHighlight
> {
>     auto shouldPaintTapHighlight = [&](const WebCore::FloatRect& rect) {
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
>         UNUSED_PARAM(rect);
>         return NO;
> #else
>@@ -1789,7 +1789,7 @@ - (BOOL)gestureRecognizer:(UIGestureReco
> #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000
>     isForcePressGesture = (preventingGestureRecognizer == _textSelectionAssistant.get().forcePressGesture);
> #endif
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
>     if ((preventingGestureRecognizer == _textSelectionAssistant.get().loupeGesture) && (preventedGestureRecognizer == _highlightLongPressGestureRecognizer || preventedGestureRecognizer == _longPressGestureRecognizer || preventedGestureRecognizer == _textSelectionAssistant.get().forcePressGesture))
>         return YES;
> #endif
>@@ -1811,7 +1811,7 @@ - (BOOL)gestureRecognizer:(UIGestureReco
>         return YES;
> 
> #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
>     if (isSamePair(gestureRecognizer, otherGestureRecognizer, _textSelectionAssistant.get().loupeGesture, _textSelectionAssistant.get().forcePressGesture))
>         return YES;
> 
>@@ -2989,7 +2989,7 @@         // acceptable, but the interface
>         if (!textLength || textLength > 200)
>             return NO;
> 
>-#if !PLATFORM(IOSMAC)
>+#if !PLATFORM(MACCATALYST)
>         if ([[getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting:getMCFeatureDefinitionLookupAllowed()] == MCRestrictedBoolExplicitNo)
>             return NO;
> #endif
>@@ -3001,7 +3001,7 @@         // acceptable, but the interface
>         if (editorState.isInPasswordField)
>             return NO;
> 
>-#if !PLATFORM(IOSMAC)
>+#if !PLATFORM(MACCATALYST)
>         if ([[getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting:getMCFeatureDefinitionLookupAllowed()] == MCRestrictedBoolExplicitNo)
>             return NO;
> #endif
>@@ -3199,7 +3199,7 @@ - (void)_showDictionary:(NSString *)text
> 
> - (void)_defineForWebView:(id)sender
> {
>-#if !PLATFORM(IOSMAC)
>+#if !PLATFORM(MACCATALYST)
>     if ([[getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting:getMCFeatureDefinitionLookupAllowed()] == MCRestrictedBoolExplicitNo)
>         return;
> #endif
>@@ -4114,7 +4114,7 @@ - (void)setSelectedTextRange:(UITextRang
> {
>     if (range)
>         return;
>-#if !PLATFORM(IOSMAC)
>+#if !PLATFORM(MACCATALYST)
>     if (!hasFocusedElement(_focusedElementInformation))
>         return;
> #endif
>@@ -4247,7 +4247,7 @@ - (CGRect)firstRectForRange:(UITextRange
> /* Hit testing. */
> - (UITextPosition *)closestPositionToPoint:(CGPoint)point
> {
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
>     WebKit::InteractionInformationRequest request(WebCore::roundedIntPoint(point));
>     [self requestAsynchronousPositionInformationUpdate:request];
>     if ([self _currentPositionInformationIsApproximatelyValidForRequest:request] && _positionInformation.isSelectable)
>@@ -5996,7 +5996,7 @@ - (void)_showShareSheet:(const WebCore::
>     _shareSheet = adoptNS([[WKShareSheet alloc] initWithView:_webView]);
>     [_shareSheet setDelegate:self];
> 
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
>     if (!rect) {
>         auto hoverLocationInWebView = [self convertPoint:_lastHoverLocation toView:_webView];
>         rect = WebCore::FloatRect(hoverLocationInWebView.x, hoverLocationInWebView.y, 1, 1);
>@@ -7246,7 +7246,7 @@ - (BOOL)allowsDictationInputForListViewC
> 
> #endif // PLATFORM(WATCHOS)
> 
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
> - (void)_lookupGestureRecognized:(UIGestureRecognizer *)gestureRecognizer
> {
>     NSPoint locationInViewCoordinates = [gestureRecognizer locationInView:self];
>Index: Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm
>===================================================================
>--- Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm	(revision 246846)
>+++ Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm	(working copy)
>@@ -1255,7 +1255,7 @@ static bool desktopClassBrowsingSupporte
>     static bool supportsDesktopClassBrowsing = false;
>     static dispatch_once_t onceToken;
>     dispatch_once(&onceToken, ^{
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
>         supportsDesktopClassBrowsing = true;
> #else
>         supportsDesktopClassBrowsing = currentUserInterfaceIdiomIsPad();
>@@ -1264,14 +1264,14 @@ static bool desktopClassBrowsingSupporte
>     return supportsDesktopClassBrowsing;
> }
> 
>-#if !PLATFORM(IOSMAC)
>+#if !PLATFORM(MACCATALYST)
> 
> static bool webViewSizeIsNarrow(WebCore::IntSize viewSize)
> {
>     return !viewSize.isEmpty() && viewSize.width() <= 375;
> }
> 
>-#endif // !PLATFORM(IOSMAC)
>+#endif // !PLATFORM(MACCATALYST)
> 
> static bool desktopClassBrowsingRecommendedForRequest(const WebCore::ResourceRequest& request)
> {
>@@ -1312,7 +1312,7 @@ static bool desktopClassBrowsingRecommen
>     if (!desktopClassBrowsingRecommendedForRequest(request))
>         return false;
> 
>-#if !PLATFORM(IOSMAC)
>+#if !PLATFORM(MACCATALYST)
>     if (webViewSizeIsNarrow(viewSize))
>         return false;
> #endif
>@@ -1320,7 +1320,7 @@ static bool desktopClassBrowsingRecommen
>     static bool shouldRecommendDesktopClassBrowsing = false;
>     static dispatch_once_t onceToken;
>     dispatch_once(&onceToken, ^{
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
>         UNUSED_PARAM(ignoreSafeguards);
>         shouldRecommendDesktopClassBrowsing = true;
> #else
>Index: Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm
>===================================================================
>--- Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm	(revision 246846)
>+++ Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm	(working copy)
>@@ -404,7 +404,7 @@ - (void)_showDocumentPickerMenu
>     BOOL containsImageMediaType = !mediaTypes.count || arrayContainsUTIThatConformsTo(mediaTypes, kUTTypeImage);
>     BOOL containsVideoMediaType = !mediaTypes.count || arrayContainsUTIThatConformsTo(mediaTypes, kUTTypeMovie);
> 
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
>     // FIXME 49961589: Support picking media with UIImagePickerController
>     BOOL shouldPresentDocumentMenuViewController = NO;
> #else
>Index: Source/WebKit/WebKit.xcodeproj/project.pbxproj
>===================================================================
>--- Source/WebKit/WebKit.xcodeproj/project.pbxproj	(revision 246846)
>+++ Source/WebKit/WebKit.xcodeproj/project.pbxproj	(working copy)
>@@ -2972,8 +2972,8 @@
> 		370F34A41829BEA3009027C8 /* WKNavigationDataInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigationDataInternal.h; sourceTree = "<group>"; };
> 		370F34A61829CFF3009027C8 /* WKBrowsingContextHistoryDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBrowsingContextHistoryDelegate.h; sourceTree = "<group>"; };
> 		37119A7C20CCB64E002C6DC9 /* WebKitTargetConditionals.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKitTargetConditionals.xcconfig; sourceTree = "<group>"; };
>-		37119A7D20CCB64E002C6DC9 /* Network-iOSMac.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Network-iOSMac.entitlements"; sourceTree = "<group>"; };
>-		37119A7E20CCB64E002C6DC9 /* WebContent-iOSMac.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "WebContent-iOSMac.entitlements"; sourceTree = "<group>"; };
>+		37119A7D20CCB64E002C6DC9 /* Network-macCatalyst.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Network-macCatalyst.entitlements"; sourceTree = "<group>"; };
>+		37119A7E20CCB64E002C6DC9 /* WebContent-macCatalyst.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "WebContent-macCatalyst.entitlements"; sourceTree = "<group>"; };
> 		37183D54182F4E700080C811 /* WKNSURLExtras.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNSURLExtras.mm; sourceTree = "<group>"; };
> 		37183D55182F4E700080C811 /* WKNSURLExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNSURLExtras.h; sourceTree = "<group>"; };
> 		371A193F1824D29300F32A5E /* WKNSDictionary.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNSDictionary.mm; sourceTree = "<group>"; };
>@@ -5002,7 +5002,7 @@
> 				1A4F976B100E7B6600637A18 /* DebugRelease.xcconfig */,
> 				1A4F976C100E7B6600637A18 /* FeatureDefines.xcconfig */,
> 				7C0BB9A918DCDF5A0006C086 /* Network-iOS.entitlements */,
>-				37119A7D20CCB64E002C6DC9 /* Network-iOSMac.entitlements */,
>+				37119A7D20CCB64E002C6DC9 /* Network-macCatalyst.entitlements */,
> 				BC8283AB16B4BEAD00A278FE /* NetworkService.xcconfig */,
> 				A1EDD2DB1884B96400BBFE98 /* PluginProcessShim.xcconfig */,
> 				BC8283F416B4FC5300A278FE /* PluginService.64.xcconfig */,
>@@ -5013,7 +5013,7 @@
> 				5183B3931379F85C00E8754E /* Shim.xcconfig */,
> 				1A4F976E100E7B6600637A18 /* Version.xcconfig */,
> 				7C0BB9A818DCDE890006C086 /* WebContent-iOS.entitlements */,
>-				37119A7E20CCB64E002C6DC9 /* WebContent-iOSMac.entitlements */,
>+				37119A7E20CCB64E002C6DC9 /* WebContent-macCatalyst.entitlements */,
> 				372EBB4A2017E76000085064 /* WebContentService.Development.xcconfig */,
> 				BCACC40E16B0B8A800B6E092 /* WebContentService.xcconfig */,
> 				BCB86F4B116AAACD00CE20B7 /* WebKit.xcconfig */,
>@@ -10723,15 +10723,15 @@
> 			inputPaths = (
> 				"$(SRCROOT)/Configurations/Network-iOS.entitlements",
> 				"$(SRCROOT)/Configurations/WebContent-iOS.entitlements",
>-				"$(SRCROOT)/Configurations/Network-iOSMac.entitlements",
>-				"$(SRCROOT)/Configurations/WebContent-iOSMac.entitlements",
>+				"$(SRCROOT)/Configurations/Network-macCatalyst.entitlements",
>+				"$(SRCROOT)/Configurations/WebContent-macCatalyst.entitlements",
> 			);
> 			name = "Derive Entitlements for Manual Sandboxing";
> 			outputPaths = (
> 				"$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/Network-iOS-no-sandbox.entitlements",
> 				"$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/WebContent-iOS-no-sandbox.entitlements",
>-				"$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/Network-iOSMac-no-sandbox.entitlements",
>-				"$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/WebContent-iOSMac-no-sandbox.entitlements",
>+				"$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/Network-macCatalyst-no-sandbox.entitlements",
>+				"$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/WebContent-macCatalyst-no-sandbox.entitlements",
> 			);
> 			runOnlyForDeploymentPostprocessing = 0;
> 			shellPath = /bin/sh;
>@@ -10767,7 +10767,7 @@
> 			);
> 			runOnlyForDeploymentPostprocessing = 0;
> 			shellPath = /bin/sh;
>-			shellScript = "if [[ \"${WK_MANUAL_SANDBOXING_ENABLED}\" != \"YES\" || \"${WK_PLATFORM_NAME}\" == \"macosx\" || \"${WK_PLATFORM_NAME}\" == \"iosmac\" ]]; then\n    exit\nfi\n\nif [[ \"${ACTION}\" == \"build\" || \"${ACTION}\" == \"install\" ]]; then\n    for ((i = 0; i < ${SCRIPT_INPUT_FILE_COUNT}; ++i)); do\n        eval SANDBOX_PROFILE=\\${SCRIPT_INPUT_FILE_${i}}\n        ditto \"${SANDBOX_PROFILE}\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/${SANDBOX_PROFILE##*/}\"\n    done\nfi\n";
>+			shellScript = "if [[ \"${WK_MANUAL_SANDBOXING_ENABLED}\" != \"YES\" || \"${WK_PLATFORM_NAME}\" == \"macosx\" || \"${WK_PLATFORM_NAME}\" == \"maccatalyst\" ]]; then\n    exit\nfi\n\nif [[ \"${ACTION}\" == \"build\" || \"${ACTION}\" == \"install\" ]]; then\n    for ((i = 0; i < ${SCRIPT_INPUT_FILE_COUNT}; ++i)); do\n        eval SANDBOX_PROFILE=\\${SCRIPT_INPUT_FILE_${i}}\n        ditto \"${SANDBOX_PROFILE}\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/${SANDBOX_PROFILE##*/}\"\n    done\nfi\n";
> 		};
> 		4157853721279CC600DD3800 /* Copy Custom WebContent Resources to Framework Private Headers */ = {
> 			isa = PBXShellScriptBuildPhase;
>Index: Source/WebKit/WebProcess/com.apple.WebProcess.sb.in
>===================================================================
>--- Source/WebKit/WebProcess/com.apple.WebProcess.sb.in	(revision 246846)
>+++ Source/WebKit/WebProcess/com.apple.WebProcess.sb.in	(working copy)
>@@ -104,7 +104,7 @@
>     ;; CVMS
>     (allow mach-lookup
>         (global-name "com.apple.cvmsServ"))
>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400 || PLATFORM(IOSMAC)
>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400 || PLATFORM(MACCATALYST)
>     (allow file-read*
>         (prefix "/private/var/db/CVMS/cvmsCodeSignObj"))
> #endif
>@@ -622,19 +622,19 @@
>        (global-name "com.apple.tccd")
>        (global-name "com.apple.tccd.system")
>        (global-name "com.apple.trustd.agent")
>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400 || PLATFORM(IOSMAC)
>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400 || PLATFORM(MACCATALYST)
>        (global-name "com.apple.CARenderServer") ; Needed for [CAContext remoteContextWithOptions]
> #else
>        (global-name "com.apple.windowserver.active")
> #endif
> )
> 
>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400 || PLATFORM(IOSMAC)
>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400 || PLATFORM(MACCATALYST)
> ;; <rdar://problem/47268166>
> (allow mach-lookup (xpc-service-name "com.apple.MTLCompilerService"))
> #endif
> 
>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400 || PLATFORM(IOSMAC)
>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400 || PLATFORM(MACCATALYST)
> (deny mach-lookup (with no-log)
>     (global-name "com.apple.CoreServices.coreservicesd")
>     (global-name "com.apple.DiskArbitration.diskarbitrationd")
>Index: Source/WebKit/WebProcess/WebPage/Cocoa/TextCheckingControllerProxy.mm
>===================================================================
>--- Source/WebKit/WebProcess/WebPage/Cocoa/TextCheckingControllerProxy.mm	(revision 246846)
>+++ Source/WebKit/WebProcess/WebPage/Cocoa/TextCheckingControllerProxy.mm	(working copy)
>@@ -44,7 +44,7 @@
> #import <WebCore/VisibleUnits.h>
> 
> // FIXME: Remove this after rdar://problem/48914153 is resolved.
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
> typedef NS_ENUM(NSInteger, NSSpellingState) {
>     NSSpellingStateSpellingFlag = (1 << 0),
>     NSSpellingStateGrammarFlag = (1 << 1)
>Index: Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm
>===================================================================
>--- Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm	(revision 246846)
>+++ Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm	(working copy)
>@@ -180,9 +180,9 @@ DictionaryPopupInfo WebPage::dictionaryP
>     dictionaryPopupInfo.attributedString = scaledNSAttributedString;
> #endif // PLATFORM(MAC)
>     
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
>     dictionaryPopupInfo.attributedString = adoptNS([[NSMutableAttributedString alloc] initWithString:range.text()]);
>-#endif // PLATFORM(IOSMAC)
>+#endif // PLATFORM(MACCATALYST)
>     
>     editor.setIsGettingDictionaryPopupInfo(false);
>     return dictionaryPopupInfo;
>Index: Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm
>===================================================================
>--- Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm	(revision 246846)
>+++ Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm	(working copy)
>@@ -214,7 +214,7 @@ void WebPage::platformEditorState(Frame&
>     // immediately so that the UIProcess can update UI, including the position of the caret.
>     bool needsLayout = !frame.view() || frame.view()->needsLayout();
>     bool requiresPostLayoutData = frame.editor().hasComposition();
>-#if !PLATFORM(IOSMAC)
>+#if !PLATFORM(MACCATALYST)
>     requiresPostLayoutData |= m_keyboardIsAttached;
> #endif
>     if ((shouldIncludePostLayoutData == IncludePostLayoutDataHint::No || needsLayout) && !requiresPostLayoutData) {
>@@ -1367,7 +1367,7 @@ void WebPage::selectWithGesture(const In
>         if (position.rootEditableElement())
>             range = Range::create(*frame.document(), position, position);
>         else
>-#if !PLATFORM(IOSMAC)
>+#if !PLATFORM(MACCATALYST)
>             range = wordRangeFromPosition(position);
> #else
>             switch (wkGestureState) {
>@@ -2640,7 +2640,7 @@ static void selectionPositionInformation
>             info.isSelectable = !isAssistableElement(*downcast<Element>(hitNode)) && !rectIsTooBigForSelection(info.bounds, *result.innerNodeFrame());
>     }
> 
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
>     bool isInsideFixedPosition;
>     VisiblePosition caretPosition(renderer->positionForPoint(request.point, nullptr));
>     info.caretRect = caretPosition.absoluteCaretBounds(&isInsideFixedPosition);
>Index: Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm
>===================================================================
>--- Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm	(revision 246846)
>+++ Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm	(working copy)
>@@ -499,7 +499,7 @@ void WebProcess::initializeSandbox(const
> #if ENABLE(MANUAL_SANDBOXING)
>     // Need to override the default, because service has a different bundle ID.
>     NSBundle *webKit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKWebView")];
>-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOSMAC)
>+#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
>     sandboxParameters.setOverrideSandboxProfilePath([webKit2Bundle pathForResource:@"com.apple.WebKit.WebContent" ofType:@"sb"]);
> #else
>     sandboxParameters.setOverrideSandboxProfilePath([webKit2Bundle pathForResource:@"com.apple.WebProcess" ofType:@"sb"]);
>Index: Source/WebKitLegacy/ios/ChangeLog
>===================================================================
>--- Source/WebKitLegacy/ios/ChangeLog	(revision 246846)
>+++ Source/WebKitLegacy/ios/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2019-06-26  Beth Dakin  <bdakin@apple.com>
>+
>+        Upstream use of MACCATALYST
>+        https://bugs.webkit.org/show_bug.cgi?id=199245
>+        rdar://problem/51687723
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Misc/WebGeolocationCoreLocationProvider.mm:
>+        (-[WebGeolocationCoreLocationProvider requestGeolocationAuthorization]):
>+
> 2019-06-16  Darin Adler  <darin@apple.com>
> 
>         Rename AtomicString to AtomString
>Index: Source/WebKitLegacy/ios/Misc/WebGeolocationCoreLocationProvider.mm
>===================================================================
>--- Source/WebKitLegacy/ios/Misc/WebGeolocationCoreLocationProvider.mm	(revision 246846)
>+++ Source/WebKitLegacy/ios/Misc/WebGeolocationCoreLocationProvider.mm	(working copy)
>@@ -89,7 +89,7 @@ - (void)dealloc
> 
> - (void)requestGeolocationAuthorization
> {
>-#if PLATFORM(IOSMAC)
>+#if PLATFORM(MACCATALYST)
>     [_positionListener geolocationAuthorizationDenied];
>     return;
> #else
>Index: Source/WebKitLegacy/mac/ChangeLog
>===================================================================
>--- Source/WebKitLegacy/mac/ChangeLog	(revision 246846)
>+++ Source/WebKitLegacy/mac/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+2019-06-26  Beth Dakin  <bdakin@apple.com>
>+
>+        Upstream use of MACCATALYST
>+        https://bugs.webkit.org/show_bug.cgi?id=199245
>+        rdar://problem/51687723
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/Base.xcconfig:
>+        * Configurations/FeatureDefines.xcconfig:
>+        * Configurations/SDKVariant.xcconfig:
>+
> 2019-06-16  Darin Adler  <darin@apple.com>
> 
>         Rename AtomicString to AtomString
>Index: Source/WebKitLegacy/mac/Configurations/Base.xcconfig
>===================================================================
>--- Source/WebKitLegacy/mac/Configurations/Base.xcconfig	(revision 246846)
>+++ Source/WebKitLegacy/mac/Configurations/Base.xcconfig	(working copy)
>@@ -128,8 +128,8 @@ OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
> 
> WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
> WK_COCOA_TOUCH_iphoneos = cocoatouch;
>-WK_COCOA_TOUCH_iosmac = cocoatouch;
> WK_COCOA_TOUCH_iphonesimulator = cocoatouch;
>+WK_COCOA_TOUCH_maccatalyst = cocoatouch;
> WK_COCOA_TOUCH_watchos = cocoatouch;
> WK_COCOA_TOUCH_watchsimulator = cocoatouch;
> WK_COCOA_TOUCH_appletvos = cocoatouch;
>Index: Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
>===================================================================
>--- Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig	(revision 246846)
>+++ Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig	(working copy)
>@@ -69,9 +69,9 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE
> ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
> 
> ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
>-ENABLE_CONTENT_FILTERING_iosmac = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
>+ENABLE_CONTENT_FILTERING_maccatalyst = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
>@@ -90,7 +90,7 @@ ENABLE_CSS_CONIC_GRADIENTS_iphonesimulat
> ENABLE_CSS_CONIC_GRADIENTS_iphonesimulator[sdk=iphone*11.*] = ;
> ENABLE_CSS_CONIC_GRADIENTS_watchos = ENABLE_CSS_CONIC_GRADIENTS;
> ENABLE_CSS_CONIC_GRADIENTS_watchsimulator = ENABLE_CSS_CONIC_GRADIENTS;
>-ENABLE_CSS_CONIC_GRADIENTS_iosmac = ENABLE_CSS_CONIC_GRADIENTS;
>+ENABLE_CSS_CONIC_GRADIENTS_maccatalyst = ENABLE_CSS_CONIC_GRADIENTS;
> ENABLE_CSS_CONIC_GRADIENTS_macosx = $(ENABLE_CSS_CONIC_GRADIENTS$(WK_MACOS_1014));
> ENABLE_CSS_CONIC_GRADIENTS_MACOS_SINCE_1014 = ENABLE_CSS_CONIC_GRADIENTS;
> 
>@@ -117,7 +117,7 @@ ENABLE_CUSTOM_SCHEME_HANDLER = ;
> ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME));
> ENABLE_DARK_MODE_CSS_iphoneos = ENABLE_DARK_MODE_CSS;
> ENABLE_DARK_MODE_CSS_iphonesimulator = ENABLE_DARK_MODE_CSS;
>-ENABLE_DARK_MODE_CSS_iosmac = ENABLE_DARK_MODE_CSS;
>+ENABLE_DARK_MODE_CSS_maccatalyst = ENABLE_DARK_MODE_CSS;
> ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS;
> 
> ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
>@@ -127,7 +127,7 @@ ENABLE_DATALIST_ELEMENT = ENABLE_DATALIS
> ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
> ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
> ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
>-ENABLE_DATA_INTERACTION_iosmac = ENABLE_DATA_INTERACTION;
>+ENABLE_DATA_INTERACTION_maccatalyst = ENABLE_DATA_INTERACTION;
> 
> ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_PLATFORM_NAME));
> ENABLE_DEVICE_ORIENTATION_iphoneos = ENABLE_DEVICE_ORIENTATION;
>@@ -140,7 +140,7 @@ ENABLE_DEVICE_ORIENTATION_appletvsimulat
> ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(WK_PLATFORM_NAME));
> ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
> ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
>-ENABLE_DRAG_SUPPORT_iosmac = ENABLE_DRAG_SUPPORT;
>+ENABLE_DRAG_SUPPORT_maccatalyst = ENABLE_DRAG_SUPPORT;
> 
> ENABLE_ENCRYPTED_MEDIA = $(ENABLE_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME));
> ENABLE_ENCRYPTED_MEDIA_iphoneos = ENABLE_ENCRYPTED_MEDIA;
>@@ -158,14 +158,14 @@ ENABLE_EXPERIMENTAL_FEATURES_YES = ENABL
> ENABLE_FAST_JIT_PERMISSIONS = $(ENABLE_FAST_JIT_PERMISSIONS_$(WK_PLATFORM_NAME));
> ENABLE_FAST_JIT_PERMISSIONS_iphoneos[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSIONS_iphoneos_$(USE_INTERNAL_SDK));
> ENABLE_FAST_JIT_PERMISSIONS_iphoneos_YES = ENABLE_FAST_JIT_PERMISSIONS;
>-ENABLE_FAST_JIT_PERMISSIONS_iosmac = ;
>+ENABLE_FAST_JIT_PERMISSIONS_maccatalyst = ;
> 
> ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
> 
> ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(WK_PLATFORM_NAME))
> ENABLE_FTL_JIT_macosx = ENABLE_FTL_JIT;
> ENABLE_FTL_JIT_iphoneos = ENABLE_FTL_JIT;
>-ENABLE_FTL_JIT_iosmac = ENABLE_FTL_JIT;
>+ENABLE_FTL_JIT_maccatalyst = ENABLE_FTL_JIT;
> ENABLE_FTL_JIT_watchos = ENABLE_FTL_JIT;
> ENABLE_FTL_JIT_appletvos = ENABLE_FTL_JIT;
> 
>@@ -177,16 +177,16 @@ ENABLE_FULLSCREEN_API_macosx = ENABLE_FU
> 
> ENABLE_GAMEPAD = $(ENABLE_GAMEPAD_$(WK_PLATFORM_NAME));
> ENABLE_GAMEPAD_iphoneos = ENABLE_GAMEPAD;
>-ENABLE_GAMEPAD_iosmac = ENABLE_GAMEPAD;
> ENABLE_GAMEPAD_iphonesimulator = ENABLE_GAMEPAD;
> ENABLE_GAMEPAD_appletvos = ENABLE_GAMEPAD;
> ENABLE_GAMEPAD_appletvsimulator = ENABLE_GAMEPAD;
>+ENABLE_GAMEPAD_maccatalyst = ENABLE_GAMEPAD;
> ENABLE_GAMEPAD_macosx = ENABLE_GAMEPAD;
> 
> ENABLE_GEOLOCATION = $(ENABLE_GEOLOCATION_$(WK_PLATFORM_NAME));
> ENABLE_GEOLOCATION_iphoneos = ENABLE_GEOLOCATION;
>-ENABLE_GEOLOCATION_iosmac = ENABLE_GEOLOCATION;
> ENABLE_GEOLOCATION_iphonesimulator = ENABLE_GEOLOCATION;
>+ENABLE_GEOLOCATION_maccatalyst = ENABLE_GEOLOCATION;
> ENABLE_GEOLOCATION_macosx = ENABLE_GEOLOCATION;
> 
> ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(WK_PLATFORM_NAME));
>@@ -319,9 +319,9 @@ ENABLE_PDFKIT_PLUGIN = $(ENABLE_PDFKIT_P
> ENABLE_PDFKIT_PLUGIN_macosx = ENABLE_PDFKIT_PLUGIN;
> 
> ENABLE_POINTER_EVENTS = $(ENABLE_POINTER_EVENTS_$(WK_PLATFORM_NAME));
>-ENABLE_POINTER_EVENTS_iosmac = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_iphoneos = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_iphonesimulator = ENABLE_POINTER_EVENTS;
>+ENABLE_POINTER_EVENTS_maccatalyst = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_macosx = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_watchos = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_watchsimulator = ENABLE_POINTER_EVENTS;
>@@ -385,8 +385,8 @@ ENABLE_USER_MESSAGE_HANDLERS = ENABLE_US
> 
> ENABLE_VARIATION_FONTS = $(ENABLE_VARIATION_FONTS_$(WK_PLATFORM_NAME));
> ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
>-ENABLE_VARIATION_FONTS_iosmac = ENABLE_VARIATION_FONTS;
> ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
>+ENABLE_VARIATION_FONTS_maccatalyst = ENABLE_VARIATION_FONTS;
> ENABLE_VARIATION_FONTS_macosx = $(ENABLE_VARIATION_FONTS$(WK_MACOS_1013));
> ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 = ENABLE_VARIATION_FONTS;
> 
>Index: Source/WebKitLegacy/mac/Configurations/SDKVariant.xcconfig
>===================================================================
>--- Source/WebKitLegacy/mac/Configurations/SDKVariant.xcconfig	(revision 246846)
>+++ Source/WebKitLegacy/mac/Configurations/SDKVariant.xcconfig	(working copy)
>@@ -30,7 +30,7 @@ WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /Sy
> WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
> 
> WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = maccatalyst;
> WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
> 
> WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>Index: Source/bmalloc/ChangeLog
>===================================================================
>--- Source/bmalloc/ChangeLog	(revision 246846)
>+++ Source/bmalloc/ChangeLog	(working copy)
>@@ -1,3 +1,13 @@
>+2019-06-26  Beth Dakin  <bdakin@apple.com>
>+
>+        Upstream use of MACCATALYST
>+        https://bugs.webkit.org/show_bug.cgi?id=199245
>+        rdar://problem/51687723
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/SDKVariant.xcconfig:
>+
> 2019-06-24  Yusuke Suzuki  <ysuzuki@apple.com>
> 
>         [bmalloc] IsoHeap shared tier threshold is small
>Index: Source/bmalloc/Configurations/SDKVariant.xcconfig
>===================================================================
>--- Source/bmalloc/Configurations/SDKVariant.xcconfig	(revision 246846)
>+++ Source/bmalloc/Configurations/SDKVariant.xcconfig	(working copy)
>@@ -30,7 +30,7 @@ WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /Sy
> WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
> 
> WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = maccatalyst;
> WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
> 
> WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 246856)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,29 @@
>+2019-06-26  Beth Dakin  <bdakin@apple.com>
>+
>+        Upstream use of MACCATALYST
>+        https://bugs.webkit.org/show_bug.cgi?id=199245
>+        rdar://problem/51687723
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * ContentExtensionTester/Configurations/SDKVariant.xcconfig:
>+        * DumpRenderTree/mac/Configurations/SDKVariant.xcconfig:
>+        * ImageDiff/cg/Configurations/SDKVariant.xcconfig:
>+        * MiniBrowser/Configurations/SDKVariant.xcconfig:
>+        * MobileMiniBrowser/Configurations/SDKVariant.xcconfig:
>+        * Scripts/webkitpy/generate_xcfilelists_lib/generators.py:
>+        (JavaScriptCoreGenerator):
>+        (WebCoreGenerator):
>+        (WebKitGenerator):
>+        * TestWebKitAPI/Configurations/Base.xcconfig:
>+        * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
>+        * TestWebKitAPI/Configurations/SDKVariant.xcconfig:
>+        * TestWebKitAPI/Tests/WebKitCocoa/SafeBrowsing.mm:
>+        * WebEditingTester/Configurations/SDKVariant.xcconfig:
>+        * WebKitLauncher/Configurations/SDKVariant.xcconfig:
>+        * WebKitTestRunner/Configurations/SDKVariant.xcconfig:
>+        * lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig:
>+
> 2019-06-26  Alex Christensen  <achristensen@webkit.org>
> 
>         testRunner.setAlwaysAcceptCookies should wait for cookie accept policy to be set
>Index: Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig
>===================================================================
>--- Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig	(revision 246846)
>+++ Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig	(working copy)
>@@ -30,7 +30,7 @@ WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /Sy
> WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
> 
> WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = maccatalyst;
> WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
> 
> WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>Index: Tools/DumpRenderTree/mac/Configurations/SDKVariant.xcconfig
>===================================================================
>--- Tools/DumpRenderTree/mac/Configurations/SDKVariant.xcconfig	(revision 246846)
>+++ Tools/DumpRenderTree/mac/Configurations/SDKVariant.xcconfig	(working copy)
>@@ -30,7 +30,7 @@ WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /Sy
> WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
> 
> WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = maccatalyst;
> WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
> 
> WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>Index: Tools/ImageDiff/cg/Configurations/SDKVariant.xcconfig
>===================================================================
>--- Tools/ImageDiff/cg/Configurations/SDKVariant.xcconfig	(revision 246846)
>+++ Tools/ImageDiff/cg/Configurations/SDKVariant.xcconfig	(working copy)
>@@ -30,7 +30,7 @@ WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /Sy
> WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
> 
> WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = maccatalyst;
> WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
> 
> WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>Index: Tools/MiniBrowser/Configurations/SDKVariant.xcconfig
>===================================================================
>--- Tools/MiniBrowser/Configurations/SDKVariant.xcconfig	(revision 246846)
>+++ Tools/MiniBrowser/Configurations/SDKVariant.xcconfig	(working copy)
>@@ -30,7 +30,7 @@ WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /Sy
> WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
> 
> WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = maccatalyst;
> WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
> 
> WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>Index: Tools/MobileMiniBrowser/Configurations/SDKVariant.xcconfig
>===================================================================
>--- Tools/MobileMiniBrowser/Configurations/SDKVariant.xcconfig	(revision 246846)
>+++ Tools/MobileMiniBrowser/Configurations/SDKVariant.xcconfig	(working copy)
>@@ -30,7 +30,7 @@ WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /Sy
> WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
> 
> WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = maccatalyst;
> WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
> 
> WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>Index: Tools/Scripts/webkitpy/generate_xcfilelists_lib/generators.py
>===================================================================
>--- Tools/Scripts/webkitpy/generate_xcfilelists_lib/generators.py	(revision 246846)
>+++ Tools/Scripts/webkitpy/generate_xcfilelists_lib/generators.py	(working copy)
>@@ -648,7 +648,7 @@ class BaseGenerator(object):
> 
> 
> class JavaScriptCoreGenerator(BaseGenerator):
>-    VALID_PLATFORMS = ("macosx", "iosmac", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator")
>+    VALID_PLATFORMS = ("macosx", "maccatalyst", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator")
>     VALID_CONFIGURATIONS = ("Debug", "Release", "Production", "Profiling")
> 
>     @util.LogEntryExit
>@@ -665,7 +665,7 @@ class JavaScriptCoreGenerator(BaseGenera
> 
> 
> class WebCoreGenerator(BaseGenerator):
>-    VALID_PLATFORMS = ("macosx", "iosmac", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator")
>+    VALID_PLATFORMS = ("macosx", "maccatalyst", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator")
>     VALID_CONFIGURATIONS = ("Debug", "Release", "Production")
> 
>     @util.LogEntryExit
>@@ -682,7 +682,7 @@ class WebCoreGenerator(BaseGenerator):
> 
> 
> class WebKitGenerator(BaseGenerator):
>-    VALID_PLATFORMS = ("macosx", "iosmac", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator")
>+    VALID_PLATFORMS = ("macosx", "maccatalyst", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator")
>     VALID_CONFIGURATIONS = ("Debug", "Release", "Production")
> 
>     @util.LogEntryExit
>Index: Tools/TestWebKitAPI/Configurations/Base.xcconfig
>===================================================================
>--- Tools/TestWebKitAPI/Configurations/Base.xcconfig	(revision 246846)
>+++ Tools/TestWebKitAPI/Configurations/Base.xcconfig	(working copy)
>@@ -108,7 +108,7 @@ OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
> 
> WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
> WK_COCOA_TOUCH_iphoneos = cocoatouch;
>-WK_COCOA_TOUCH_iosmac = cocoatouch;
>+WK_COCOA_TOUCH_maccatalyst = cocoatouch;
> WK_COCOA_TOUCH_iphonesimulator = cocoatouch;
> WK_COCOA_TOUCH_watchos = cocoatouch;
> WK_COCOA_TOUCH_watchsimulator = cocoatouch;
>Index: Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
>===================================================================
>--- Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig	(revision 246846)
>+++ Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig	(working copy)
>@@ -69,9 +69,9 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE
> ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
> 
> ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
>-ENABLE_CONTENT_FILTERING_iosmac = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
>+ENABLE_CONTENT_FILTERING_maccatalyst = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
> ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
>@@ -90,7 +90,7 @@ ENABLE_CSS_CONIC_GRADIENTS_iphonesimulat
> ENABLE_CSS_CONIC_GRADIENTS_iphonesimulator[sdk=iphone*11.*] = ;
> ENABLE_CSS_CONIC_GRADIENTS_watchos = ENABLE_CSS_CONIC_GRADIENTS;
> ENABLE_CSS_CONIC_GRADIENTS_watchsimulator = ENABLE_CSS_CONIC_GRADIENTS;
>-ENABLE_CSS_CONIC_GRADIENTS_iosmac = ENABLE_CSS_CONIC_GRADIENTS;
>+ENABLE_CSS_CONIC_GRADIENTS_maccatalyst = ENABLE_CSS_CONIC_GRADIENTS;
> ENABLE_CSS_CONIC_GRADIENTS_macosx = $(ENABLE_CSS_CONIC_GRADIENTS$(WK_MACOS_1014));
> ENABLE_CSS_CONIC_GRADIENTS_MACOS_SINCE_1014 = ENABLE_CSS_CONIC_GRADIENTS;
> 
>@@ -117,7 +117,7 @@ ENABLE_CUSTOM_SCHEME_HANDLER = ;
> ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME));
> ENABLE_DARK_MODE_CSS_iphoneos = ENABLE_DARK_MODE_CSS;
> ENABLE_DARK_MODE_CSS_iphonesimulator = ENABLE_DARK_MODE_CSS;
>-ENABLE_DARK_MODE_CSS_iosmac = ENABLE_DARK_MODE_CSS;
>+ENABLE_DARK_MODE_CSS_maccatalyst = ENABLE_DARK_MODE_CSS;
> ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS;
> 
> ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
>@@ -127,7 +127,7 @@ ENABLE_DATALIST_ELEMENT = ENABLE_DATALIS
> ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
> ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
> ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
>-ENABLE_DATA_INTERACTION_iosmac = ENABLE_DATA_INTERACTION;
>+ENABLE_DATA_INTERACTION_maccatalyst = ENABLE_DATA_INTERACTION;
> 
> ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_PLATFORM_NAME));
> ENABLE_DEVICE_ORIENTATION_iphoneos = ENABLE_DEVICE_ORIENTATION;
>@@ -140,7 +140,7 @@ ENABLE_DEVICE_ORIENTATION_appletvsimulat
> ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(WK_PLATFORM_NAME));
> ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
> ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
>-ENABLE_DRAG_SUPPORT_iosmac = ENABLE_DRAG_SUPPORT;
>+ENABLE_DRAG_SUPPORT_maccatalyst = ENABLE_DRAG_SUPPORT;
> 
> ENABLE_ENCRYPTED_MEDIA = $(ENABLE_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME));
> ENABLE_ENCRYPTED_MEDIA_iphoneos = ENABLE_ENCRYPTED_MEDIA;
>@@ -158,14 +158,14 @@ ENABLE_EXPERIMENTAL_FEATURES_YES = ENABL
> ENABLE_FAST_JIT_PERMISSIONS = $(ENABLE_FAST_JIT_PERMISSIONS_$(WK_PLATFORM_NAME));
> ENABLE_FAST_JIT_PERMISSIONS_iphoneos[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSIONS_iphoneos_$(USE_INTERNAL_SDK));
> ENABLE_FAST_JIT_PERMISSIONS_iphoneos_YES = ENABLE_FAST_JIT_PERMISSIONS;
>-ENABLE_FAST_JIT_PERMISSIONS_iosmac = ;
>+ENABLE_FAST_JIT_PERMISSIONS_maccatalyst = ;
> 
> ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
> 
> ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(WK_PLATFORM_NAME))
> ENABLE_FTL_JIT_macosx = ENABLE_FTL_JIT;
> ENABLE_FTL_JIT_iphoneos = ENABLE_FTL_JIT;
>-ENABLE_FTL_JIT_iosmac = ENABLE_FTL_JIT;
>+ENABLE_FTL_JIT_maccatalyst = ENABLE_FTL_JIT;
> ENABLE_FTL_JIT_watchos = ENABLE_FTL_JIT;
> ENABLE_FTL_JIT_appletvos = ENABLE_FTL_JIT;
> 
>@@ -177,16 +177,16 @@ ENABLE_FULLSCREEN_API_macosx = ENABLE_FU
> 
> ENABLE_GAMEPAD = $(ENABLE_GAMEPAD_$(WK_PLATFORM_NAME));
> ENABLE_GAMEPAD_iphoneos = ENABLE_GAMEPAD;
>-ENABLE_GAMEPAD_iosmac = ENABLE_GAMEPAD;
> ENABLE_GAMEPAD_iphonesimulator = ENABLE_GAMEPAD;
> ENABLE_GAMEPAD_appletvos = ENABLE_GAMEPAD;
> ENABLE_GAMEPAD_appletvsimulator = ENABLE_GAMEPAD;
>+ENABLE_GAMEPAD_maccatalyst = ENABLE_GAMEPAD;
> ENABLE_GAMEPAD_macosx = ENABLE_GAMEPAD;
> 
> ENABLE_GEOLOCATION = $(ENABLE_GEOLOCATION_$(WK_PLATFORM_NAME));
> ENABLE_GEOLOCATION_iphoneos = ENABLE_GEOLOCATION;
>-ENABLE_GEOLOCATION_iosmac = ENABLE_GEOLOCATION;
> ENABLE_GEOLOCATION_iphonesimulator = ENABLE_GEOLOCATION;
>+ENABLE_GEOLOCATION_maccatalyst = ENABLE_GEOLOCATION;
> ENABLE_GEOLOCATION_macosx = ENABLE_GEOLOCATION;
> 
> ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(WK_PLATFORM_NAME));
>@@ -319,9 +319,9 @@ ENABLE_PDFKIT_PLUGIN = $(ENABLE_PDFKIT_P
> ENABLE_PDFKIT_PLUGIN_macosx = ENABLE_PDFKIT_PLUGIN;
> 
> ENABLE_POINTER_EVENTS = $(ENABLE_POINTER_EVENTS_$(WK_PLATFORM_NAME));
>-ENABLE_POINTER_EVENTS_iosmac = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_iphoneos = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_iphonesimulator = ENABLE_POINTER_EVENTS;
>+ENABLE_POINTER_EVENTS_maccatalyst = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_macosx = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_watchos = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_watchsimulator = ENABLE_POINTER_EVENTS;
>@@ -385,8 +385,8 @@ ENABLE_USER_MESSAGE_HANDLERS = ENABLE_US
> 
> ENABLE_VARIATION_FONTS = $(ENABLE_VARIATION_FONTS_$(WK_PLATFORM_NAME));
> ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
>-ENABLE_VARIATION_FONTS_iosmac = ENABLE_VARIATION_FONTS;
> ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
>+ENABLE_VARIATION_FONTS_maccatalyst = ENABLE_VARIATION_FONTS;
> ENABLE_VARIATION_FONTS_macosx = $(ENABLE_VARIATION_FONTS$(WK_MACOS_1013));
> ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 = ENABLE_VARIATION_FONTS;
> 
>Index: Tools/TestWebKitAPI/Configurations/SDKVariant.xcconfig
>===================================================================
>--- Tools/TestWebKitAPI/Configurations/SDKVariant.xcconfig	(revision 246846)
>+++ Tools/TestWebKitAPI/Configurations/SDKVariant.xcconfig	(working copy)
>@@ -30,7 +30,7 @@ WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /Sy
> WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
> 
> WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = maccatalyst;
> WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
> 
> WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>Index: Tools/TestWebKitAPI/Tests/WebKitCocoa/SafeBrowsing.mm
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKitCocoa/SafeBrowsing.mm	(revision 246846)
>+++ Tools/TestWebKitAPI/Tests/WebKitCocoa/SafeBrowsing.mm	(working copy)
>@@ -25,7 +25,7 @@
> 
> #import "config.h"
> 
>-#if ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)) && !defined(__i386__) && !PLATFORM(IOSMAC)
>+#if HAVE(SAFE_BROWSING)
> 
> #import "ClassMethodSwizzler.h"
> #import "PlatformUtilities.h"
>@@ -473,4 +473,4 @@ TEST(SafeBrowsing, MissingFramework)
>     [webView synchronouslyLoadTestPageNamed:@"simple"];
> }
> 
>-#endif // ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)) && !defined(__i386__) && !PLATFORM(IOSMAC)
>+#endif // HAVE(SAFE_BROWSING)
>Index: Tools/WebEditingTester/Configurations/SDKVariant.xcconfig
>===================================================================
>--- Tools/WebEditingTester/Configurations/SDKVariant.xcconfig	(revision 246846)
>+++ Tools/WebEditingTester/Configurations/SDKVariant.xcconfig	(working copy)
>@@ -30,7 +30,7 @@ WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /Sy
> WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
> 
> WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = maccatalyst;
> WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
> 
> WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>Index: Tools/WebKitLauncher/Configurations/SDKVariant.xcconfig
>===================================================================
>--- Tools/WebKitLauncher/Configurations/SDKVariant.xcconfig	(revision 246846)
>+++ Tools/WebKitLauncher/Configurations/SDKVariant.xcconfig	(working copy)
>@@ -30,7 +30,7 @@ WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /Sy
> WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
> 
> WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = maccatalyst;
> WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
> 
> WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>Index: Tools/WebKitTestRunner/Configurations/SDKVariant.xcconfig
>===================================================================
>--- Tools/WebKitTestRunner/Configurations/SDKVariant.xcconfig	(revision 246846)
>+++ Tools/WebKitTestRunner/Configurations/SDKVariant.xcconfig	(working copy)
>@@ -30,7 +30,7 @@ WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /Sy
> WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
> 
> WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = maccatalyst;
> WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
> 
> WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>Index: Tools/lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig
>===================================================================
>--- Tools/lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig	(revision 246846)
>+++ Tools/lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig	(working copy)
>@@ -30,7 +30,7 @@ WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /Sy
> WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
> 
> WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = maccatalyst;
> WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
> 
> WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));

Actions: View | Formatted Diff | Diff

Attachments on bug 199245: 372968 | 372973 | 373002