Diff
Modified: trunk/Source/WebKit/ChangeLog (262853 => 262854)
--- trunk/Source/WebKit/ChangeLog 2020-06-10 20:31:13 UTC (rev 262853)
+++ trunk/Source/WebKit/ChangeLog 2020-06-10 20:34:18 UTC (rev 262854)
@@ -1,3 +1,30 @@
+2020-06-10 Jonathan Bedard <jbed...@apple.com>
+
+ WebKit:Add PepperUICoreSPI.h
+ https://bugs.webkit.org/show_bug.cgi?id=212996
+ <rdar://problem/64182627>
+
+ Reviewed by Tim Horton.
+
+ No new tests, behavior unchanged.
+
+ * Platform/spi/watchos: Added.
+ * Platform/spi/watchos/PepperUICoreSPI.h: Added.
+ * UIProcess/Cocoa/WKSafeBrowsingWarning.mm: Include PepperUICoreSPI header.
+ * UIProcess/ios/WKScrollView.mm: Ditto.
+ * UIProcess/ios/forms/WKDatePickerViewController.mm: Remove headers duplicated in PepperUICoreSPI.h.
+ * UIProcess/ios/forms/WKFocusedFormControlView.mm: Ditto.
+ * UIProcess/ios/forms/WKNumberPadView.mm: Include PepperUICoreSPI header.
+ * UIProcess/ios/forms/WKNumberPadViewController.h: Remove headers duplicated in PepperUICoreSPI.h.
+ * UIProcess/ios/forms/WKNumberPadViewController.mm: Ditto.
+ (-[WKNumberPadViewController addContentViewAnimations:]): Limit addAnimation to Internal builds.
+ * UIProcess/ios/forms/WKQuickboardListViewController.h: Include PepperUICoreSPI header.
+ * UIProcess/ios/forms/WKQuickboardListViewController.mm: Remove headers duplicated in PepperUICoreSPI.h.
+ (-[WKQuickboardListViewController initWithDelegate:]):
+ * UIProcess/ios/forms/WKSelectMenuListViewController.mm: Remove headers duplicated in PepperUICoreSPI.h.
+ * UIProcess/ios/forms/WKTextInputListViewController.mm: Ditto.
+ * WebKit.xcodeproj/project.pbxproj: Add PepperUICoreSPI.h.
+
2020-06-10 Per Arne Vollan <pvol...@apple.com>
[iOS] Add entitlement for PAC exceptions
Added: trunk/Source/WebKit/Platform/spi/watchos/PepperUICoreSPI.h (0 => 262854)
--- trunk/Source/WebKit/Platform/spi/watchos/PepperUICoreSPI.h (rev 0)
+++ trunk/Source/WebKit/Platform/spi/watchos/PepperUICoreSPI.h 2020-06-10 20:34:18 UTC (rev 262854)
@@ -0,0 +1,304 @@
+/*
+ * Copyright (C) 2020 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if PLATFORM(WATCHOS)
+
+#import "UIKitSPI.h"
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#import <PepperUICore/PUICActionController.h>
+#import <PepperUICore/PUICActionController_Private.h>
+#import <PepperUICore/PUICActionGroup.h>
+#import <PepperUICore/PUICApplication_Private.h>
+#import <PepperUICore/PUICCrownInputSequencer.h>
+#import <PepperUICore/PUICCrownInputSequencer_Private.h>
+#import <PepperUICore/PUICQuickboardArouetViewController.h>
+#import <PepperUICore/PUICQuickboardLanguageController.h>
+#import <PepperUICore/PUICQuickboardListViewController.h>
+#import <PepperUICore/PUICQuickboardListViewControllerSubclass.h>
+#import <PepperUICore/PUICQuickboardListViewSpecs.h>
+#import <PepperUICore/PUICQuickboardViewController.h>
+#import <PepperUICore/PUICQuickboardViewController_Private.h>
+#import <PepperUICore/PUICResources.h>
+#import <PepperUICore/PUICStatusBarAppContextView.h>
+#import <PepperUICore/PUICTableView.h>
+#import <PepperUICore/PUICTableViewCell.h>
+#import <PepperUICore/UIDevice+PUICAdditions.h>
+#import <PepperUICore/UIScrollView+PUICAdditionsPrivate.h>
+
+#if HAVE(QUICKBOARD_COLLECTION_VIEWS)
+#import <PepperUICore/PUICQuickboardListCollectionViewItemCell.h>
+#endif
+
+#else // USE(APPLE_INTERNAL_SDK)
+
+NS_ASSUME_NONNULL_BEGIN
+
+extern NSString * const PUICStatusBarNavigationBackButtonPressedNotification;
+extern NSString * const PUICStatusBarTitleTappedNotification;
+
+typedef NS_ENUM(NSInteger, PUICCrownInputScrollDirection) {
+ PUICCrownInputScrollDirectionNone,
+ PUICCrownInputScrollDirectionHorizontal,
+ PUICCrownInputScrollDirectionVertical,
+};
+
+typedef NS_ENUM(NSInteger, PUICDeviceVariant) {
+ PUICDeviceVariantCompact = 0,
+ PUICDeviceVariantRegular = 1,
+ PUICDeviceVariant394h = 2,
+ PUICDeviceVariant448h = 3,
+};
+
+@interface UIDevice (PUICAdditions)
+- (PUICDeviceVariant)puic_deviceVariant;
+@end
+
+typedef NS_ENUM(NSInteger, PUICDictationMode) {
+ PUICDictationModeText,
+ PUICDictationModeTextAndAudio,
+ PUICDictationModeAudio,
+ PUICDictationModePerson,
+ PUICDictationModeLocation
+};
+
+@protocol PUICApplicationStatusBarProperties <NSObject>
+@property (nonatomic, copy) NSString *title;
+@property (nonatomic, strong) UIColor *titleColor;
+@property (nonatomic, assign, getter=isTitleInteractive) bool titleInteractive;
+@property (nonatomic, assign) bool showNavigationUI;
+@property (nonatomic, assign) bool navUIBackButtonDisabled;
+- (BOOL) commitChangesAnimated:(BOOL) animated;
+@end
+
+@protocol PUICStatusBarAppContextViewDataSource <NSObject>
+@end
+
+@interface PUICApplicationStatusBarItem : NSObject <PUICApplicationStatusBarProperties, PUICStatusBarAppContextViewDataSource, NSSecureCoding, NSCopying>
+@end
+
+@interface UIViewController (PUICApplicationStatusBarAdditions)
+@property (nonatomic, readonly, getter=puic_applicationStatusBarItem) PUICApplicationStatusBarItem *applicationStatusBarItem;
+@end
+
+@interface PUICResources : NSObject
++ (UIImage *)imageNamed:(NSString *)imageName inBundle:(NSBundle *)bundle shouldCache:(BOOL)shouldCache;
+@end
+
+@interface PUICStatusBarGlobalContextViewAssertion : NSObject
+@end
+
+@interface PUICStatusBar : UIStatusBar
+@end
+
+@interface PUICApplication : UIApplication
++ (instancetype)sharedPUICApplication;
+- (PUICStatusBarGlobalContextViewAssertion *)_takeStatusBarGlobalContextAssertionAnimated:(BOOL)animated;
+- (PUICStatusBar *)_puicStatusBar;
+@end
+
+typedef void (^PUICQuickboardCompletionBlock)(NSAttributedString * _Nullable);
+
+@interface PUICQuickboardSpecs : NSObject
+@end
+@interface PUICQuickboardListViewSpecs : PUICQuickboardSpecs
+@property (assign, nonatomic) CGFloat defaultButtonHeight;
+@end
+
+@interface PUICButton : UIButton
+@end
+
+@interface PUICQuickboardListTrayButton : PUICButton
+- (instancetype)initWithFrame:(CGRect)frame tintColor:(nullable UIColor *)tintColor defaultHeight:(CGFloat)defaultHeight;
+@end
+
+@interface PUICTableViewCell : UITableViewCell
+@property (nonatomic, getter=isRadioSectionCell) BOOL radioSectionCell;
+- (void)configureForText:(NSString *)text width:(CGFloat)width;
+@end
+
+@interface PUICQuickboardListItemCell : PUICTableViewCell
+@property (nonatomic, readonly) UILabel *itemLabel;
+@end
+
+@interface PUICTableView : UITableView
+@end
+
+@interface PUICTextInputContext : NSObject <UITextInputTraits, NSSecureCoding>
+
+@property (nonatomic, strong) NSString *requestingApplicationBundleID;
+@property (nonatomic, strong) NSString *initialText;
+@property (nonatomic, strong, nullable) UIColor *tintColor;
+@property (nonatomic, strong) UITextContentType secondaryTextContentType;
+@property (nonatomic, assign) NSInteger minimumLength;
+@property (nonatomic, assign) UIReturnKeyType returnKeyType;
+@property (nonatomic, strong) NSAttributedString *attributedHeaderText;
+
+@end
+
+@class PUICQuickboardController;
+@protocol PUICQuickboardControllerDelegate <NSObject>
+- (void)quickboardController:(PUICQuickboardController *)quickboardController textInputValueDidChange:(NSAttributedString *)attributedText;
+@end
+
+@interface PUICQuickboardController : NSObject
+@property (nonatomic, weak) id<PUICQuickboardControllerDelegate> delegate;
+@property (nonatomic, strong) PUICTextInputContext *textInputContext;
+@property (nonatomic, weak) UIViewController *quickboardPresentingViewController;
+@end
+
+@protocol PUICQuickboardController <NSObject>
+@property (nonatomic, readonly) NSString *primaryLanguage;
+@property (nonatomic, readonly) BOOL animatesSelectionToDestinationView;
+- (void)dismissViewControllerAnimated:(BOOL)animated completion:(nullable void(^)(void))completion;
+@end
+
+@protocol PUICQuickboardViewControllerDelegate <NSObject>
+- (void)quickboard:(id<PUICQuickboardController>)quickboard textEntered:(NSAttributedString *)attributedText;
+- (void)quickboard:(id<PUICQuickboardController>)quickboard languageDidChange:(NSString *)languageCode;
+- (void)quickboardInputCancelled:(id<PUICQuickboardController>)quickboard;
+@end
+
+@protocol PUICQuickboardTransition <NSObject>
+@end
+
+@interface PUICQuickboardViewController : UIViewController <PUICQuickboardController>
+@property (nonatomic, weak) id<PUICQuickboardViewControllerDelegate> delegate;
+@property (nonatomic, strong) UIView *contentView;
+@property (nonatomic, readonly) UIButton *cancelButton;
+@property (nonatomic, assign) NSInteger minTextLengthForEnablingAccept;
+@property (nonatomic, assign) BOOL showsAcceptButton;
+- (instancetype)initWithDelegate:(id<PUICQuickboardViewControllerDelegate>)delegate NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithCoder:(NSCoder *)aDecoder NS_DESIGNATED_INITIALIZER;
+@end
+
+@interface PUICQuickboardViewController (Transitions) <PUICQuickboardTransition>
+- (void)addContentViewAnimations:(BOOL)isPresenting;
+@end
+
+@interface PUICQuickboardListViewController : PUICQuickboardViewController
+@property (nonatomic, readonly) PUICTableView *listView;
+@property (strong, nonatomic, readonly) PUICQuickboardListViewSpecs *specs;
+@property (nonatomic, copy) UITextContentType textContentType;
+- (void)reloadListItems;
+- (void)reloadHeaderContentView;
+@end
+
+@interface PUICQuickboardArouetViewController : PUICQuickboardViewController
+@property (nonatomic, copy, nullable) UITextContentType textContentType;
+- (void)setInputText:(nullable NSString *)inputText selectionRange:(NSRange)selectionRange;
+@end
+
+typedef NS_ENUM(NSInteger, PUICPickerViewStyle) {
+ PUICPickerViewStyleList,
+ PUICPickerViewStyleStack,
+ PUICPickerViewStyleSequence,
+};
+
+@protocol PUICPickerViewDelegate <NSObject>
+@end
+@protocol PUICPickerViewDataSource <NSObject>
+@end
+
+@interface PUICPickerView : UIView
+@property (nonatomic) NSInteger selectedIndex;
+@property (nonatomic, weak) id<PUICPickerViewDataSource> dataSource;
+@property (nonatomic, weak) id<PUICPickerViewDelegate> delegate;
+- (instancetype)initWithStyle:(PUICPickerViewStyle)style NS_DESIGNATED_INITIALIZER;
+- (UIView *)dequeueReusableItemView;
+- (void)reloadData;
+@end
+
+@protocol PUICDictationViewControllerDelegate <NSObject>
+@end
+@interface PUICDictationViewController : PUICQuickboardViewController
+- (instancetype)initWithDelegate:(id<PUICQuickboardViewControllerDelegate>)delegate dictationMode:(PUICDictationMode)dictationMode NS_DESIGNATED_INITIALIZER;
+@end
+
+@interface PUICQuickboardViewController (ExposeHeader)
+@property (nonatomic, readonly) UIView *headerView;
+@end
+
+@interface PUICActionItem : NSObject
+@end
+
+typedef NS_ENUM(NSInteger, PUICActionStyle) {
+ PUICActionStyleAutomatic = 0,
+ PUICActionStyleList = 1,
+ PUICActionStyleGrid = 2,
+};
+
+@interface PUICActionGroup : NSObject
+- (instancetype)initWithActionItems:(NSArray *)actionItems actionStyle:(PUICActionStyle)actionStyle;
+@end
+
+@class PUICQuickboardLanguageController;
+@protocol PUICQuickboardLanguageControllerDelegate
+- (void)languageControllerDidChangePrimaryLanguage:(PUICQuickboardLanguageController *)languageController;
+@end
+
+@interface PUICQuickboardLanguageController : NSObject
+@property (nonatomic, readonly) NSString *primaryLanguage;
+- (PUICActionItem *)languageSelectionActionItemForViewController:(UIViewController<PUICQuickboardLanguageControllerDelegate> *)viewController;
+@end
+
+@interface PUICQuickboardViewController (QuickboardLanguageSupport)
+@property (nonatomic, strong) PUICQuickboardLanguageController *languageController;
+- (void)primaryLanguageDidChange:(NSString *)primaryLanguage;
+@end
+
+@protocol PUICCrownInputSequencerDelegate <NSObject>
+@end
+
+@interface PUICCrownInputSequencer : NSObject
+@property (nonatomic, weak) id<PUICCrownInputSequencerDelegate> delegate;
+@property (nonatomic) double start;
+@property (nonatomic) double end;
+@property (nonatomic) BOOL useWideIdleCheck;
+@property (nonatomic) double screenSpaceMultiplier;
+@property (nonatomic) double offset;
+@property (nonatomic, readonly, getter=isIdle) BOOL idle;
+@property (nonatomic, getter=isRubberBandingEnabled) BOOL rubberBandingEnabled;
+
+- (void)setOffset:(double)offset suppressIndicatorVisibilityChanges:(BOOL)suppressIndicatorVisibilityChanges;
+- (void)updateWithCrownInputEvent:(UIEvent *)crownInputEvent;
+- (void)stopVelocityTrackingAndDecelerationImmediately;
+@end
+
+@interface UIScrollView (PUICAdditions) <PUICCrownInputSequencerDelegate>
+- (CGPoint)_puic_contentOffsetForCrownInputSequencerOffset:(double)sequencerOffset;
+@property (nonatomic, getter=puic_crownInputScrollDirection, setter=puic_setCrownInputScrollDirection:) PUICCrownInputScrollDirection crownInputScrollDirection;
+@end
+
+@interface PUICActionController : NSObject
+- (instancetype)initWithActionGroup:(PUICActionGroup *)actionGroup NS_DESIGNATED_INITIALIZER;
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif // USE(APPLE_INTERNAL_SDK)
+
+#endif // PLATFORM(WATCHOS)
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WKSafeBrowsingWarning.mm (262853 => 262854)
--- trunk/Source/WebKit/UIProcess/Cocoa/WKSafeBrowsingWarning.mm 2020-06-10 20:31:13 UTC (rev 262853)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WKSafeBrowsingWarning.mm 2020-06-10 20:34:18 UTC (rev 262854)
@@ -35,8 +35,7 @@
#import <wtf/Language.h>
#if PLATFORM(WATCHOS)
-#import "UIKitSPI.h"
-#import <PepperUICore/UIScrollView+PUICAdditionsPrivate.h>
+#import "PepperUICoreSPI.h"
#endif
constexpr CGFloat exclamationPointSize = 30;
Modified: trunk/Source/WebKit/UIProcess/ios/WKScrollView.mm (262853 => 262854)
--- trunk/Source/WebKit/UIProcess/ios/WKScrollView.mm 2020-06-10 20:31:13 UTC (rev 262853)
+++ trunk/Source/WebKit/UIProcess/ios/WKScrollView.mm 2020-06-10 20:34:18 UTC (rev 262854)
@@ -36,7 +36,7 @@
#import <wtf/WeakObjCPtr.h>
#if PLATFORM(WATCHOS)
-#import <PepperUICore/UIScrollView+PUICAdditionsPrivate.h>
+#import "PepperUICoreSPI.h"
#endif
@interface WKScrollViewDelegateForwarder : NSObject <UIScrollViewDelegate>
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKDatePickerViewController.mm (262853 => 262854)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKDatePickerViewController.mm 2020-06-10 20:31:13 UTC (rev 262853)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKDatePickerViewController.mm 2020-06-10 20:34:18 UTC (rev 262854)
@@ -28,16 +28,6 @@
#if PLATFORM(WATCHOS)
-#import <PepperUICore/PUICApplication_Private.h>
-#import <PepperUICore/PUICPickerView.h>
-#import <PepperUICore/PUICPickerView_Private.h>
-#import <PepperUICore/PUICQuickboardViewController_Private.h>
-#import <PepperUICore/PUICStatusBar_Private.h>
-#import <PepperUICore/UIDevice+PUICAdditions.h>
-#import <UIKit/UIGeometry_Private.h>
-#import <UIKit/UIInterface_Private.h>
-#import <UIKit/UIResponder_Private.h>
-#import <UIKit/UIView_Private.h>
#import <WebCore/LocalizedStrings.h>
#import <wtf/RetainPtr.h>
#import <wtf/WeakObjCPtr.h>
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKFocusedFormControlView.mm (262853 => 262854)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKFocusedFormControlView.mm 2020-06-10 20:31:13 UTC (rev 262853)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKFocusedFormControlView.mm 2020-06-10 20:34:18 UTC (rev 262854)
@@ -30,8 +30,6 @@
asm(".linker_option \"-framework\", \"PepperUICore\"");
-#import <PepperUICore/PUICCrownInputSequencer.h>
-#import <PepperUICore/PUICCrownInputSequencer_Private.h>
#import <WebCore/LocalizedStrings.h>
#import <WebCore/WebCoreCALayerExtras.h>
#import <wtf/NeverDestroyed.h>
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKNumberPadView.mm (262853 => 262854)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKNumberPadView.mm 2020-06-10 20:31:13 UTC (rev 262853)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKNumberPadView.mm 2020-06-10 20:34:18 UTC (rev 262854)
@@ -28,16 +28,11 @@
#if PLATFORM(WATCHOS)
+#import "PepperUICoreSPI.h"
#import "WKNumberPadViewController.h"
-#import <CoreText/CTFontTraitsPriv.h>
-#import <PepperUICore/PUICActionController_Private.h>
-#import <PepperUICore/UIDevice+PUICAdditions.h>
-#import <UIKit/UIFont_Private.h>
-#import <UIKit/UIGeometry_Private.h>
-#import <UIKit/UIImage_Private.h>
-#import <UIKit/UILabel_Private.h>
-#import <UIKit/UIView_Private.h>
+
#import <WebCore/LocalizedStrings.h>
+#import <pal/spi/cocoa/CoreTextSPI.h>
#import <wtf/NeverDestroyed.h>
#import <wtf/RetainPtr.h>
#import <wtf/WeakObjCPtr.h>
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKNumberPadViewController.h (262853 => 262854)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKNumberPadViewController.h 2020-06-10 20:31:13 UTC (rev 262853)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKNumberPadViewController.h 2020-06-10 20:34:18 UTC (rev 262854)
@@ -27,7 +27,6 @@
#import "WKNumberPadView.h"
#import "WKTextInputListViewController.h"
-#import <PepperUICore/PUICQuickboardViewController.h>
@interface WKNumberPadViewController : PUICQuickboardViewController
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKNumberPadViewController.mm (262853 => 262854)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKNumberPadViewController.mm 2020-06-10 20:31:13 UTC (rev 262853)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKNumberPadViewController.mm 2020-06-10 20:34:18 UTC (rev 262854)
@@ -30,9 +30,6 @@
#import "UIKitSPI.h"
#import "WKNumberPadView.h"
-#import <PepperUICore/PUICQuickboardViewController_Private.h>
-#import <PepperUICore/PUICResources.h>
-#import <PepperUICore/UIDevice+PUICAdditions.h>
#import <WebCore/LocalizedStrings.h>
#import <wtf/RetainPtr.h>
#import <wtf/WeakObjCPtr.h>
@@ -259,7 +256,9 @@
fadeOutAnimation.toValue = @0;
fadeOutAnimation.duration = numberPadViewDismissAnimationDuration;
fadeOutAnimation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
+#if USE(APPLE_INTERNAL)
[self.contentView addAnimation:fadeOutAnimation forKey:@"WebKitNumberPadFadeOutAnimationKey"];
+#endif
self.contentView.alpha = 0;
}
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKQuickboardListViewController.h (262853 => 262854)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKQuickboardListViewController.h 2020-06-10 20:31:13 UTC (rev 262853)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKQuickboardListViewController.h 2020-06-10 20:34:18 UTC (rev 262854)
@@ -25,15 +25,8 @@
#if PLATFORM(WATCHOS)
-#import "UIKitSPI.h"
-#import <PepperUICore/PUICQuickboardListViewController.h>
-#import <PepperUICore/PUICQuickboardListViewControllerSubclass.h>
-#import <PepperUICore/PUICTableViewCell.h>
+#import "PepperUICoreSPI.h"
-#if HAVE(QUICKBOARD_COLLECTION_VIEWS)
-#import <PepperUICore/PUICQuickboardListCollectionViewItemCell.h>
-#endif
-
@interface WKQuickboardListItemCell : PUICQuickboardListItemCell
@end
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKQuickboardListViewController.mm (262853 => 262854)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKQuickboardListViewController.mm 2020-06-10 20:31:13 UTC (rev 262853)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKQuickboardListViewController.mm 2020-06-10 20:34:18 UTC (rev 262854)
@@ -28,12 +28,6 @@
#if PLATFORM(WATCHOS)
-#import <PepperUICore/PUICActionController.h>
-#import <PepperUICore/PUICActionGroup.h>
-#import <PepperUICore/PUICApplication_Private.h>
-#import <PepperUICore/PUICQuickboardLanguageController.h>
-#import <PepperUICore/PUICQuickboardViewController_Private.h>
-#import <PepperUICore/PUICStatusBarAppContextView.h>
#import <wtf/RetainPtr.h>
static const CGFloat itemCellTopToLabelBaseline = 26;
@@ -84,8 +78,13 @@
- (instancetype)initWithDelegate:(id <WKQuickboardViewControllerDelegate>)delegate
{
+#if USE(APPLE_INTERNAL)
if (self = [super initWithDelegate:delegate dictationMode:PUICDictationModeText])
_contextViewNeedsUpdate = YES;
+#else
+ if (self = [super initWithDelegate:delegate])
+ _contextViewNeedsUpdate = YES;
+#endif
return self;
}
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKSelectMenuListViewController.mm (262853 => 262854)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKSelectMenuListViewController.mm 2020-06-10 20:31:13 UTC (rev 262853)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKSelectMenuListViewController.mm 2020-06-10 20:34:18 UTC (rev 262854)
@@ -29,17 +29,8 @@
#if PLATFORM(WATCHOS)
#import "UIKitSPI.h"
-#import <PepperUICore/PUICQuickboardListViewController.h>
-#import <PepperUICore/PUICQuickboardListViewControllerSubclass.h>
-#import <PepperUICore/PUICResources.h>
-#import <PepperUICore/PUICTableView.h>
-#import <PepperUICore/PUICTableViewCell.h>
#import <wtf/RetainPtr.h>
-#if HAVE(QUICKBOARD_COLLECTION_VIEWS)
-#import <PepperUICore/PUICQuickboardListCollectionViewItemCell.h>
-#endif
-
static const CGFloat checkmarkImageViewWidth = 32;
static const CGFloat selectMenuItemHorizontalMargin = 9;
static const CGFloat selectMenuItemCellHeight = 44;
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKTextInputListViewController.mm (262853 => 262854)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKTextInputListViewController.mm 2020-06-10 20:31:13 UTC (rev 262853)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKTextInputListViewController.mm 2020-06-10 20:34:18 UTC (rev 262854)
@@ -29,18 +29,8 @@
#if PLATFORM(WATCHOS)
#import "WKNumberPadViewController.h"
-#import <PepperUICore/PUICQuickboardArouetViewController.h>
-#import <PepperUICore/PUICQuickboardListViewControllerSubclass.h>
-#import <PepperUICore/PUICQuickboardListViewSpecs.h>
-#import <PepperUICore/PUICResources.h>
-#import <PepperUICore/PUICTableView.h>
-#import <PepperUICore/PUICTableViewCell.h>
#import <wtf/RetainPtr.h>
-#if HAVE(QUICKBOARD_COLLECTION_VIEWS)
-#import <PepperUICore/PUICQuickboardListCollectionViewItemCell.h>
-#endif
-
static const CGFloat textSuggestionButtonHeight = 44;
static const CGFloat textSuggestionLabelHorizontalMargin = 9;
static NSString *textSuggestionCellReuseIdentifier = @"WebKitQuickboardTextSuggestionCell";
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (262853 => 262854)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-06-10 20:31:13 UTC (rev 262853)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-06-10 20:34:18 UTC (rev 262854)
@@ -4613,6 +4613,7 @@
AAB145E5223F931200E489D8 /* PrefetchCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PrefetchCache.cpp; sourceTree = "<group>"; };
AAFA634E234F7C6300FFA864 /* AsyncRevalidation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsyncRevalidation.h; sourceTree = "<group>"; };
AAFA6350234F7C7300FFA864 /* AsyncRevalidation.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = AsyncRevalidation.cpp; sourceTree = "<group>"; };
+ AB2750C024859B1A00F1C9D8 /* PepperUICoreSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PepperUICoreSPI.h; sourceTree = "<group>"; };
B396EA5512E0ED2D00F4FEB7 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
B62E730F143047A60069EC35 /* WKHitTestResult.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKHitTestResult.cpp; sourceTree = "<group>"; };
B62E7311143047B00069EC35 /* WKHitTestResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKHitTestResult.h; sourceTree = "<group>"; };
@@ -8710,6 +8711,14 @@
path = ios;
sourceTree = "<group>";
};
+ AB2750BD2485809100F1C9D8 /* watchos */ = {
+ isa = PBXGroup;
+ children = (
+ AB2750C024859B1A00F1C9D8 /* PepperUICoreSPI.h */,
+ );
+ path = watchos;
+ sourceTree = "<group>";
+ };
BC017D1016260FFD007054F5 /* DOM */ = {
isa = PBXGroup;
children = (
@@ -10364,6 +10373,7 @@
3754D5411B3A2998003A4C7F /* Cocoa */,
CE1A0BCB1A48E6C60054EF74 /* ios */,
A1E6886E1F6E2B82007006A6 /* mac */,
+ AB2750BD2485809100F1C9D8 /* watchos */,
);
path = spi;
sourceTree = "<group>";
