Changeset 258748 in webkit


Ignore:
Timestamp:
Mar 19, 2020 6:59:05 PM (4 years ago)
Author:
timothy_horton@apple.com
Message:

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

Reviewed by Andy Estes.

Source/JavaScriptCore:

  • Configurations/FeatureDefines.xcconfig:

Source/WebCore:

  • Configurations/FeatureDefines.xcconfig:

Source/WebCore/PAL:

  • Configurations/FeatureDefines.xcconfig:
  • pal/spi/cocoa/AVFoundationSPI.h:
  • pal/spi/cocoa/RevealSPI.h:
  • pal/spi/ios/UIKitSPI.h:

Source/WebKit:

  • Configurations/FeatureDefines.xcconfig:
  • Platform/spi/ios/PDFKitSPI.h:
  • UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm:

(WebKit::createRemoteView):

  • UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.mm:
  • UIProcess/ios/WKPDFView.mm:

(-[WKPDFView web_initWithFrame:webView:mimeType:]):

Source/WebKitLegacy/mac:

  • Configurations/FeatureDefines.xcconfig:

Source/WTF:

  • wtf/PlatformEnableCocoa.h:
  • wtf/PlatformHave.h:

Tools:

  • TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
Location:
trunk
Files:
23 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r258732 r258748  
     12020-03-19  Tim Horton  <timothy_horton@apple.com>
     2
     3        Upstream a variety of Cocoa-platform HAVE and ENABLE macros
     4        https://bugs.webkit.org/show_bug.cgi?id=209307
     5
     6        Reviewed by Andy Estes.
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9
    1102020-03-19  Yusuke Suzuki  <ysuzuki@apple.com>
    211
  • trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig

    r258498 r258748  
    264264
    265265ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(WK_PLATFORM_NAME));
     266ENABLE_MEDIA_SOURCE_iphoneos = ENABLE_MEDIA_SOURCE;
    266267ENABLE_MEDIA_SOURCE_macosx = ENABLE_MEDIA_SOURCE;
    267268
  • trunk/Source/WTF/ChangeLog

    r258737 r258748  
     12020-03-19  Tim Horton  <timothy_horton@apple.com>
     2
     3        Upstream a variety of Cocoa-platform HAVE and ENABLE macros
     4        https://bugs.webkit.org/show_bug.cgi?id=209307
     5
     6        Reviewed by Andy Estes.
     7
     8        * wtf/PlatformEnableCocoa.h:
     9        * wtf/PlatformHave.h:
     10
    1112020-03-19  Tim Horton  <timothy_horton@apple.com>
    212
  • trunk/Source/WTF/wtf/PlatformEnableCocoa.h

    r258721 r258748  
    152152#endif
    153153
    154 #if !defined(ENABLE_MEDIA_SOURCE) && PLATFORM(MAC)
     154#if !defined(ENABLE_MEDIA_SOURCE) && PLATFORM(MAC) || (PLATFORM(IOS) && !PLATFORM(IOS_FAMILY_SIMULATOR))
    155155#define ENABLE_MEDIA_SOURCE 1
    156156#endif
     
    264264#define ENABLE_FTL_JIT 1
    265265#endif
     266
     267#if !defined(ENABLE_REVEAL) && ((PLATFORM(MACCATALYST) || PLATFORM(IOS)) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500))
     268#define ENABLE_REVEAL 1
     269#endif
     270
     271#if !defined (ENABLE_ANIMATED_KEYBOARD_SCROLLING) && PLATFORM(IOS_FAMILY)
     272#define ENABLE_ANIMATED_KEYBOARD_SCROLLING 1
     273#endif
     274
     275#if !defined(ENABLE_FULL_KEYBOARD_ACCESS) && PLATFORM(IOS)
     276#define ENABLE_FULL_KEYBOARD_ACCESS 1
     277#endif
     278
     279// FIXME: Should this be enabled for other iOS-family platforms?
     280#if !defined(ENABLE_TAKE_UNBOUNDED_NETWORKING_ASSERTION) && (PLATFORM(IOS) || PLATFORM(MACCATALYST))
     281#define ENABLE_TAKE_UNBOUNDED_NETWORKING_ASSERTION 1
     282#endif
  • trunk/Source/WTF/wtf/PlatformHave.h

    r258737 r258748  
    257257#endif
    258258
    259 #if PLATFORM(IOS)
     259#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500)
    260260#define HAVE_APP_LINKS 1
    261261#endif
     
    624624#endif
    625625
    626 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
     626#if PLATFORM(IOS)
    627627#define HAVE_AVOBSERVATIONCONTROLLER 1
    628628#endif
     629
     630#if PLATFORM(IOS_FAMILY)
     631#define HAVE_MENU_CONTROLLER_SHOW_HIDE_API 1
     632#endif
     633
     634// FIXME: Should this be enabled on other iOS-family platforms?
     635#if PLATFORM(IOS) || PLATFORM(MACCATALYST)
     636#define HAVE_CANCEL_WEB_TOUCH_EVENTS_GESTURE 1
     637#endif
     638
     639#if PLATFORM(IOS_FAMILY)
     640#define HAVE_UI_REMOTE_VIEW 1
     641#endif
     642
     643#if PLATFORM(IOS_FAMILY)
     644#define HAVE_PDF_HOST_VIEW_CONTROLLER_WITH_BACKGROUND_COLOR 1
     645#endif
     646
     647#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130400
     648#define HAVE_UISCENE_BASED_VIEW_SERVICE_STATE_NOTIFICATIONS 1
     649#endif
  • trunk/Source/WebCore/ChangeLog

    r258744 r258748  
     12020-03-19  Tim Horton  <timothy_horton@apple.com>
     2
     3        Upstream a variety of Cocoa-platform HAVE and ENABLE macros
     4        https://bugs.webkit.org/show_bug.cgi?id=209307
     5
     6        Reviewed by Andy Estes.
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9
    1102020-03-19  Sunny He  <sunny_he@apple.com>
    211
  • trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig

    r258498 r258748  
    264264
    265265ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(WK_PLATFORM_NAME));
     266ENABLE_MEDIA_SOURCE_iphoneos = ENABLE_MEDIA_SOURCE;
    266267ENABLE_MEDIA_SOURCE_macosx = ENABLE_MEDIA_SOURCE;
    267268
  • trunk/Source/WebCore/PAL/ChangeLog

    r258684 r258748  
     12020-03-19  Tim Horton  <timothy_horton@apple.com>
     2
     3        Upstream a variety of Cocoa-platform HAVE and ENABLE macros
     4        https://bugs.webkit.org/show_bug.cgi?id=209307
     5
     6        Reviewed by Andy Estes.
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9        * pal/spi/cocoa/AVFoundationSPI.h:
     10        * pal/spi/cocoa/RevealSPI.h:
     11        * pal/spi/ios/UIKitSPI.h:
     12
    1132020-03-19  Megan Gardner  <megan_gardner@apple.com>
    214
  • trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig

    r258498 r258748  
    264264
    265265ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(WK_PLATFORM_NAME));
     266ENABLE_MEDIA_SOURCE_iphoneos = ENABLE_MEDIA_SOURCE;
    266267ENABLE_MEDIA_SOURCE_macosx = ENABLE_MEDIA_SOURCE;
    267268
  • trunk/Source/WebCore/PAL/pal/spi/cocoa/AVFoundationSPI.h

    r258533 r258748  
    125125#endif // PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)
    126126
    127 #if !PLATFORM(IOS_FAMILY)
     127#if ENABLE(MEDIA_SOURCE)
    128128
    129129#pragma mark -
     
    164164#endif
    165165
    166 #endif // !PLATFORM(IOS_FAMILY)
     166#endif // ENABLE(MEDIA_SOURCE)
    167167
    168168#endif // USE(APPLE_INTERNAL_SDK)
     
    183183#endif // HAVE(AVCONTENTKEYSESSION)
    184184
    185 #if PLATFORM(MAC) && !USE(APPLE_INTERNAL_SDK)
     185#if ENABLE(MEDIA_SOURCE) && !USE(APPLE_INTERNAL_SDK)
    186186NS_ASSUME_NONNULL_BEGIN
    187187@interface AVStreamDataParser (AVStreamDataParserPrivate)
  • trunk/Source/WebCore/PAL/pal/spi/cocoa/RevealSPI.h

    r242746 r258748  
    4848@interface RVItem : NSObject <NSSecureCoding>
    4949- (instancetype)initWithText:(NSString *)text selectedRange:(NSRange)selectedRange NS_DESIGNATED_INITIALIZER;
     50@property (readonly, nonatomic) NSRange highlightRange;
    5051@end
    5152
     
    5859- (instancetype)initWithPointerLocationInView:(NSPoint)pointerLocationInView inView:(NSView *)view highlightDelegate:(id<RVPresenterHighlightDelegate>)highlightDelegate;
    5960@end
    60 #endif
    6161
    6262@protocol RVPresenterHighlightDelegate <NSObject>
     
    6767- (void)revealContext:(RVPresentingContext *)context drawRectsForItem:(RVItem *)item;
    6868@end
     69#endif
    6970
    7071@interface RVDocumentContext : NSObject < NSSecureCoding >
     
    7475#if PLATFORM(MAC)
    7576- (id<NSImmediateActionAnimationController>)animationControllerForItem:(RVItem *)item documentContext:(RVDocumentContext *)documentContext presentingContext:(RVPresentingContext *)presentingContext options:(NSDictionary *)options;
     77- (BOOL)revealItem:(RVItem *)item documentContext:(RVDocumentContext *)documentContext presentingContext:(RVPresentingContext *)presentingContext options:(NSDictionary *)options;
    7678#endif // PLATFORM(MAC)
    77 - (BOOL)revealItem:(RVItem *)item documentContext:(RVDocumentContext *)documentContext presentingContext:(RVPresentingContext *)presentingContext options:(NSDictionary *)options;
    7879@end
    7980
  • trunk/Source/WebCore/PAL/pal/spi/ios/UIKitSPI.h

    r258085 r258748  
    3939#import <UIKit/UIApplication_Private.h>
    4040#import <UIKit/UIColor_Private.h>
     41#import <UIKit/UIFocusRingStyle.h>
    4142#import <UIKit/UIFont_Private.h>
    4243#import <UIKit/UIInterface_Private.h>
     
    5657@end
    5758
    58 #if __has_include(<UIKit/UIFocusRingStyle.h>)
    59 #import <UIKit/UIFocusRingStyle.h>
    60 #endif
    6159
    6260#else // USE(APPLE_INTERNAL_SDK)
     
    149147@end
    150148
     149#if ENABLE(FULL_KEYBOARD_ACCESS)
     150@interface UIFocusRingStyle : NSObject
     151+ (CGFloat)cornerRadius;
     152+ (CGFloat)maxAlpha;
     153+ (CGFloat)alphaThreshold;
     154@end
     155#endif
     156
    151157#endif // USE(APPLE_INTERNAL_SDK)
    152158
     
    154160@interface UIColor (IPI)
    155161+ (UIColor *)keyboardFocusIndicatorColor;
    156 @end
    157 
    158 @interface UIFocusRingStyle (Staging_47831886)
    159 + (CGFloat)cornerRadius;
    160 + (CGFloat)maxAlpha;
    161 + (CGFloat)alphaThreshold;
    162162@end
    163163#endif
  • trunk/Source/WebCore/page/cocoa/SettingsBaseCocoa.mm

    r246048 r258748  
    8787}
    8888
     89#if ENABLE(MEDIA_SOURCE)
     90bool SettingsBase::platformDefaultMediaSourceEnabled()
     91{
     92    return false;
     93}
     94#endif
     95
    8996#endif
    9097
  • trunk/Source/WebKit/ChangeLog

    r258741 r258748  
     12020-03-19  Tim Horton  <timothy_horton@apple.com>
     2
     3        Upstream a variety of Cocoa-platform HAVE and ENABLE macros
     4        https://bugs.webkit.org/show_bug.cgi?id=209307
     5
     6        Reviewed by Andy Estes.
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9        * Platform/spi/ios/PDFKitSPI.h:
     10        * UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm:
     11        (WebKit::createRemoteView):
     12        * UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.mm:
     13        * UIProcess/ios/WKPDFView.mm:
     14        (-[WKPDFView web_initWithFrame:webView:mimeType:]):
     15
    1162020-03-19  Alex Christensen  <achristensen@webkit.org>
    217
  • trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig

    r258498 r258748  
    264264
    265265ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(WK_PLATFORM_NAME));
     266ENABLE_MEDIA_SOURCE_iphoneos = ENABLE_MEDIA_SOURCE;
    266267ENABLE_MEDIA_SOURCE_macosx = ENABLE_MEDIA_SOURCE;
    267268
  • trunk/Source/WebKit/Platform/spi/ios/PDFKitSPI.h

    r246300 r258748  
    5555- (void) updatePDFViewLayout;
    5656
     57+ (UIColor *)backgroundColor;
     58
    5759- (void) beginPDFViewRotation;
    5860- (void) endPDFViewRotation;
  • trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm

    r248846 r258748  
    4444static RetainPtr<UIView> createRemoteView(pid_t pid, uint32_t contextID)
    4545{
    46 #if USE(UIREMOTEVIEW_CONTEXT_HOSTING)
     46#if HAVE(UI_REMOTE_VIEW)
    4747    // FIXME: Remove this respondsToSelector check when possible.
    4848    static BOOL canUseUIRemoteView;
  • trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.mm

    r258148 r258748  
    272272@end
    273273
    274 #if USE(UIREMOTEVIEW_CONTEXT_HOSTING)
     274#if HAVE(UI_REMOTE_VIEW)
    275275@implementation WKUIRemoteView
    276276
  • trunk/Source/WebKit/UIProcess/ios/WKPDFView.mm

    r253527 r258748  
    121121        return nil;
    122122
    123 #if USE(PDFKIT_BACKGROUND_COLOR)
     123#if HAVE(PDF_HOST_VIEW_CONTROLLER_WITH_BACKGROUND_COLOR)
    124124    UIColor *backgroundColor = PDFHostViewController.backgroundColor;
    125125#else
  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r258685 r258748  
     12020-03-19  Tim Horton  <timothy_horton@apple.com>
     2
     3        Upstream a variety of Cocoa-platform HAVE and ENABLE macros
     4        https://bugs.webkit.org/show_bug.cgi?id=209307
     5
     6        Reviewed by Andy Estes.
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9
    1102020-03-19  youenn fablet  <youenn@apple.com>
    211
  • trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig

    r258498 r258748  
    264264
    265265ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(WK_PLATFORM_NAME));
     266ENABLE_MEDIA_SOURCE_iphoneos = ENABLE_MEDIA_SOURCE;
    266267ENABLE_MEDIA_SOURCE_macosx = ENABLE_MEDIA_SOURCE;
    267268
  • trunk/Tools/ChangeLog

    r258745 r258748  
     12020-03-19  Tim Horton  <timothy_horton@apple.com>
     2
     3        Upstream a variety of Cocoa-platform HAVE and ENABLE macros
     4        https://bugs.webkit.org/show_bug.cgi?id=209307
     5
     6        Reviewed by Andy Estes.
     7
     8        * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
     9
    1102020-03-19  Alex Christensen  <achristensen@webkit.org>
    211
  • trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig

    r258498 r258748  
    264264
    265265ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(WK_PLATFORM_NAME));
     266ENABLE_MEDIA_SOURCE_iphoneos = ENABLE_MEDIA_SOURCE;
    266267ENABLE_MEDIA_SOURCE_macosx = ENABLE_MEDIA_SOURCE;
    267268
Note: See TracChangeset for help on using the changeset viewer.