Unreviewed, reverting r258748.
authorjacob_uphoff@apple.com <jacob_uphoff@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 20 Mar 2020 16:30:15 +0000 (16:30 +0000)
committerjacob_uphoff@apple.com <jacob_uphoff@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 20 Mar 2020 16:30:15 +0000 (16:30 +0000)
This commit broke the Catalina build

Reverted changeset:

"Upstream a variety of Cocoa-platform HAVE and ENABLE macros"
https://bugs.webkit.org/show_bug.cgi?id=209307
https://trac.webkit.org/changeset/258748

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@258765 268f45cc-cd09-0410-ab3c-d52691b4dbfc

23 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
Source/WTF/ChangeLog
Source/WTF/wtf/PlatformEnableCocoa.h
Source/WTF/wtf/PlatformHave.h
Source/WebCore/ChangeLog
Source/WebCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
Source/WebCore/PAL/pal/spi/cocoa/AVFoundationSPI.h
Source/WebCore/PAL/pal/spi/cocoa/RevealSPI.h
Source/WebCore/PAL/pal/spi/ios/UIKitSPI.h
Source/WebCore/page/cocoa/SettingsBaseCocoa.mm
Source/WebKit/ChangeLog
Source/WebKit/Configurations/FeatureDefines.xcconfig
Source/WebKit/Platform/spi/ios/PDFKitSPI.h
Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm
Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.mm
Source/WebKit/UIProcess/ios/WKPDFView.mm
Source/WebKitLegacy/mac/ChangeLog
Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
Tools/ChangeLog
Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig

index 748e8c6..a35393d 100644 (file)
@@ -1,3 +1,15 @@
+2020-03-20  Jacob Uphoff  <jacob_uphoff@apple.com>
+
+        Unreviewed, reverting r258748.
+
+        This commit broke the Catalina build
+
+        Reverted changeset:
+
+        "Upstream a variety of Cocoa-platform HAVE and ENABLE macros"
+        https://bugs.webkit.org/show_bug.cgi?id=209307
+        https://trac.webkit.org/changeset/258748
+
 2020-03-19  Tim Horton  <timothy_horton@apple.com>
 
         Upstream a variety of Cocoa-platform HAVE and ENABLE macros
index effc72b..cfbb729 100644 (file)
@@ -263,7 +263,6 @@ ENABLE_MEDIA_CONTROLS_SCRIPT = ENABLE_MEDIA_CONTROLS_SCRIPT;
 ENABLE_MEDIA_SESSION = ;
 
 ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(WK_PLATFORM_NAME));
-ENABLE_MEDIA_SOURCE_iphoneos = ENABLE_MEDIA_SOURCE;
 ENABLE_MEDIA_SOURCE_macosx = ENABLE_MEDIA_SOURCE;
 
 ENABLE_MEDIA_STATISTICS = ;
index e4350b4..36f43a4 100644 (file)
@@ -1,3 +1,15 @@
+2020-03-20  Jacob Uphoff  <jacob_uphoff@apple.com>
+
+        Unreviewed, reverting r258748.
+
+        This commit broke the Catalina build
+
+        Reverted changeset:
+
+        "Upstream a variety of Cocoa-platform HAVE and ENABLE macros"
+        https://bugs.webkit.org/show_bug.cgi?id=209307
+        https://trac.webkit.org/changeset/258748
+
 2020-03-19  Tim Horton  <timothy_horton@apple.com>
 
         Upstream a variety of Cocoa-platform HAVE and ENABLE macros
index c84ead3..f657412 100644 (file)
 #define ENABLE_WKPDFVIEW 1
 #endif
 
-#if !defined(ENABLE_MEDIA_SOURCE) && PLATFORM(MAC) || (PLATFORM(IOS) && !PLATFORM(IOS_FAMILY_SIMULATOR))
+#if !defined(ENABLE_MEDIA_SOURCE) && PLATFORM(MAC)
 #define ENABLE_MEDIA_SOURCE 1
 #endif
 
 #if !defined(ENABLE_FTL_JIT) && !USE(JSVALUE32_64) && !PLATFORM(IOS_FAMILY_SIMULATOR)
 #define ENABLE_FTL_JIT 1
 #endif
