Title: [270202] trunk/Source/WebKit
- Revision
- 270202
- Author
- wenson_hs...@apple.com
- Date
- 2020-11-27 10:56:34 -0800 (Fri, 27 Nov 2020)
Log Message
Remove some extraneous PLATFORM(IOS_FAMILY) guards in WKContentViewInteraction
https://bugs.webkit.org/show_bug.cgi?id=219289
Reviewed by Sam Weinig.
Remove several redundant uses of `PLATFORM(IOS_FAMILY)`. The entire class is already conditional on
`IOS_FAMILY`, so adding additional compile-time guards for iOS family is not necessary.
* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView setTimePickerValueToHour:minute:]):
(-[WKContentView timePickerValueHour]):
(-[WKContentView timePickerValueMinute]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (270201 => 270202)
--- trunk/Source/WebKit/ChangeLog 2020-11-27 18:53:58 UTC (rev 270201)
+++ trunk/Source/WebKit/ChangeLog 2020-11-27 18:56:34 UTC (rev 270202)
@@ -1,3 +1,19 @@
+2020-11-27 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Remove some extraneous PLATFORM(IOS_FAMILY) guards in WKContentViewInteraction
+ https://bugs.webkit.org/show_bug.cgi?id=219289
+
+ Reviewed by Sam Weinig.
+
+ Remove several redundant uses of `PLATFORM(IOS_FAMILY)`. The entire class is already conditional on
+ `IOS_FAMILY`, so adding additional compile-time guards for iOS family is not necessary.
+
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView setTimePickerValueToHour:minute:]):
+ (-[WKContentView timePickerValueHour]):
+ (-[WKContentView timePickerValueMinute]):
+
2020-11-27 Adrian Perez de Castro <ape...@igalia.com>
Non-unified build fixes, late November 2020 edition
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h (270201 => 270202)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h 2020-11-27 18:53:58 UTC (rev 270201)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h 2020-11-27 18:56:34 UTC (rev 270202)
@@ -438,9 +438,7 @@
#if ENABLE(DRAG_SUPPORT)
, UIDragInteractionDelegate, UIDropInteractionDelegate
#endif
-#if PLATFORM(IOS_FAMILY)
, WKTouchActionGestureRecognizerDelegate
-#endif
>
@property (nonatomic, readonly) CGPoint lastInteractionLocation;
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (270201 => 270202)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2020-11-27 18:53:58 UTC (rev 270201)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2020-11-27 18:56:34 UTC (rev 270202)
@@ -9107,7 +9107,7 @@
#if PLATFORM(WATCHOS)
if ([_presentedFullScreenInputViewController isKindOfClass:[WKTimePickerViewController class]])
[(WKTimePickerViewController *)_presentedFullScreenInputViewController.get() setHour:hour minute:minute];
-#elif PLATFORM(IOS_FAMILY)
+#else
if ([_inputPeripheral isKindOfClass:[WKDateTimeInputControl class]])
[(WKDateTimeInputControl *)_inputPeripheral.get() setTimePickerHour:hour minute:minute];
#endif
@@ -9115,19 +9115,15 @@
- (double)timePickerValueHour
{
-#if PLATFORM(IOS_FAMILY)
if ([_inputPeripheral isKindOfClass:[WKDateTimeInputControl class]])
return [(WKDateTimeInputControl *)_inputPeripheral.get() timePickerValueHour];
-#endif
return -1;
}
- (double)timePickerValueMinute
{
-#if PLATFORM(IOS_FAMILY)
if ([_inputPeripheral isKindOfClass:[WKDateTimeInputControl class]])
return [(WKDateTimeInputControl *)_inputPeripheral.get() timePickerValueMinute];
-#endif
return -1;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
