Title: [254317] trunk/Source
- Revision
- 254317
- Author
- timothy_hor...@apple.com
- Date
- 2020-01-09 17:25:42 -0800 (Thu, 09 Jan 2020)
Log Message
Adopt TARGET_OS_MACCATALYST in more places
https://bugs.webkit.org/show_bug.cgi?id=206040
<rdar://problem/57127108>
Reviewed by Simon Fraser.
Source/WebKit:
* Shared/API/Cocoa/WebKit.h:
Source/WebKitLegacy/mac:
* Misc/WebDownload.h:
Source/WTF:
* wtf/Platform.h:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (254316 => 254317)
--- trunk/Source/WTF/ChangeLog 2020-01-10 01:24:26 UTC (rev 254316)
+++ trunk/Source/WTF/ChangeLog 2020-01-10 01:25:42 UTC (rev 254317)
@@ -1,3 +1,13 @@
+2020-01-09 Tim Horton <timothy_hor...@apple.com>
+
+ Adopt TARGET_OS_MACCATALYST in more places
+ https://bugs.webkit.org/show_bug.cgi?id=206040
+ <rdar://problem/57127108>
+
+ Reviewed by Simon Fraser.
+
+ * wtf/Platform.h:
+
2020-01-09 Simon Fraser <simon.fra...@apple.com>
Add ENABLE_UI_SIDE_COMPOSITING and use it in a few places
Modified: trunk/Source/WTF/wtf/Platform.h (254316 => 254317)
--- trunk/Source/WTF/wtf/Platform.h 2020-01-10 01:24:26 UTC (rev 254316)
+++ trunk/Source/WTF/wtf/Platform.h 2020-01-10 01:25:42 UTC (rev 254317)
@@ -373,7 +373,7 @@
/* 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)
+#if TARGET_OS_IOS && !(defined(TARGET_OS_MACCATALYST) && TARGET_OS_MACCATALYST)
#define WTF_OS_IOS 1
#endif
#if TARGET_OS_IPHONE
@@ -536,7 +536,7 @@
#endif
#define WTF_PLATFORM_IOS_FAMILY_SIMULATOR 1
#endif
-#if defined(TARGET_OS_IOSMAC) && TARGET_OS_IOSMAC
+#if defined(TARGET_OS_MACCATALYST) && TARGET_OS_MACCATALYST
#define WTF_PLATFORM_MACCATALYST 1
#endif
#elif OS(WINDOWS)
Modified: trunk/Source/WebKit/ChangeLog (254316 => 254317)
--- trunk/Source/WebKit/ChangeLog 2020-01-10 01:24:26 UTC (rev 254316)
+++ trunk/Source/WebKit/ChangeLog 2020-01-10 01:25:42 UTC (rev 254317)
@@ -1,3 +1,13 @@
+2020-01-09 Tim Horton <timothy_hor...@apple.com>
+
+ Adopt TARGET_OS_MACCATALYST in more places
+ https://bugs.webkit.org/show_bug.cgi?id=206040
+ <rdar://problem/57127108>
+
+ Reviewed by Simon Fraser.
+
+ * Shared/API/Cocoa/WebKit.h:
+
2020-01-09 Simon Fraser <simon.fra...@apple.com>
Clean up -[WKWebView _initializeWithConfiguration:]
Modified: trunk/Source/WebKit/Shared/API/Cocoa/WebKit.h (254316 => 254317)
--- trunk/Source/WebKit/Shared/API/Cocoa/WebKit.h 2020-01-10 01:24:26 UTC (rev 254316)
+++ trunk/Source/WebKit/Shared/API/Cocoa/WebKit.h 2020-01-10 01:25:42 UTC (rev 254317)
@@ -62,6 +62,6 @@
#import <WebKit/WKWebsiteDataStore.h>
#import <WebKit/WKWindowFeatures.h>
-#if !defined(TARGET_OS_IOSMAC) || !TARGET_OS_IOSMAC
+#if !defined(TARGET_OS_MACCATALYST) || !TARGET_OS_MACCATALYST
#import <WebKit/WebKitLegacy.h>
#endif
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (254316 => 254317)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2020-01-10 01:24:26 UTC (rev 254316)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2020-01-10 01:25:42 UTC (rev 254317)
@@ -1,3 +1,13 @@
+2020-01-09 Tim Horton <timothy_hor...@apple.com>
+
+ Adopt TARGET_OS_MACCATALYST in more places
+ https://bugs.webkit.org/show_bug.cgi?id=206040
+ <rdar://problem/57127108>
+
+ Reviewed by Simon Fraser.
+
+ * Misc/WebDownload.h:
+
2020-01-08 Yusuke Suzuki <ysuz...@apple.com>
Reduce binary size by purging C++ type information in Objective-C fields and parameters
Modified: trunk/Source/WebKitLegacy/mac/Misc/WebDownload.h (254316 => 254317)
--- trunk/Source/WebKitLegacy/mac/Misc/WebDownload.h 2020-01-10 01:24:26 UTC (rev 254316)
+++ trunk/Source/WebKitLegacy/mac/Misc/WebDownload.h 2020-01-10 01:25:42 UTC (rev 254317)
@@ -32,7 +32,7 @@
#ifndef WebDownload_h
#define WebDownload_h
-#if (defined TARGET_OS_IOSMAC && TARGET_OS_IOSMAC) || (defined(TARGET_OS_WATCH) && TARGET_OS_WATCH)
+#if (defined TARGET_OS_MACCATALYST && TARGET_OS_MACCATALYST) || (defined(TARGET_OS_WATCH) && TARGET_OS_WATCH)
#import <CFNetwork/CFNSURLConnection.h>
#elif !TARGET_OS_IPHONE || (defined USE_APPLE_INTERNAL_SDK && USE_APPLE_INTERNAL_SDK)
#import <Foundation/NSURLDownload.h>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
