Changeset 247355 in webkit

Timestamp:

Jul 11, 2019 10:17:58 AM (5 years ago)

Author:

Jonathan Bedard

Message:

[iOS 13] Enable WebKit build
​https://bugs.webkit.org/show_bug.cgi?id=199481
<rdar://problem/52619048>

Reviewed by Tim Horton.

Source/WebCore:

No new tests, iOS 13 test expectations will be migrated in the near future.

• platform/ios/LocalCurrentTraitCollection.mm:

(WebCore::LocalCurrentTraitCollection::LocalCurrentTraitCollection): Remove underscore from currentTraitCollection.
(WebCore::LocalCurrentTraitCollection::~LocalCurrentTraitCollection): Remove underscore from setCurrentTraitCollection.

Source/WebCore/PAL:

• pal/spi/cocoa/NSProgressSPI.h: We need the NSProgress SPI in public builds because NSProgress API

is marked unavailable on iOS, watchOS and tvOS.

• pal/spi/ios/CoreUISPI.h: Add CUIStyleEffectConfiguration.appearanceName SPI.
• pal/spi/ios/DataDetectorsUISPI.h: Add UIContextMenuConfiguration.contextMenuConfigurationForURL SPI.
• pal/spi/ios/SystemPreviewSPI.h: Add ARQuickLookWebKitItem.initWithPreviewItemProvider SPI.
• pal/spi/ios/UIKitSPI.h: Add systemBrownColor, UIColor.tableCellDefaultSelectionTintColor should be marked nullable.
• pal/spi/mac/AVFoundationSPI.h: Add AVOutputDevice.name SPI.

Source/WebKit:

• Platform/spi/ios/UIKitSPI.h: Add UITextEffectsWindow.sharedTextEffectsWindowForWindowScene SPI.
• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView showGlobalMenuControllerInRect:]): setTargetRect, setMenuVisible marked depreciated in iOS 13.
(-[WKContentView hideGlobalMenuController]): Ditto.

Tools:

• TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig: Add iOS framework stubs.

WebKitLibraries:

Added iOS 13 framework stubs, used tbd version 3 in all new stubs.

• WebKitPrivateFrameworkStubs/iOS/13: Added.
• WebKitPrivateFrameworkStubs/iOS/13/AppSupport.framework: Added.
• WebKitPrivateFrameworkStubs/iOS/13/AssertionServices.framework: Added.
• WebKitPrivateFrameworkStubs/iOS/13/AuthKit.framework: Added.
• WebKitPrivateFrameworkStubs/iOS/13/CorePDF.framework: Added.
• WebKitPrivateFrameworkStubs/iOS/13/CorePrediction.framework: Added.
• WebKitPrivateFrameworkStubs/iOS/13/GraphicsServices.framework: Added.
• WebKitPrivateFrameworkStubs/iOS/13/SafariSafeBrowsing.framework: Added.
• WebKitPrivateFrameworkStubs/iOS/13/URLFormatting.framework: Added.

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/PAL/ChangeLog (modified) (1 diff)
• Source/WebCore/PAL/pal/spi/cocoa/NSProgressSPI.h (modified) (2 diffs)
• Source/WebCore/PAL/pal/spi/ios/CoreUISPI.h (modified) (1 diff)
• Source/WebCore/PAL/pal/spi/ios/DataDetectorsUISPI.h (modified) (1 diff)
• Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h (modified) (1 diff)
• Source/WebCore/PAL/pal/spi/ios/UIKitSPI.h (modified) (3 diffs)
• Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h (modified) (2 diffs)
• Source/WebCore/platform/ios/LocalCurrentTraitCollection.mm (modified) (4 diffs)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/Platform/spi/ios/UIKitSPI.h (modified) (1 diff)
• Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig (modified) (1 diff)
• WebKitLibraries/ChangeLog (modified) (1 diff)
• WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/13 (added)
• WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/13/AppSupport.framework (added)
• WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/13/AppSupport.framework/AppSupport.tbd (added)
• WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/13/AssertionServices.framework (added)
• WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/13/AssertionServices.framework/AssertionServices.tbd (added)
• WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/13/AuthKit.framework (added)
• WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/13/AuthKit.framework/AuthKit.tbd (added)
• WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/13/CorePDF.framework (added)
• WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/13/CorePDF.framework/CorePDF.tbd (added)
• WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/13/CorePrediction.framework (added)
• WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/13/CorePrediction.framework/CorePrediction.tbd (added)
• WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/13/GraphicsServices.framework (added)
• WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/13/GraphicsServices.framework/GraphicsServices.tbd (added)
• WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/13/SafariSafeBrowsing.framework (added)
• WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/13/SafariSafeBrowsing.framework/SafariSafeBrowsing.tbd (added)
• WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/13/URLFormatting.framework (added)
• WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/13/URLFormatting.framework/URLFormatting.tbd (added)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-11  Jonathan Bedard  <jbedard@apple.com>
+
+        [iOS 13] Enable WebKit build
+        https://bugs.webkit.org/show_bug.cgi?id=199481
+        <rdar://problem/52619048>
+
+        Reviewed by Tim Horton.
+
+        No new tests, iOS 13 test expectations will be migrated in the near future.
+
+        * platform/ios/LocalCurrentTraitCollection.mm:
+        (WebCore::LocalCurrentTraitCollection::LocalCurrentTraitCollection): Remove underscore from currentTraitCollection.
+        (WebCore::LocalCurrentTraitCollection::~LocalCurrentTraitCollection): Remove underscore from setCurrentTraitCollection.
+
 2019-07-11  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2019-07-11  Jonathan Bedard  <jbedard@apple.com>
