Changeset 258765 in webkit


Ignore:
Timestamp:
Mar 20, 2020 9:30:15 AM (4 years ago)
Author:
Jacob Uphoff
Message:

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

Location:
trunk
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r258748 r258765  
     12020-03-20  Jacob Uphoff  <jacob_uphoff@apple.com>
     2
     3        Unreviewed, reverting r258748.
     4
     5        This commit broke the Catalina build
     6
     7        Reverted changeset:
     8
     9        "Upstream a variety of Cocoa-platform HAVE and ENABLE macros"
     10        https://bugs.webkit.org/show_bug.cgi?id=209307
     11        https://trac.webkit.org/changeset/258748
     12
    1132020-03-19  Tim Horton  <timothy_horton@apple.com>
    214

  • trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig

    r258748 r258765  
    264264
    265265ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(WK_PLATFORM_NAME));
    266 ENABLE_MEDIA_SOURCE_iphoneos = ENABLE_MEDIA_SOURCE;
    267266ENABLE_MEDIA_SOURCE_macosx = ENABLE_MEDIA_SOURCE;
    268267

  • trunk/Source/WTF/ChangeLog

    r258748 r258765  
     12020-03-20  Jacob Uphoff  <jacob_uphoff@apple.com>
     2
     3        Unreviewed, reverting r258748.
     4
     5        This commit broke the Catalina build
     6
     7        Reverted changeset:
     8
     9        "Upstream a variety of Cocoa-platform HAVE and ENABLE macros"
     10        https://bugs.webkit.org/show_bug.cgi?id=209307
     11        https://trac.webkit.org/changeset/258748
     12
    1132020-03-19  Tim Horton  <timothy_horton@apple.com>
    214

  • trunk/Source/WTF/wtf/PlatformEnableCocoa.h

    r258748 r258765  
    152152#endif
    153153
    154 #if !defined(ENABLE_MEDIA_SOURCE) && PLATFORM(MAC) || (PLATFORM(IOS) && !PLATFORM(IOS_FAMILY_SIMULATOR))
     154#if !defined(ENABLE_MEDIA_SOURCE) && PLATFORM(MAC)
    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

    r258748 r258765  
    257257#endif
    258258
    259 #if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500)
     259#if PLATFORM(IOS)
    260260#define HAVE_APP_LINKS 1
    261261#endif
    … …  
    624624#endif
    625625
    626 #if PLATFORM(IOS)
     626#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
    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

    r258761 r258765  
     12020-03-20  Jacob Uphoff  <jacob_uphoff@apple.com>
     2
     3        Unreviewed, reverting r258748.
     4
     5        This commit broke the Catalina build
     6
     7        Reverted changeset:
     8
     9        "Upstream a variety of Cocoa-platform HAVE and ENABLE macros"
     10        https://bugs.webkit.org/show_bug.cgi?id=209307
     11        https://trac.webkit.org/changeset/258748
     12
    1132020-03-20  Zalan Bujtas  <zalan@apple.com>
    214

  • trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig

    r258748 r258765  
    264264
    265265ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(WK_PLATFORM_NAME));
    266 ENABLE_MEDIA_SOURCE_iphoneos = ENABLE_MEDIA_SOURCE;
    267266ENABLE_MEDIA_SOURCE_macosx = ENABLE_MEDIA_SOURCE;
    268267

  • trunk/Source/WebCore/PAL/ChangeLog

    r258762 r258765  
     12020-03-20  Jacob Uphoff  <jacob_uphoff@apple.com>
     2
     3        Unreviewed, reverting r258748.
     4
     5        This commit broke the Catalina build
     6
     7        Reverted changeset:
     8
     9        "Upstream a variety of Cocoa-platform HAVE and ENABLE macros"
     10        https://bugs.webkit.org/show_bug.cgi?id=209307
     11        https://trac.webkit.org/changeset/258748
     12
    1132020-03-20  Timothy Horton  <timothy_horton@apple.com>
    214

  • trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig

    r258748 r258765  
    264264
    265265ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(WK_PLATFORM_NAME));
    266 ENABLE_MEDIA_SOURCE_iphoneos = ENABLE_MEDIA_SOURCE;
    267266ENABLE_MEDIA_SOURCE_macosx = ENABLE_MEDIA_SOURCE;
    268267

  • trunk/Source/WebCore/PAL/pal/spi/cocoa/AVFoundationSPI.h

    r258748 r258765  
    125125#endif // PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)
    126126
    127 #if ENABLE(MEDIA_SOURCE)
     127#if !PLATFORM(IOS_FAMILY)
    128128
    129129#pragma mark -
    … …  
    164164#endif
    165165
    166 #endif // ENABLE(MEDIA_SOURCE)
     166#endif // !PLATFORM(IOS_FAMILY)
    167167
    168168#endif // USE(APPLE_INTERNAL_SDK)
    … …  
    183183#endif // HAVE(AVCONTENTKEYSESSION)
    184184
    185 #if ENABLE(MEDIA_SOURCE) && !USE(APPLE_INTERNAL_SDK)
     185#if PLATFORM(MAC) && !USE(APPLE_INTERNAL_SDK)
    186186NS_ASSUME_NONNULL_BEGIN
    187187@interface AVStreamDataParser (AVStreamDataParserPrivate)

  • trunk/Source/WebCore/PAL/pal/spi/cocoa/RevealSPI.h

    r258762 r258765  
    4848@interface RVItem : NSObject <NSSecureCoding>
    4949- (instancetype)initWithText:(NSString *)text selectedRange:(NSRange)selectedRange NS_DESIGNATED_INITIALIZER;
    50 @property (readonly, nonatomic) NSRange highlightRange;
    5150@end
    5251
    … …  
    6059@property (readonly, nonnull) NSArray <NSValue *> * itemRectsInView;
    6160@end
     61#endif
    6262
    6363@protocol RVPresenterHighlightDelegate <NSObject>
    … …  
    6868- (void)revealContext:(RVPresentingContext *)context drawRectsForItem:(RVItem *)item;
    6969@end
    70 #endif
    7170
    7271@interface RVDocumentContext : NSObject < NSSecureCoding >
    … …  
    7675#if PLATFORM(MAC)
    7776- (id<NSImmediateActionAnimationController>)animationControllerForItem:(RVItem *)item documentContext:(RVDocumentContext *)documentContext presentingContext:(RVPresentingContext *)presentingContext options:(NSDictionary *)options;
     77#endif // PLATFORM(MAC)
    7878- (BOOL)revealItem:(RVItem *)item documentContext:(RVDocumentContext *)documentContext presentingContext:(RVPresentingContext *)presentingContext options:(NSDictionary *)options;
    79 #endif // PLATFORM(MAC)
    8079@end
    8180

  • trunk/Source/WebCore/PAL/pal/spi/ios/UIKitSPI.h

    r258748 r258765  
    3939#import <UIKit/UIApplication_Private.h>
    4040#import <UIKit/UIColor_Private.h>
    41 #import <UIKit/UIFocusRingStyle.h>
    4241#import <UIKit/UIFont_Private.h>
    4342#import <UIKit/UIInterface_Private.h>
    … …  
    5756@end
    5857
     58#if __has_include(<UIKit/UIFocusRingStyle.h>)
     59#import <UIKit/UIFocusRingStyle.h>
     60#endif
    5961
    6062#else // USE(APPLE_INTERNAL_SDK)
    … …  
    147149@end
    148150
    149 #if ENABLE(FULL_KEYBOARD_ACCESS)
    150 @interface UIFocusRingStyle : NSObject
    151 + (CGFloat)cornerRadius;
    152 + (CGFloat)maxAlpha;
    153 + (CGFloat)alphaThreshold;
    154 @end
    155 #endif
    156 
    157151#endif // USE(APPLE_INTERNAL_SDK)
    158152
    … …  
    160154@interface UIColor (IPI)
    161155+ (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

    r258748 r258765  
    8787}
    8888
    89 #if ENABLE(MEDIA_SOURCE)
    90 bool SettingsBase::platformDefaultMediaSourceEnabled()
    91 {
    92     return false;
    93 }
    94 #endif
    95 
    9689#endif
    9790

  • trunk/Source/WebKit/ChangeLog

    r258752 r258765  
     12020-03-20  Jacob Uphoff  <jacob_uphoff@apple.com>
     2
     3        Unreviewed, reverting r258748.
     4
     5        This commit broke the Catalina build
     6
     7        Reverted changeset:
     8
     9        "Upstream a variety of Cocoa-platform HAVE and ENABLE macros"
     10        https://bugs.webkit.org/show_bug.cgi?id=209307
     11        https://trac.webkit.org/changeset/258748
     12
    1132020-03-19  David Kilzer  <ddkilzer@apple.com>
    214

  • trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig

    r258748 r258765  
    264264
    265265ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(WK_PLATFORM_NAME));
    266 ENABLE_MEDIA_SOURCE_iphoneos = ENABLE_MEDIA_SOURCE;
    267266ENABLE_MEDIA_SOURCE_macosx = ENABLE_MEDIA_SOURCE;
    268267

  • trunk/Source/WebKit/Platform/spi/ios/PDFKitSPI.h

    r258748 r258765  
    5555- (void) updatePDFViewLayout;
    5656
    57 + (UIColor *)backgroundColor;
    58 
    5957- (void) beginPDFViewRotation;
    6058- (void) endPDFViewRotation;

  • trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm

    r258748 r258765  
    4444static RetainPtr<UIView> createRemoteView(pid_t pid, uint32_t contextID)
    4545{
    46 #if HAVE(UI_REMOTE_VIEW)
     46#if USE(UIREMOTEVIEW_CONTEXT_HOSTING)
    4747    // FIXME: Remove this respondsToSelector check when possible.
    4848    static BOOL canUseUIRemoteView;

  • trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.mm

    r258748 r258765  
    272272@end
    273273
    274 #if HAVE(UI_REMOTE_VIEW)
     274#if USE(UIREMOTEVIEW_CONTEXT_HOSTING)
    275275@implementation WKUIRemoteView
    276276

  • trunk/Source/WebKit/UIProcess/ios/WKPDFView.mm

    r258748 r258765  
    121121        return nil;
    122122
    123 #if HAVE(PDF_HOST_VIEW_CONTROLLER_WITH_BACKGROUND_COLOR)
     123#if USE(PDFKIT_BACKGROUND_COLOR)
    124124    UIColor *backgroundColor = PDFHostViewController.backgroundColor;
    125125#else

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r258748 r258765  
     12020-03-20  Jacob Uphoff  <jacob_uphoff@apple.com>
     2
     3        Unreviewed, reverting r258748.
     4
     5        This commit broke the Catalina build
     6
     7        Reverted changeset:
     8
     9        "Upstream a variety of Cocoa-platform HAVE and ENABLE macros"
     10        https://bugs.webkit.org/show_bug.cgi?id=209307
     11        https://trac.webkit.org/changeset/258748
     12
    1132020-03-19  Tim Horton  <timothy_horton@apple.com>
    214

  • trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig

    r258748 r258765  
    264264
    265265ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(WK_PLATFORM_NAME));
    266 ENABLE_MEDIA_SOURCE_iphoneos = ENABLE_MEDIA_SOURCE;
    267266ENABLE_MEDIA_SOURCE_macosx = ENABLE_MEDIA_SOURCE;
    268267

  • trunk/Tools/ChangeLog

    r258760 r258765  
     12020-03-20  Jacob Uphoff  <jacob_uphoff@apple.com>
     2
     3        Unreviewed, reverting r258748.
     4
     5        This commit broke the Catalina build
     6
     7        Reverted changeset:
     8
     9        "Upstream a variety of Cocoa-platform HAVE and ENABLE macros"
     10        https://bugs.webkit.org/show_bug.cgi?id=209307
     11        https://trac.webkit.org/changeset/258748
     12
    1132020-03-20  Aakash Jain  <aakash_jain@apple.com>
    214

  • trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig

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