-
-#if !defined(ENABLE_REVEAL) && ((PLATFORM(MACCATALYST) || PLATFORM(IOS)) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500))
-#define ENABLE_REVEAL 1
-#endif
-
-#if !defined (ENABLE_ANIMATED_KEYBOARD_SCROLLING) && PLATFORM(IOS_FAMILY)
-#define ENABLE_ANIMATED_KEYBOARD_SCROLLING 1
-#endif
-
-#if !defined(ENABLE_FULL_KEYBOARD_ACCESS) && PLATFORM(IOS)
-#define ENABLE_FULL_KEYBOARD_ACCESS 1
-#endif
-
-// FIXME: Should this be enabled for other iOS-family platforms?
-#if !defined(ENABLE_TAKE_UNBOUNDED_NETWORKING_ASSERTION) && (PLATFORM(IOS) || PLATFORM(MACCATALYST))
-#define ENABLE_TAKE_UNBOUNDED_NETWORKING_ASSERTION 1
-#endif
index b17539b..447b53b 100644 (file)
 #define HAVE_FJCVTZS_INSTRUCTION 1
 #endif
 
-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500)
+#if PLATFORM(IOS)
 #define HAVE_APP_LINKS 1
 #endif
 
 #define HAVE_SYSTEM_FEATURE_FLAGS 1
 #endif
 
-#if PLATFORM(IOS)
+#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
 #define HAVE_AVOBSERVATIONCONTROLLER 1
 #endif
-
-#if PLATFORM(IOS_FAMILY)
-#define HAVE_MENU_CONTROLLER_SHOW_HIDE_API 1
-#endif
-
-// FIXME: Should this be enabled on other iOS-family platforms?
-#if PLATFORM(IOS) || PLATFORM(MACCATALYST)
-#define HAVE_CANCEL_WEB_TOUCH_EVENTS_GESTURE 1
-#endif
-
-#if PLATFORM(IOS_FAMILY)
-#define HAVE_UI_REMOTE_VIEW 1
-#endif
-
-#if PLATFORM(IOS_FAMILY)
-#define HAVE_PDF_HOST_VIEW_CONTROLLER_WITH_BACKGROUND_COLOR 1
-#endif
-
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130400
-#define HAVE_UISCENE_BASED_VIEW_SERVICE_STATE_NOTIFICATIONS 1
-#endif
index df190cf..3847b38 100644 (file)
@@ -1,3 +1,15 @@
+2020-03-20  Jacob Uphoff  <jacob_uphoff@apple.com>
+
+        Unreviewed, reverting r258748.
+
+        This commit broke the Catalina build
+
+        Reverted changeset:
+
+        "Upstream a variety of Cocoa-platform HAVE and ENABLE macros"
+        https://bugs.webkit.org/show_bug.cgi?id=209307
+        https://trac.webkit.org/changeset/258748
+
 2020-03-20  Zalan Bujtas  <zalan@apple.com>
 
         [LFC][IFC] Avoid infinite loop when stuck on partial content
index effc72b..cfbb729 100644 (file)
@@ -263,7 +263,6 @@ ENABLE_MEDIA_CONTROLS_SCRIPT = ENABLE_MEDIA_CONTROLS_SCRIPT;
 ENABLE_MEDIA_SESSION = ;
 
 ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(WK_PLATFORM_NAME));
-ENABLE_MEDIA_SOURCE_iphoneos = ENABLE_MEDIA_SOURCE;
 ENABLE_MEDIA_SOURCE_macosx = ENABLE_MEDIA_SOURCE;
 
 ENABLE_MEDIA_STATISTICS = ;