+
+        [iOS 13] Enable WebKit build
+        https://bugs.webkit.org/show_bug.cgi?id=199481
+        <rdar://problem/52619048>
+
+        Reviewed by Tim Horton.
+
+        * pal/spi/cocoa/NSProgressSPI.h: We need the NSProgress SPI in public builds because NSProgress API
+        is marked unavailable on iOS, watchOS and tvOS.
+        * pal/spi/ios/CoreUISPI.h: Add CUIStyleEffectConfiguration.appearanceName SPI.
+        * pal/spi/ios/DataDetectorsUISPI.h: Add UIContextMenuConfiguration.contextMenuConfigurationForURL SPI.
+        * pal/spi/ios/SystemPreviewSPI.h: Add ARQuickLookWebKitItem.initWithPreviewItemProvider SPI.
+        * pal/spi/ios/UIKitSPI.h: Add systemBrownColor, UIColor.tableCellDefaultSelectionTintColor should be marked nullable.
+        * pal/spi/mac/AVFoundationSPI.h: Add AVOutputDevice.name SPI.
+
 2019-07-10  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/PAL/pal/spi/cocoa/NSProgressSPI.h

@@ -26 +26 @@
 #pragma once
 
-#define USE_NSPROGRESS_PUBLISHING_SPI ((PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130000) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED < 60000) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED < 130000))
-
-#if USE(NSPROGRESS_PUBLISHING_SPI)
-
 #if USE(APPLE_INTERNAL_SDK)
 
+#define USE_NSPROGRESS_PUBLISHING_SPI ((PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130000) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED < 60000) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED < 130000))
 #import <Foundation/NSProgress_Private.h>
 
 #else
+
+#define USE_NSPROGRESS_PUBLISHING_SPI PLATFORM(IOS_FAMILY) || PLATFORM(WATCHOS) || PLATFORM(APPLETV)
+
+#if USE_NSPROGRESS_PUBLISHING_SPI
 
 @interface NSProgress ()
@@ -45 +46 @@
 @end
 
+#endif // USE_NSPROGRESS_PUBLISHING_SPI
+
 #endif // not USE(APPLE_INTERNAL_SDK)
-
-#endif // USE(NSPROGRESS_PUBLISHING_SPI)

trunk/Source/WebCore/PAL/pal/spi/ios/CoreUISPI.h

@@ -40 +40 @@
 @interface CUIStyleEffectConfiguration ()
 @property (nonatomic) BOOL useSimplifiedEffect;
+@property (nonatomic, copy) NSString *appearanceName;
 @end
 

trunk/Source/WebCore/PAL/pal/spi/ios/DataDetectorsUISPI.h

@@ -54 +54 @@
 @interface DDContextMenuAction
 + (UIContextMenuConfiguration *)contextMenuConfigurationWithURL:(NSURL *)URL inView:(UIView *)view context:(NSDictionary *)context menuIdentifier:(NSString *)menuIdentifier;
++ (UIContextMenuConfiguration *)contextMenuConfigurationForURL:(NSURL *)URL identifier:(NSString *)identifier selectedText:(NSString *)selectedText results:(NSArray *) results inView: (UIView *) view context:(NSDictionary *)context menuIdentifier:(NSString *)menuIdentifier;
 @end
 #endif

