Changeset 276364 in webkit


Ignore:
Timestamp:
Apr 21, 2021, 8:44:48 AM (4 years ago)
Author:
Aditya Keerthi
Message:

Fix the watchOS build after r276325
​https://bugs.webkit.org/show_bug.cgi?id=224868
<rdar://problem/76938541>

Reviewed by Wenson Hsieh.

r276325 broke the watchOS build by using UIBlurEffectStyleSystemMaterial
in WKDateTimeInputControl.mm.

However, while we have been compiling WKDateTimeInputControl for
watchOS, the class is unused. This is due to the fact that watchOS has
a separate date/time picker implementation. Rather than conditionally
compiling the UIBlurEffectStyleSystemMaterial logic (which would
involve writing additional logic to make sure WKDateTimeInputControl
still compiles on watchOS), we can simply stop building
WKDateTimeInputControl on watchOS.

  • UIProcess/ios/WKContentViewInteraction.h:
  • UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView dateTimeInputControl:]):
(-[WKContentView timePickerValueHour:]):
(-[WKContentView timePickerValueMinute:]):

  • UIProcess/ios/forms/WKDateTimeInputControl.h:
  • UIProcess/ios/forms/WKDateTimeInputControl.mm:
Location:
trunk/Source/WebKit
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r276363 r276364  
     12021-04-21  Aditya Keerthi  <akeerthi@apple.com>
     2
     3        Fix the watchOS build after r276325
     4        https://bugs.webkit.org/show_bug.cgi?id=224868
     5        <rdar://problem/76938541>
     6
     7        Reviewed by Wenson Hsieh.
     8
     9        r276325 broke the watchOS build by using UIBlurEffectStyleSystemMaterial
     10        in WKDateTimeInputControl.mm.
     11
     12        However, while we have been compiling WKDateTimeInputControl for
     13        watchOS, the class is unused. This is due to the fact that watchOS has
     14        a separate date/time picker implementation. Rather than conditionally
     15        compiling the UIBlurEffectStyleSystemMaterial logic (which would
     16        involve writing additional logic to make sure WKDateTimeInputControl
     17        still compiles on watchOS), we can simply stop building
     18        WKDateTimeInputControl on watchOS.
     19
     20        * UIProcess/ios/WKContentViewInteraction.h:
     21        * UIProcess/ios/WKContentViewInteraction.mm:
     22        (-[WKContentView dateTimeInputControl:]):
     23        (-[WKContentView timePickerValueHour:]):
     24        (-[WKContentView timePickerValueMinute:]):
     25        * UIProcess/ios/forms/WKDateTimeInputControl.h:
     26        * UIProcess/ios/forms/WKDateTimeInputControl.mm:
     27
    1282021-04-21  Kimmo Kinnunen  <kkinnunen@apple.com>
    229

  • trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h

    r276331 r276364  
    111111@class WKContextMenuElementInfo;
    112112@class WKDataListSuggestionsControl;
    113 @class WKDateTimeInputControl;
    114113@class WKFocusedFormControlView;
    115114@class WKFormInputSession;
    … …  
    120119@class WKTextRange;
    121120@class _WKTextInputContext;
     121
     122#if !PLATFORM(WATCHOS)
     123@class WKDateTimeInputControl;
     124#endif
    122125
    123126@class UIPointerInteraction;
    … …  
    748751@property (nonatomic, readonly) NSString *selectFormPopoverTitle;
    749752@property (nonatomic, readonly) NSString *formInputLabel;
     753#if !PLATFORM(WATCHOS)
    750754@property (nonatomic, readonly) WKDateTimeInputControl *dateTimeInputControl;
     755#endif
    751756@property (nonatomic, readonly) WKFormSelectControl *selectControl;
    752757#if ENABLE(DRAG_SUPPORT)

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

    r276331 r276364  
    96439643}
    96449644
     9645#if !PLATFORM(WATCHOS)
    96459646- (WKDateTimeInputControl *)dateTimeInputControl
    96469647{
    … …  
    96499650    return nil;
    96509651}
     9652#endif
    96519653
    96529654- (WKFormSelectControl *)selectControl
    … …  
    97769778- (double)timePickerValueHour
    97779779{
     9780#if !PLATFORM(WATCHOS)
    97789781    if ([_inputPeripheral isKindOfClass:[WKDateTimeInputControl class]])
    97799782        return [(WKDateTimeInputControl *)_inputPeripheral.get() timePickerValueHour];
     9783#endif
    97809784    return -1;
    97819785}
    … …  
    97839787- (double)timePickerValueMinute
    97849788{
     9789#if !PLATFORM(WATCHOS)
    97859790    if ([_inputPeripheral isKindOfClass:[WKDateTimeInputControl class]])
    97869791        return [(WKDateTimeInputControl *)_inputPeripheral.get() timePickerValueMinute];
     9792#endif
    97879793    return -1;
    97889794}

  • trunk/Source/WebKit/UIProcess/ios/forms/WKDateTimeInputControl.h

    r261658 r276364  
    2424 */
    2525
    26 #if PLATFORM(IOS_FAMILY)
     26#if PLATFORM(IOS_FAMILY) && !PLATFORM(WATCHOS)
    2727
    2828#import "WKFormPeripheralBase.h"
    … …  
    4141@end
    4242
    43 #endif // PLATFORM(IOS_FAMILY)
     43#endif // PLATFORM(IOS_FAMILY) && !PLATFORM(WATCHOS)

  • trunk/Source/WebKit/UIProcess/ios/forms/WKDateTimeInputControl.mm

    r276325 r276364  
    2727#import "WKDateTimeInputControl.h"
    2828
    29 #if PLATFORM(IOS_FAMILY)
     29#if PLATFORM(IOS_FAMILY) && !PLATFORM(WATCHOS)
    3030
    3131#import "UserInterfaceIdiom.h"
    … …  
    687687@end
    688688
    689 #endif // PLATFORM(IOS_FAMILY)
     689#endif // PLATFORM(IOS_FAMILY) && !PLATFORM(WATCHOS)
Note: See TracChangeset for help on using the changeset viewer.