index c198c71..fab1317 100644 (file)
@@ -1,3 +1,15 @@
+2020-03-20  Jacob Uphoff  <jacob_uphoff@apple.com>
+
+        Unreviewed, reverting r258748.
+
+        This commit broke the Catalina build
+
+        Reverted changeset:
+
+        "Upstream a variety of Cocoa-platform HAVE and ENABLE macros"
+        https://bugs.webkit.org/show_bug.cgi?id=209307
+        https://trac.webkit.org/changeset/258748
+
 2020-03-20  Timothy Horton  <timothy_horton@apple.com>
 
         Fix the build
index effc72b..cfbb729 100644 (file)
@@ -263,7 +263,6 @@ ENABLE_MEDIA_CONTROLS_SCRIPT = ENABLE_MEDIA_CONTROLS_SCRIPT;
 ENABLE_MEDIA_SESSION = ;
 
 ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(WK_PLATFORM_NAME));
-ENABLE_MEDIA_SOURCE_iphoneos = ENABLE_MEDIA_SOURCE;
 ENABLE_MEDIA_SOURCE_macosx = ENABLE_MEDIA_SOURCE;
 
 ENABLE_MEDIA_STATISTICS = ;
index 5f15f05..9b95017 100644 (file)
@@ -124,7 +124,7 @@ NS_ASSUME_NONNULL_END
 
 #endif // PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)
 
-#if ENABLE(MEDIA_SOURCE)
+#if !PLATFORM(IOS_FAMILY)
 
 #pragma mark -
 #pragma mark AVStreamDataParser
@@ -163,7 +163,7 @@ NS_ASSUME_NONNULL_END
 @end
 #endif
 
-#endif // ENABLE(MEDIA_SOURCE)
+#endif // !PLATFORM(IOS_FAMILY)
 
 #endif // USE(APPLE_INTERNAL_SDK)
 
@@ -182,7 +182,7 @@ NS_ASSUME_NONNULL_END
 @end
 #endif // HAVE(AVCONTENTKEYSESSION)
 
-#if ENABLE(MEDIA_SOURCE) && !USE(APPLE_INTERNAL_SDK)
+#if PLATFORM(MAC) && !USE(APPLE_INTERNAL_SDK)
 NS_ASSUME_NONNULL_BEGIN
 @interface AVStreamDataParser (AVStreamDataParserPrivate)
 + (NSString *)outputMIMECodecParameterForInputMIMECodecParameter:(NSString *)inputMIMECodecParameter;
index 7dfdc7d..db7503f 100644 (file)
@@ -47,7 +47,6 @@
 
 @interface RVItem : NSObject <NSSecureCoding>
 - (instancetype)initWithText:(NSString *)text selectedRange:(NSRange)selectedRange NS_DESIGNATED_INITIALIZER;
-@property (readonly, nonatomic) NSRange highlightRange;
 @end
 
 @interface RVSelection : NSObject
@@ -59,6 +58,7 @@
 - (instancetype)initWithPointerLocationInView:(NSPoint)pointerLocationInView inView:(NSView *)view highlightDelegate:(id<RVPresenterHighlightDelegate>)highlightDelegate;
 @property (readonly, nonnull) NSArray <NSValue *> * itemRectsInView;
 @end
+#endif
 
 @protocol RVPresenterHighlightDelegate <NSObject>
 @required
@@ -67,7 +67,6 @@
 - (void)revealContext:(RVPresentingContext *)context stopHighlightingItem:(RVItem *)item;
 - (void)revealContext:(RVPresentingContext *)context drawRectsForItem:(RVItem *)item;
 @end
-#endif
 
 @interface RVDocumentContext : NSObject < NSSecureCoding >
 @end
@@ -75,8 +74,8 @@
 @interface RVPresenter : NSObject
 #if PLATFORM(MAC)
 - (id<NSImmediateActionAnimationController>)animationControllerForItem:(RVItem *)item documentContext:(RVDocumentContext *)documentContext presentingContext:(RVPresentingContext *)presentingContext options:(NSDictionary *)options;
-- (BOOL)revealItem:(RVItem *)item documentContext:(RVDocumentContext *)documentContext presentingContext:(RVPresentingContext *)presentingContext options:(NSDictionary *)options;
 #endif // PLATFORM(MAC)