trunk/Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h

@@ -56 +56 @@
 
 @interface ARQuickLookWebKitItem : QLItem
-- (instancetype)initWithPreviewItemProvider:(NSItemProvider *_Nonnull)itemProvider contentType:(NSString *_Nonnull)contentType previewTitle:(NSString *_Nonnull)previewTitle fileSize:(NSNumber *_Nonnull)fileSize previewItem:(ARQuickLookPreviewItem *)previewItem;
+- (instancetype)initWithPreviewItemProvider:(NSItemProvider *)itemProvider contentType:(NSString *)contentType previewTitle:(NSString *)previewTitle fileSize:(NSNumber *)fileSize previewItem:(ARQuickLookPreviewItem *)previewItem;
 @end
+
 #endif
 
 #endif
-

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

@@ -67 +67 @@
 #endif
 
-NS_ASSUME_NONNULL_BEGIN
-
 typedef NS_ENUM(NSInteger, UIApplicationSceneClassicMode) {
     UIApplicationSceneClassicModeOriginalPad = 4,
@@ -110 +108 @@
 
 + (UIColor *)systemBlueColor;
++ (UIColor *)systemBrownColor;
 + (UIColor *)systemGrayColor;
 + (UIColor *)systemGreenColor;
@@ -141 +140 @@
 @end
 
-NS_ASSUME_NONNULL_END
-
 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
 @interface NSURL ()
-@property (nonatomic, copy, nullable, setter=_setTitle:) NSString *_title;
+@property (nonatomic, copy, setter=_setTitle:) NSString *_title;
 @end
 #endif

trunk/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h

@@ -70 +70 @@
 @class AVOutputContext;
 @class AVOutputDevice;
+
 @interface AVOutputContext : NSObject <NSSecureCoding>
 @property (nonatomic, readonly) NSString *deviceName;
@@ -76 +77 @@
 @property (readonly) BOOL supportsMultipleOutputDevices;
 @property (readonly) NSArray<AVOutputDevice *> *outputDevices;
+@end
+
+@interface AVOutputDevice : NSObject
+@property (nonatomic, readonly) NSString *name;
 @end
 

trunk/Source/WebCore/platform/ios/LocalCurrentTraitCollection.mm

@@ -35 +35 @@
 {
 #if HAVE(OS_DARK_MODE_SUPPORT)
-    m_savedTraitCollection = [PAL::getUITraitCollectionClass() _currentTraitCollection];
+    m_savedTraitCollection = [PAL::getUITraitCollectionClass() currentTraitCollection];
     m_usingDarkAppearance = useDarkAppearance;
     m_usingElevatedUserInterfaceLevel = useElevatedUserInterfaceLevel;
@@ -43 +43 @@
     auto newTraitCollection = [PAL::getUITraitCollectionClass() traitCollectionWithTraitsFromCollections:@[ m_savedTraitCollection.get(), userInterfaceStyleTrait, backgroundLevelTrait ]];
 
-    [PAL::getUITraitCollectionClass() _setCurrentTraitCollection:newTraitCollection];
+    [PAL::getUITraitCollectionClass() setCurrentTraitCollection:newTraitCollection];
 #else
     UNUSED_PARAM(useDarkAppearance);
@@ -53 +53 @@
 {
 #if HAVE(OS_DARK_MODE_SUPPORT)
-    m_savedTraitCollection = [PAL::getUITraitCollectionClass() _currentTraitCollection];
+    m_savedTraitCollection = [PAL::getUITraitCollectionClass() currentTraitCollection];
     m_usingDarkAppearance = traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark;
     m_usingElevatedUserInterfaceLevel = traitCollection.userInterfaceLevel == UIUserInterfaceLevelElevated;
 
-    [PAL::getUITraitCollectionClass() _setCurrentTraitCollection:traitCollection];
+    [PAL::getUITraitCollectionClass() setCurrentTraitCollection:traitCollection];
 #else
     UNUSED_PARAM(traitCollection);
@@ -66 +66 @@
 {
 #if HAVE(OS_DARK_MODE_SUPPORT)
-    [PAL::getUITraitCollectionClass() _setCurrentTraitCollection:m_savedTraitCollection.get()];
+    [PAL::getUITraitCollectionClass() setCurrentTraitCollection:m_savedTraitCollection.get()];
 #endif
 }

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-07-11  Jonathan Bedard  <jbedard@apple.com>
+
+        [iOS 13] Enable WebKit build
+        https://bugs.webkit.org/show_bug.cgi?id=199481
+        <rdar://problem/52619048>
+
+        Reviewed by Tim Horton.
+
+        * Platform/spi/ios/UIKitSPI.h: Add UITextEffectsWindow.sharedTextEffectsWindowForWindowScene SPI.
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView showGlobalMenuControllerInRect:]): setTargetRect, setMenuVisible marked depreciated in iOS 13.
+        (-[WKContentView hideGlobalMenuController]): Ditto.
+
 2019-07-11  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h

@@ -1004 +1004 @@
 @interface UITextEffectsWindow : UIAutoRotatingWindow
 + (UITextEffectsWindow *)sharedTextEffectsWindow;
+#if HAVE(UISCENE)
++ (UITextEffectsWindow *)sharedTextEffectsWindowForWindowScene:(UIWindowScene *)windowScene;
+#endif // HAVE(UISCENE)
 @end
 

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -5421 +5421 @@
     [controller showMenuFromView:self rect:rect];
 #else
+    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     [controller setTargetRect:rect inView:self];
     [controller setMenuVisible:YES animated:YES];
+    ALLOW_DEPRECATED_DECLARATIONS_END
 #endif
 }
