Diff
Modified: trunk/Source/WTF/ChangeLog (272668 => 272669)
--- trunk/Source/WTF/ChangeLog 2021-02-10 19:53:48 UTC (rev 272668)
+++ trunk/Source/WTF/ChangeLog 2021-02-10 19:58:12 UTC (rev 272669)
@@ -1,5 +1,16 @@
2021-02-10 Wenson Hsieh <wenson_hs...@apple.com>
+ Use HAVE(PEPPER_UI_CORE) instead of PLATFORM(WATCHOS) to guard code that uses PepperUICore
+ https://bugs.webkit.org/show_bug.cgi?id=221679
+
+ Reviewed by Tim Horton.
+
+ Add the `HAVE(PEPPER_UI_CORE)` compile-time flag.
+
+ * wtf/PlatformHave.h:
+
+2021-02-10 Wenson Hsieh <wenson_hs...@apple.com>
+
[watchOS] Adopt PUICQuickboardController for text input
https://bugs.webkit.org/show_bug.cgi?id=221649
Modified: trunk/Source/WTF/wtf/PlatformHave.h (272668 => 272669)
--- trunk/Source/WTF/wtf/PlatformHave.h 2021-02-10 19:53:48 UTC (rev 272668)
+++ trunk/Source/WTF/wtf/PlatformHave.h 2021-02-10 19:58:12 UTC (rev 272669)
@@ -869,3 +869,7 @@
#define HAVE_AVFOUNDATION_INTERSTITIAL_EVENTS 1
#endif
#endif
+
+#if PLATFORM(WATCHOS)
+#define HAVE_PEPPER_UI_CORE 1
+#endif
Modified: trunk/Source/WebKit/ChangeLog (272668 => 272669)
--- trunk/Source/WebKit/ChangeLog 2021-02-10 19:53:48 UTC (rev 272668)
+++ trunk/Source/WebKit/ChangeLog 2021-02-10 19:58:12 UTC (rev 272669)
@@ -1,3 +1,52 @@
+2021-02-10 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Use HAVE(PEPPER_UI_CORE) instead of PLATFORM(WATCHOS) to guard code that uses PepperUICore
+ https://bugs.webkit.org/show_bug.cgi?id=221679
+
+ Reviewed by Tim Horton.
+
+ Use `HAVE(PEPPER_UI_CORE)` instead of `PLATFORM(WATCHOS)` in code that depends on PepperUICore, either directly
+ or indirectly. While technically equivalent, the former is more semantically precise. Common examples of this
+ include dependencies on Quickboard for text input, or PepperUICore category extensions on common UIKit classes
+ (e.g. digital crown support in `WKScrollView.mm`). No change in behavior.
+
+ Inspired by <https://bugs.webkit.org/show_bug.cgi?id=221649#c2>.
+
+ * Platform/spi/watchos/PepperUICoreSPI.h:
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _willStartScrollingOrZooming]):
+ (-[WKContentView _didEndScrollingOrZooming]):
+ (-[WKContentView _updateTextInputTraits:]):
+ (-[WKContentView _elementDidFocus:userIsInteracting:blurPreviousNode:activityStateChanges:userObject:]):
+ (-[WKContentView _elementDidBlur]):
+ (-[WKContentView reloadContextViewForPresentedListViewController]):
+ (-[WKContentView _wheelChangedWithEvent:]):
+ (-[WKContentView _simulateTextEntered:]):
+ (-[WKContentView selectFormAccessoryPickerRow:]):
+ (-[WKContentView selectFormAccessoryHasCheckedItemAtRow:]):
+ (-[WKContentView textContentTypeForTesting]):
+ (-[WKContentView formInputLabel]):
+ (-[WKContentView setTimePickerValueToHour:minute:]):
+ * UIProcess/ios/WKScrollView.mm:
+ (-[WKScrollView initWithFrame:]):
+ * UIProcess/ios/forms/WKDatePickerViewController.h:
+ * UIProcess/ios/forms/WKDatePickerViewController.mm:
+ * UIProcess/ios/forms/WKFocusedFormControlView.h:
+ * UIProcess/ios/forms/WKFocusedFormControlView.mm:
+ * UIProcess/ios/forms/WKNumberPadView.h:
+ * UIProcess/ios/forms/WKNumberPadView.mm:
+ * UIProcess/ios/forms/WKNumberPadViewController.h:
+ * UIProcess/ios/forms/WKNumberPadViewController.mm:
+ * UIProcess/ios/forms/WKQuickboardListViewController.h:
+ * UIProcess/ios/forms/WKQuickboardListViewController.mm:
+ * UIProcess/ios/forms/WKSelectMenuListViewController.h:
+ * UIProcess/ios/forms/WKSelectMenuListViewController.mm:
+ * UIProcess/ios/forms/WKTextInputListViewController.h:
+ * UIProcess/ios/forms/WKTextInputListViewController.mm:
+ * UIProcess/ios/forms/WKTimePickerViewController.h:
+ * UIProcess/ios/forms/WKTimePickerViewController.mm:
+
2021-02-10 Alex Christensen <achristen...@webkit.org>
REGRESSION (r272628): [macOS] TestWebKitAPI.WKWebView.SnapshotImageError is consistently failing
Modified: trunk/Source/WebKit/Platform/spi/watchos/PepperUICoreSPI.h (272668 => 272669)
--- trunk/Source/WebKit/Platform/spi/watchos/PepperUICoreSPI.h 2021-02-10 19:53:48 UTC (rev 272668)
+++ trunk/Source/WebKit/Platform/spi/watchos/PepperUICoreSPI.h 2021-02-10 19:58:12 UTC (rev 272669)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
#import "UIKitSPI.h"
@@ -308,4 +308,4 @@
#endif // USE(APPLE_INTERNAL_SDK)
-#endif // PLATFORM(WATCHOS)
+#endif // HAVE(PEPPER_UI_CORE)
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h (272668 => 272669)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h 2021-02-10 19:53:48 UTC (rev 272668)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h 2021-02-10 19:58:12 UTC (rev 272669)
@@ -121,7 +121,7 @@
@class _UILookupGestureRecognizer;
@class _UIHighlightView;
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
@class PUICQuickboardViewController;
#if HAVE(QUICKBOARD_CONTROLLER)
@class PUICQuickboardController;
@@ -457,7 +457,7 @@
BOOL _hasSetUpAppHighlightMenus;
#endif
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
RetainPtr<WKFocusedFormControlView> _focusedFormControlView;
#if HAVE(QUICKBOARD_CONTROLLER)
RetainPtr<PUICQuickboardController> _presentedQuickboardController;
@@ -467,7 +467,7 @@
BOOL _shouldRestoreFirstResponderStatusAfterLosingFocus;
BlockPtr<void()> _activeFocusedStateRetainBlock;
-#endif // PLATFORM(WATCHOS)
+#endif // HAVE(PEPPER_UI_CORE)
#if ENABLE(PLATFORM_DRIVEN_TEXT_CHECKING)
std::unique_ptr<WebKit::TextCheckingController> _textCheckingController;
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (272668 => 272669)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2021-02-10 19:53:48 UTC (rev 272668)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2021-02-10 19:58:12 UTC (rev 272669)
@@ -167,7 +167,7 @@
#import "WKWebEvent.h"
#endif
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
#import "PepperUICoreSPI.h"
#endif
@@ -190,7 +190,7 @@
@end
#endif
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
#if HAVE(QUICKBOARD_CONTROLLER)
@interface WKContentView (QuickboardControllerSupport) <PUICQuickboardControllerDelegate>
@end
@@ -198,7 +198,7 @@
@interface WKContentView (WatchSupport) <WKFocusedFormControlViewDelegate, WKSelectMenuListViewControllerDelegate, WKTextInputListViewControllerDelegate>
@end
-#endif // PLATFORM(WATCHOS)
+#endif // HAVE(PEPPER_UI_CORE)
static void *WKContentViewKVOTransformContext = &WKContentViewKVOTransformContext;
@@ -3068,7 +3068,7 @@
[_textInteractionAssistant willStartScrollingOrZooming];
_page->setIsScrollingOrZooming(true);
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
[_focusedFormControlView disengageFocusedFormControlNavigation];
#endif
}
@@ -3090,7 +3090,7 @@
[self _resetPanningPreventionFlags];
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
[_focusedFormControlView engageFocusedFormControlNavigation];
#endif
}
@@ -5279,7 +5279,7 @@
break;
}
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
traits.textContentType = self.textContentTypeForQuickboard;
#else
traits.textContentType = contentTypeFromFieldName(_focusedElementInformation.autofillFieldName);
@@ -6101,7 +6101,7 @@
if (activityStateChanges && activityStateChanges != WebCore::ActivityState::IsFocused)
return YES;
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
if (_isChangingFocus && ![_focusedFormControlView isHidden])
return YES;
#else
@@ -6193,7 +6193,7 @@
_inputPeripheral = createInputPeripheralWithView(_focusedElementInformation.elementType, self);
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
[self addFocusedFormControlOverlay];
if (!_isChangingFocus)
[self presentViewControllerForCurrentFocusedElement];
@@ -6222,7 +6222,7 @@
[self _updateAccessory];
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
if (_isChangingFocus)
[_focusedFormControlView reloadData:YES];
#endif
@@ -6273,7 +6273,7 @@
[self _hideKeyboard];
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
[self dismissAllInputViewControllers:YES];
if (!_isChangingFocus)
[self removeFocusedFormControlOverlay];
@@ -6433,13 +6433,13 @@
- (void)reloadContextViewForPresentedListViewController
{
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
if ([_presentedFullScreenInputViewController isKindOfClass:[WKTextInputListViewController class]])
[(WKTextInputListViewController *)_presentedFullScreenInputViewController.get() reloadContextView];
#endif
}
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
- (void)addFocusedFormControlOverlay
{
@@ -6802,11 +6802,11 @@
#endif // HAVE(QUICKBOARD_CONTROLLER)
-#endif // PLATFORM(WATCHOS)
+#endif // HAVE(PEPPER_UI_CORE)
- (void)_wheelChangedWithEvent:(UIEvent *)event
{
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
if ([_focusedFormControlView handleWheelEvent:event])
return;
#endif
@@ -8752,7 +8752,7 @@
#endif
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
- (void)dismissQuickboardViewControllerAndRevealFocusedFormOverlayIfNecessary:(id)controller
{
@@ -8925,7 +8925,7 @@
return _focusedElementInformation.elementType != WebKit::InputType::Password;
}
-#endif // PLATFORM(WATCHOS)
+#endif // HAVE(PEPPER_UI_CORE)
#if HAVE(LOOKUP_GESTURE_RECOGNIZER)
- (void)_lookupGestureRecognized:(UIGestureRecognizer *)gestureRecognizer
@@ -9403,7 +9403,7 @@
- (void)_simulateTextEntered:(NSString *)text
{
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
if ([_presentedFullScreenInputViewController isKindOfClass:[WKTextInputListViewController class]]) {
[(WKTextInputListViewController *)_presentedFullScreenInputViewController.get() enterText:text];
return;
@@ -9418,7 +9418,7 @@
return;
}
#endif // HAVE(QUICKBOARD_CONTROLLER)
-#endif // PLATFORM(WATCHOS)
+#endif // HAVE(PEPPER_UI_CORE)
[self insertText:text];
}
@@ -9444,7 +9444,7 @@
- (void)selectFormAccessoryPickerRow:(NSInteger)rowIndex
{
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
if ([_presentedFullScreenInputViewController isKindOfClass:[WKSelectMenuListViewController class]])
[(WKSelectMenuListViewController *)_presentedFullScreenInputViewController.get() selectItemAtIndex:rowIndex];
#else
@@ -9455,7 +9455,7 @@
- (BOOL)selectFormAccessoryHasCheckedItemAtRow:(long)rowIndex
{
-#if !PLATFORM(WATCHOS)
+#if !HAVE(PEPPER_UI_CORE)
if ([_inputPeripheral isKindOfClass:[WKFormSelectControl self]])
return [(WKFormSelectControl *)_inputPeripheral selectFormAccessoryHasCheckedItemAtRow:rowIndex];
#endif
@@ -9470,7 +9470,7 @@
- (NSString *)textContentTypeForTesting
{
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
if ([_presentedFullScreenInputViewController isKindOfClass:[WKTextInputListViewController class]])
return [self textContentTypeForListViewController:(WKTextInputListViewController *)_presentedFullScreenInputViewController.get()];
#if HAVE(QUICKBOARD_CONTROLLER)
@@ -9477,7 +9477,7 @@
if (_presentedQuickboardController)
return [_presentedQuickboardController textInputContext].textContentType;
#endif // HAVE(QUICKBOARD_CONTROLLER)
-#endif // PLATFORM(WATCHOS)
+#endif // HAVE(PEPPER_UI_CORE)
return self.textInputTraits.textContentType;
}
@@ -9491,7 +9491,7 @@
- (NSString *)formInputLabel
{
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
return [self inputLabelTextForViewController:_presentedFullScreenInputViewController.get()];
#else
return nil;
@@ -9500,7 +9500,7 @@
- (void)setTimePickerValueToHour:(NSInteger)hour minute:(NSInteger)minute
{
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
if ([_presentedFullScreenInputViewController isKindOfClass:[WKTimePickerViewController class]])
[(WKTimePickerViewController *)_presentedFullScreenInputViewController.get() setHour:hour minute:minute];
#else
Modified: trunk/Source/WebKit/UIProcess/ios/WKScrollView.mm (272668 => 272669)
--- trunk/Source/WebKit/UIProcess/ios/WKScrollView.mm 2021-02-10 19:53:48 UTC (rev 272668)
+++ trunk/Source/WebKit/UIProcess/ios/WKScrollView.mm 2021-02-10 19:58:12 UTC (rev 272669)
@@ -35,7 +35,7 @@
#import <pal/spi/cg/CoreGraphicsSPI.h>
#import <wtf/WeakObjCPtr.h>
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
#import "PepperUICoreSPI.h"
#endif
@@ -159,7 +159,7 @@
_contentInsetAdjustmentBehaviorWasExternallyOverridden = (self.contentInsetAdjustmentBehavior != UIScrollViewContentInsetAdjustmentAutomatic);
#endif
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
[self _configureDigitalCrownScrolling];
#endif
@@ -429,6 +429,10 @@
gestureRecognizer.allowedTouchTypes = @[];
}
+#endif // PLATFORM(WATCHOS)
+
+#if HAVE(PEPPER_UI_CORE)
+
- (void)_configureDigitalCrownScrolling
{
self.showsVerticalScrollIndicator = NO;
@@ -446,7 +450,7 @@
return targetOffset;
}
-#endif
+#endif // HAVE(PEPPER_UI_CORE)
@end
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKDatePickerViewController.h (272668 => 272669)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKDatePickerViewController.h 2021-02-10 19:53:48 UTC (rev 272668)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKDatePickerViewController.h 2021-02-10 19:58:12 UTC (rev 272669)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
#import "WKQuickboardListViewController.h"
@@ -36,4 +36,4 @@
@end
-#endif
+#endif // HAVE(PEPPER_UI_CORE)
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKDatePickerViewController.mm (272668 => 272669)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKDatePickerViewController.mm 2021-02-10 19:53:48 UTC (rev 272668)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKDatePickerViewController.mm 2021-02-10 19:58:12 UTC (rev 272669)
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKDatePickerViewController.h"
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
#import <WebCore/LocalizedStrings.h>
#import <wtf/RetainPtr.h>
@@ -689,4 +689,4 @@
@end
-#endif
+#endif // HAVE(PEPPER_UI_CORE)
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKFocusedFormControlView.h (272668 => 272669)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKFocusedFormControlView.h 2021-02-10 19:53:48 UTC (rev 272668)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKFocusedFormControlView.h 2021-02-10 19:58:12 UTC (rev 272669)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
#import "UIKitSPI.h"
@@ -70,4 +70,4 @@
@end
-#endif
+#endif // HAVE(PEPPER_UI_CORE)
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKFocusedFormControlView.mm (272668 => 272669)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKFocusedFormControlView.mm 2021-02-10 19:53:48 UTC (rev 272668)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKFocusedFormControlView.mm 2021-02-10 19:58:12 UTC (rev 272669)
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKFocusedFormControlView.h"
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
asm(".linker_option \"-framework\", \"PepperUICore\"");
@@ -501,4 +501,4 @@
@end
-#endif // PLATFORM(WATCHOS)
+#endif // HAVE(PEPPER_UI_CORE)
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKNumberPadView.h (272668 => 272669)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKNumberPadView.h 2021-02-10 19:53:48 UTC (rev 272668)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKNumberPadView.h 2021-02-10 19:58:12 UTC (rev 272669)
@@ -25,7 +25,7 @@
#pragma once
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
#import <UIKit/UIKit.h>
@@ -80,4 +80,4 @@
- (instancetype)init NS_UNAVAILABLE;
@end
-#endif
+#endif // HAVE(PEPPER_UI_CORE)
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKNumberPadView.mm (272668 => 272669)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKNumberPadView.mm 2021-02-10 19:53:48 UTC (rev 272668)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKNumberPadView.mm 2021-02-10 19:58:12 UTC (rev 272669)
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKNumberPadView.h"
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
#import "PepperUICoreSPI.h"
#import "WKNumberPadViewController.h"
@@ -567,4 +567,4 @@
@end
-#endif // PLATFORM(WATCHOS)
+#endif // HAVE(PEPPER_UI_CORE)
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKNumberPadViewController.h (272668 => 272669)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKNumberPadViewController.h 2021-02-10 19:53:48 UTC (rev 272668)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKNumberPadViewController.h 2021-02-10 19:58:12 UTC (rev 272669)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
#import "WKNumberPadView.h"
#import "WKTextInputListViewController.h"
@@ -37,4 +37,4 @@
@end
-#endif
+#endif // HAVE(PEPPER_UI_CORE)
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKNumberPadViewController.mm (272668 => 272669)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKNumberPadViewController.mm 2021-02-10 19:53:48 UTC (rev 272668)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKNumberPadViewController.mm 2021-02-10 19:58:12 UTC (rev 272669)
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKNumberPadViewController.h"
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
#import "UIKitSPI.h"
#import "WKNumberPadView.h"
@@ -264,4 +264,4 @@
@end
-#endif // PLATFORM(WATCHOS)
+#endif // HAVE(PEPPER_UI_CORE)
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKQuickboardListViewController.h (272668 => 272669)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKQuickboardListViewController.h 2021-02-10 19:53:48 UTC (rev 272668)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKQuickboardListViewController.h 2021-02-10 19:58:12 UTC (rev 272669)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
#import "PepperUICoreSPI.h"
@@ -62,4 +62,4 @@
void configureStatusBarForController(PUICQuickboardViewController *, id <WKQuickboardViewControllerDelegate>);
-#endif
+#endif // HAVE(PEPPER_UI_CORE)
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKQuickboardListViewController.mm (272668 => 272669)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKQuickboardListViewController.mm 2021-02-10 19:53:48 UTC (rev 272668)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKQuickboardListViewController.mm 2021-02-10 19:58:12 UTC (rev 272669)
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKQuickboardListViewController.h"
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
#import <wtf/RetainPtr.h>
@@ -210,4 +210,4 @@
[item commitChangesAnimated:NO];
}
-#endif // PLATFORM(WATCHOS)
+#endif // HAVE(PEPPER_UI_CORE)
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKSelectMenuListViewController.h (272668 => 272669)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKSelectMenuListViewController.h 2021-02-10 19:53:48 UTC (rev 272668)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKSelectMenuListViewController.h 2021-02-10 19:58:12 UTC (rev 272669)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
#import "WKQuickboardListViewController.h"
@@ -55,4 +55,4 @@
@end
-#endif
+#endif // HAVE(PEPPER_UI_CORE)
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKSelectMenuListViewController.mm (272668 => 272669)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKSelectMenuListViewController.mm 2021-02-10 19:53:48 UTC (rev 272668)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKSelectMenuListViewController.mm 2021-02-10 19:58:12 UTC (rev 272669)
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKSelectMenuListViewController.h"
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
#import "UIKitSPI.h"
#import <wtf/RetainPtr.h>
@@ -277,4 +277,4 @@
@end
-#endif // PLATFORM(WATCHOS)
+#endif // HAVE(PEPPER_UI_CORE)
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKTextInputListViewController.h (272668 => 272669)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKTextInputListViewController.h 2021-02-10 19:53:48 UTC (rev 272668)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKTextInputListViewController.h 2021-02-10 19:58:12 UTC (rev 272669)
@@ -25,7 +25,7 @@
#pragma once
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
#import "WKQuickboardListViewController.h"
@@ -63,4 +63,4 @@
@end
-#endif // PLATFORM(WATCHOS)
+#endif // HAVE(PEPPER_UI_CORE)
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKTextInputListViewController.mm (272668 => 272669)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKTextInputListViewController.mm 2021-02-10 19:53:48 UTC (rev 272668)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKTextInputListViewController.mm 2021-02-10 19:58:12 UTC (rev 272669)
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKTextInputListViewController.h"
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
#import "WKNumberPadViewController.h"
#import <wtf/RetainPtr.h>
@@ -209,4 +209,4 @@
@end
-#endif // PLATFORM(WATCHOS)
+#endif // HAVE(PEPPER_UI_CORE)
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKTimePickerViewController.h (272668 => 272669)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKTimePickerViewController.h 2021-02-10 19:53:48 UTC (rev 272668)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKTimePickerViewController.h 2021-02-10 19:58:12 UTC (rev 272669)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
#import "WKQuickboardListViewController.h"
@@ -42,4 +42,4 @@
@end
-#endif
+#endif // HAVE(PEPPER_UI_CORE)
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKTimePickerViewController.mm (272668 => 272669)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKTimePickerViewController.mm 2021-02-10 19:53:48 UTC (rev 272668)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKTimePickerViewController.mm 2021-02-10 19:58:12 UTC (rev 272669)
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKTimePickerViewController.h"
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
#import "ClockKitSPI.h"
#import "UIKitSPI.h"
@@ -146,4 +146,4 @@
@end
-#endif // PLATFORM(WATCHOS)
+#endif // HAVE(PEPPER_UI_CORE)
Modified: trunk/Tools/ChangeLog (272668 => 272669)
--- trunk/Tools/ChangeLog 2021-02-10 19:53:48 UTC (rev 272668)
+++ trunk/Tools/ChangeLog 2021-02-10 19:58:12 UTC (rev 272669)
@@ -1,3 +1,13 @@
+2021-02-10 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Use HAVE(PEPPER_UI_CORE) instead of PLATFORM(WATCHOS) to guard code that uses PepperUICore
+ https://bugs.webkit.org/show_bug.cgi?id=221679
+
+ Reviewed by Tim Horton.
+
+ * WebKitTestRunner/cocoa/TestRunnerWKWebView.mm:
+ (isQuickboardViewController):
+
2021-02-10 Aakash Jain <aakash_j...@apple.com>
[ews] Remove old build.webkit.org unit-tests
Modified: trunk/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.mm (272668 => 272669)
--- trunk/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.mm 2021-02-10 19:53:48 UTC (rev 272668)
+++ trunk/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.mm 2021-02-10 19:58:12 UTC (rev 272669)
@@ -49,7 +49,7 @@
@end
#endif
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
#import "PepperUICoreSPI.h"
#endif
@@ -531,7 +531,7 @@
static bool isQuickboardViewController(UIViewController *viewController)
{
-#if PLATFORM(WATCHOS)
+#if HAVE(PEPPER_UI_CORE)
if ([viewController isKindOfClass:PUICQuickboardViewController.class])
return true;
#if HAVE(QUICKBOARD_CONTROLLER)
@@ -538,7 +538,7 @@
if ([viewController isKindOfClass:PUICQuickboardRemoteViewController.class])
return true;
#endif // HAVE(QUICKBOARD_CONTROLLER)
-#endif // PLATFORM(WATCHOS)
+#endif // HAVE(PEPPER_UI_CORE)
return false;
}