+- (BOOL)revealItem:(RVItem *)item documentContext:(RVDocumentContext *)documentContext presentingContext:(RVPresentingContext *)presentingContext options:(NSDictionary *)options;
 @end
 
 #endif // !USE(APPLE_INTERNAL_SDK)
index d247f9b..c82ad98 100644 (file)
@@ -38,7 +38,6 @@ WTF_EXTERN_C_END
 #import <UIKit/UIApplicationSceneConstants.h>
 #import <UIKit/UIApplication_Private.h>
 #import <UIKit/UIColor_Private.h>
-#import <UIKit/UIFocusRingStyle.h>
 #import <UIKit/UIFont_Private.h>
 #import <UIKit/UIInterface_Private.h>
 #import <UIKit/UIScreen_Private.h>
@@ -56,6 +55,9 @@ WTF_EXTERN_C_END
 - (CGFloat)_iOSMacScale;
 @end
 
+#if __has_include(<UIKit/UIFocusRingStyle.h>)
+#import <UIKit/UIFocusRingStyle.h>
+#endif
 
 #else // USE(APPLE_INTERNAL_SDK)
 
@@ -146,20 +148,18 @@ typedef enum {
 @property (nonatomic, copy, setter=_setTitle:) NSString *_title;
 @end
 
-#if ENABLE(FULL_KEYBOARD_ACCESS)
-@interface UIFocusRingStyle : NSObject
-+ (CGFloat)cornerRadius;
-+ (CGFloat)maxAlpha;
-+ (CGFloat)alphaThreshold;
-@end
-#endif
-
 #endif // USE(APPLE_INTERNAL_SDK)
 
 #if ENABLE(FULL_KEYBOARD_ACCESS)
 @interface UIColor (IPI)
 + (UIColor *)keyboardFocusIndicatorColor;
 @end
+
+@interface UIFocusRingStyle (Staging_47831886)
++ (CGFloat)cornerRadius;
++ (CGFloat)maxAlpha;
++ (CGFloat)alphaThreshold;
+@end
 #endif
 
 #if HAVE(OS_DARK_MODE_SUPPORT)
index 4e12594..4961615 100644 (file)
@@ -86,13 +86,6 @@ bool SettingsBase::defaultTextAutosizingEnabled()
     return true;
 }
 
-#if ENABLE(MEDIA_SOURCE)
-bool SettingsBase::platformDefaultMediaSourceEnabled()
-{
-    return false;
-}
-#endif
-
 #endif
 
 const String& SettingsBase::defaultMediaContentTypesRequiringHardwareSupport()
index 6f0eded..df8286a 100644 (file)
@@ -1,3 +1,15 @@
+2020-03-20  Jacob Uphoff  <jacob_uphoff@apple.com>
+
+        Unreviewed, reverting r258748.
+
+        This commit broke the Catalina build
+
+        Reverted changeset:
+
+        "Upstream a variety of Cocoa-platform HAVE and ENABLE macros"
+        https://bugs.webkit.org/show_bug.cgi?id=209307
+        https://trac.webkit.org/changeset/258748
+
 2020-03-19  David Kilzer  <ddkilzer@apple.com>
 
         SharedMemory::allocate() should initialize `address`
index effc72b..cfbb729 100644 (file)
@@ -263,7 +263,6 @@ ENABLE_MEDIA_CONTROLS_SCRIPT = ENABLE_MEDIA_CONTROLS_SCRIPT;
 ENABLE_MEDIA_SESSION = ;
 
 ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(WK_PLATFORM_NAME));
-ENABLE_MEDIA_SOURCE_iphoneos = ENABLE_MEDIA_SOURCE;
 ENABLE_MEDIA_SOURCE_macosx = ENABLE_MEDIA_SOURCE;
 
 ENABLE_MEDIA_STATISTICS = ;
index 67adbde..fac6378 100644 (file)
@@ -54,8 +54,6 @@
 - (void) goToPageIndex:(NSInteger) pageIndex;
 - (void) updatePDFViewLayout;
 
-+ (UIColor *)backgroundColor;
-
 - (void) beginPDFViewRotation;
 - (void) endPDFViewRotation;
 