@@ -5432 +5434 @@
     [controller hideMenuFromView:self];
 #else
+    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     [controller setMenuVisible:NO animated:YES];
+    ALLOW_DEPRECATED_DECLARATIONS_END
 #endif
 }

trunk/Tools/ChangeLog

@@ +1 @@
+2019-07-11  Jonathan Bedard  <jbedard@apple.com>
+
+        [iOS 13] Enable WebKit build
+        https://bugs.webkit.org/show_bug.cgi?id=199481
+        <rdar://problem/52619048>
+
+        Reviewed by Tim Horton.
+
+        * TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig: Add iOS framework stubs.
+
 2019-07-11  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig

@@ -29 +29 @@
 WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
 WK_PRIVATE_FRAMEWORKS_DIR_[sdk=mac*] = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/Mac/$(MAC_OS_X_VERSION_MAJOR);
-FRAMEWORK_SEARCH_PATHS[sdk=mac*] = $(inherited) $(WK_PRIVATE_FRAMEWORK_STUBS_DIR) $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
+
+WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORKS_DIR_iphone_$(USE_INTERNAL_SDK));
+WK_PRIVATE_FRAMEWORKS_DIR_iphone_ = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
+
+FRAMEWORK_SEARCH_PATHS[sdk=mac*] = $(inherited) $(WK_PRIVATE_FRAMEWORKS_DIR) $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
+FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(inherited) $(WK_PRIVATE_FRAMEWORKS_DIR);
 
 UNEXPORTED_SYMBOL_LDFLAGS = -Wl,-unexported_symbol -Wl,__ZN7testing4Test16TearDownTestCaseEv -Wl,-unexported_symbol -Wl,__ZN7testing4Test13SetUpTestCaseEv

trunk/WebKitLibraries/ChangeLog

@@ +1 @@
+2019-07-11  Jonathan Bedard  <jbedard@apple.com>
+
+        [iOS 13] Enable WebKit build
+        https://bugs.webkit.org/show_bug.cgi?id=199481
+        <rdar://problem/52619048>
+
+        Reviewed by Tim Horton.
+
+        Added iOS 13 framework stubs, used tbd version 3 in all new stubs.
+
+        * WebKitPrivateFrameworkStubs/iOS/13: Added.
+        * WebKitPrivateFrameworkStubs/iOS/13/AppSupport.framework: Added.
+        * WebKitPrivateFrameworkStubs/iOS/13/AssertionServices.framework: Added.
+        * WebKitPrivateFrameworkStubs/iOS/13/AuthKit.framework: Added.
+        * WebKitPrivateFrameworkStubs/iOS/13/CorePDF.framework: Added.
+        * WebKitPrivateFrameworkStubs/iOS/13/CorePrediction.framework: Added.
+        * WebKitPrivateFrameworkStubs/iOS/13/GraphicsServices.framework: Added.
+        * WebKitPrivateFrameworkStubs/iOS/13/SafariSafeBrowsing.framework: Added.
+        * WebKitPrivateFrameworkStubs/iOS/13/URLFormatting.framework: Added.
+
 2019-07-03  Jonathan Bedard  <jbedard@apple.com>