index dfe2f02..0c126ae 100644 (file)
@@ -43,7 +43,7 @@ using namespace WebCore;
 
 static RetainPtr<UIView> createRemoteView(pid_t pid, uint32_t contextID)
 {
-#if HAVE(UI_REMOTE_VIEW)
+#if USE(UIREMOTEVIEW_CONTEXT_HOSTING)
     // FIXME: Remove this respondsToSelector check when possible.
     static BOOL canUseUIRemoteView;
     static std::once_flag initializeCanUseUIRemoteView;
index 449ec20..9237610 100644 (file)
@@ -271,7 +271,7 @@ static Class scrollViewScrollIndicatorClass()
 
 @end
 
-#if HAVE(UI_REMOTE_VIEW)
+#if USE(UIREMOTEVIEW_CONTEXT_HOSTING)
 @implementation WKUIRemoteView
 
 - (instancetype)initWithFrame:(CGRect)frame pid:(pid_t)pid contextID:(uint32_t)contextID
index 3c4ad5d..f769689 100644 (file)
     if (!(self = [super initWithFrame:frame webView:webView]))
         return nil;
 
-#if HAVE(PDF_HOST_VIEW_CONTROLLER_WITH_BACKGROUND_COLOR)
+#if USE(PDFKIT_BACKGROUND_COLOR)
     UIColor *backgroundColor = PDFHostViewController.backgroundColor;
 #else
     UIColor *backgroundColor = UIColor.grayColor;
index 6560254..d0d7cc8 100644 (file)
@@ -1,3 +1,15 @@
+2020-03-20  Jacob Uphoff  <jacob_uphoff@apple.com>
+
+        Unreviewed, reverting r258748.
+
+        This commit broke the Catalina build
+
+        Reverted changeset:
+
+        "Upstream a variety of Cocoa-platform HAVE and ENABLE macros"
+        https://bugs.webkit.org/show_bug.cgi?id=209307
+        https://trac.webkit.org/changeset/258748
+
 2020-03-19  Tim Horton  <timothy_horton@apple.com>
 
         Upstream a variety of Cocoa-platform HAVE and ENABLE macros
index effc72b..cfbb729 100644 (file)
@@ -263,7 +263,6 @@ ENABLE_MEDIA_CONTROLS_SCRIPT = ENABLE_MEDIA_CONTROLS_SCRIPT;
 ENABLE_MEDIA_SESSION = ;
 
 ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(WK_PLATFORM_NAME));
-ENABLE_MEDIA_SOURCE_iphoneos = ENABLE_MEDIA_SOURCE;
 ENABLE_MEDIA_SOURCE_macosx = ENABLE_MEDIA_SOURCE;
 
 ENABLE_MEDIA_STATISTICS = ;
index a3768da..324c9d2 100644 (file)
@@ -1,3 +1,15 @@
+2020-03-20  Jacob Uphoff  <jacob_uphoff@apple.com>
+
+        Unreviewed, reverting r258748.
+
+        This commit broke the Catalina build
+
+        Reverted changeset:
+
+        "Upstream a variety of Cocoa-platform HAVE and ENABLE macros"
+        https://bugs.webkit.org/show_bug.cgi?id=209307
+        https://trac.webkit.org/changeset/258748
+
 2020-03-20  Aakash Jain  <aakash_jain@apple.com>
 
         [ews] commit-queue should comment on bug if patch fails to apply
index effc72b..cfbb729 100644 (file)
@@ -263,7 +263,6 @@ ENABLE_MEDIA_CONTROLS_SCRIPT = ENABLE_MEDIA_CONTROLS_SCRIPT;
 ENABLE_MEDIA_SESSION = ;
 
 ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(WK_PLATFORM_NAME));
-ENABLE_MEDIA_SOURCE_iphoneos = ENABLE_MEDIA_SOURCE;
 ENABLE_MEDIA_SOURCE_macosx = ENABLE_MEDIA_SOURCE;
 
 ENABLE_MEDIA_STATISTICS = ;