Changeset 229916 in webkit
- Timestamp:
- Mar 23, 2018 1:47:19 PM (6 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 4 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r229914 r229916 1 2018-03-23 Wenson Hsieh <wenson_hsieh@apple.com> 2 3 [Extra zoom mode] Adopt list view controller UI for select menus 4 https://bugs.webkit.org/show_bug.cgi?id=183944 5 <rdar://problem/38799062> 6 7 Reviewed by Andy Estes. 8 9 Rename WKSelectMenuViewController to WKSelectMenuListViewController, and also rename the relevant 10 WebKitAdditions harness files. See corresponding changes for more details. 11 12 * UIProcess/WKSelectMenuListViewController.h: Renamed from Source/WebKit/UIProcess/ios/forms/WKSelectMenuViewController.h. 13 * UIProcess/WKSelectMenuListViewController.mm: Renamed from Source/WebKit/UIProcess/ios/forms/WKSelectMenuViewController.mm. 14 * UIProcess/ios/WKContentViewInteraction.h: 15 * UIProcess/ios/WKContentViewInteraction.mm: 16 (-[WKContentView presentSelectMenuViewController:]): 17 (-[WKContentView dismissSelectMenuViewController:]): 18 (-[WKContentView selectMenu:didSelectItemAtIndex:]): 19 (-[WKContentView numberOfItemsInSelectMenu:]): 20 (-[WKContentView selectMenu:displayTextForItemAtIndex:]): 21 (-[WKContentView selectMenu:didCheckItemAtIndex:checked:]): 22 (-[WKContentView selectMenuUsesMultipleSelection:]): 23 (-[WKContentView selectMenu:hasSelectedOptionAtIndex:]): 24 (-[WKContentView _wheelChangedWithEvent:]): 25 26 Overriding wheel events and re-dispatching them is no longer needed after r229437, so we can just remove special 27 handling for select menus here. 28 29 (-[WKContentView didCancelSelectionInSelectMenu:]): Deleted. 30 (-[WKContentView selectMenuSupportsMultipleSelection:]): Deleted. 31 (-[WKContentView selectMenu:hasCheckedOptionAtIndex:]): Deleted. 32 (-[WKContentView startingIndexForSelectMenu:]): Deleted. 33 34 The starting index for a select menu is no longer relevant when using list view controllers for input, so we can 35 just remove this delegate hook altogether. 36 37 * WebKit.xcodeproj/project.pbxproj: 38 1 39 2018-03-23 Youenn Fablet <youenn@apple.com> 2 40 -
trunk/Source/WebKit/UIProcess/WKSelectMenuListViewController.h
r229915 r229916 27 27 28 28 #if USE(APPLE_INTERNAL_SDK) 29 #import <WebKitAdditions/WKSelectMenu ViewControllerAdditions.h>29 #import <WebKitAdditions/WKSelectMenuListViewControllerAdditions.h> 30 30 #endif -
trunk/Source/WebKit/UIProcess/WKSelectMenuListViewController.mm
r229915 r229916 25 25 26 26 #import "config.h" 27 #import "WKSelectMenu ViewController.h"27 #import "WKSelectMenuListViewController.h" 28 28 29 29 #if USE(APPLE_INTERNAL_SDK) 30 #import <WebKitAdditions/WKSelectMenu ViewControllerAdditions.mm>30 #import <WebKitAdditions/WKSelectMenuListViewControllerAdditions.mm> 31 31 #endif -
trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
r229837 r229916 88 88 @class WKFocusedFormControlViewController; 89 89 @class WKNumberPadViewController; 90 @class WKSelectMenu ViewController;90 @class WKSelectMenuListViewController; 91 91 @class WKTextInputListViewController; 92 92 @class WKTimePickerViewController; … … 255 255 RetainPtr<WKFocusedFormControlViewController> _focusedFormControlViewController; 256 256 RetainPtr<WKNumberPadViewController> _numberPadViewController; 257 RetainPtr<WKSelectMenu ViewController> _selectMenuViewController;257 RetainPtr<WKSelectMenuListViewController> _selectMenuListViewController; 258 258 RetainPtr<WKTimePickerViewController> _timePickerViewController; 259 259 -
trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
r229837 r229916 54 54 #import "WKPreviewActionItemInternal.h" 55 55 #import "WKPreviewElementInfoInternal.h" 56 #import "WKSelectMenu ViewController.h"56 #import "WKSelectMenuListViewController.h" 57 57 #import "WKTextInputListViewController.h" 58 58 #import "WKTimePickerViewController.h" … … 127 127 #if ENABLE(EXTRA_ZOOM_MODE) 128 128 129 @interface WKContentView (ExtraZoomMode) <WKTextFormControlViewControllerDelegate, WKFocusedFormControlViewControllerDelegate, WKSelectMenu ViewControllerDelegate, WKFormControlListViewControllerDelegate>129 @interface WKContentView (ExtraZoomMode) <WKTextFormControlViewControllerDelegate, WKFocusedFormControlViewControllerDelegate, WKSelectMenuListViewControllerDelegate, WKTextFormControlListViewControllerDelegate> 130 130 @end 131 131 … … 4215 4215 - (void)presentSelectMenuViewController:(BOOL)animated 4216 4216 { 4217 if (_selectMenuViewController) 4218 return; 4219 4220 _selectMenuViewController = adoptNS([[WKSelectMenuViewController alloc] init]); 4221 [_selectMenuViewController setDelegate:self]; 4222 [_focusedFormControlViewController presentViewController:_selectMenuViewController.get() animated:animated completion:nil]; 4217 if (_selectMenuListViewController) 4218 return; 4219 4220 _selectMenuListViewController = adoptNS([[WKSelectMenuListViewController alloc] initWithDelegate:self]); 4221 [_focusedFormControlViewController presentViewController:_selectMenuListViewController.get() animated:animated completion:nil]; 4223 4222 } 4224 4223 4225 4224 - (void)dismissSelectMenuViewController:(BOOL)animated 4226 4225 { 4227 if (!_selectMenu ViewController)4228 return; 4229 4230 auto selectMenu ViewController = WTFMove(_selectMenuViewController);4231 [ selectMenuViewController dismissViewControllerAnimated:animated completion:nil];4226 if (!_selectMenuListViewController) 4227 return; 4228 4229 auto selectMenuListViewController = WTFMove(_selectMenuListViewController); 4230 [_selectMenuListViewController dismissViewControllerAnimated:animated completion:nil]; 4232 4231 } 4233 4232 … … 4428 4427 } 4429 4428 4430 #pragma mark - WKSelectMenuViewControllerDelegate 4431 4432 - (void)selectMenu:(WKSelectMenuViewController *)selectMenu didSelectItemAtIndex:(NSUInteger)index 4433 { 4434 if (!_assistedNodeInformation.isMultiSelect) 4435 _page->setAssistedNodeSelectedIndex(index, false); 4436 4437 _page->blurAssistedNode(); 4438 } 4439 4440 - (void)didCancelSelectionInSelectMenu:(WKSelectMenuViewController *)selectMenu 4441 { 4442 _page->blurAssistedNode(); 4443 } 4444 4445 - (NSUInteger)numberOfItemsInSelectMenu:(WKSelectMenuViewController *)selectMenu 4429 #pragma mark - WKSelectMenuListViewControllerDelegate 4430 4431 - (void)selectMenu:(WKSelectMenuListViewController *)selectMenu didSelectItemAtIndex:(NSUInteger)index 4432 { 4433 ASSERT(!_assistedNodeInformation.isMultiSelect); 4434 _page->setAssistedNodeSelectedIndex(index, false); 4435 } 4436 4437 - (NSUInteger)numberOfItemsInSelectMenu:(WKSelectMenuListViewController *)selectMenu 4446 4438 { 4447 4439 return self.assistedNodeSelectOptions.size(); 4448 4440 } 4449 4441 4450 - (NSString *)selectMenu:(WKSelectMenu ViewController *)selectMenu displayTextForItemAtIndex:(NSUInteger)index4442 - (NSString *)selectMenu:(WKSelectMenuListViewController *)selectMenu displayTextForItemAtIndex:(NSUInteger)index 4451 4443 { 4452 4444 auto& options = self.assistedNodeSelectOptions; … … 4459 4451 } 4460 4452 4461 - (void)selectMenu:(WKSelectMenu ViewController *)selectMenu didCheckItemAtIndex:(NSUInteger)index checked:(BOOL)checked4453 - (void)selectMenu:(WKSelectMenuListViewController *)selectMenu didCheckItemAtIndex:(NSUInteger)index checked:(BOOL)checked 4462 4454 { 4463 4455 ASSERT(_assistedNodeInformation.isMultiSelect); … … 4477 4469 } 4478 4470 4479 - (BOOL)selectMenu SupportsMultipleSelection:(WKSelectMenuViewController *)selectMenu4471 - (BOOL)selectMenuUsesMultipleSelection:(WKSelectMenuListViewController *)selectMenu 4480 4472 { 4481 4473 return _assistedNodeInformation.isMultiSelect; 4482 4474 } 4483 4475 4484 - (BOOL)selectMenu:(WKSelectMenu ViewController *)selectMenu hasCheckedOptionAtIndex:(NSUInteger)index4476 - (BOOL)selectMenu:(WKSelectMenuListViewController *)selectMenu hasSelectedOptionAtIndex:(NSUInteger)index 4485 4477 { 4486 4478 if (index >= self.assistedNodeSelectOptions.size()) { … … 4492 4484 } 4493 4485 4494 - (NSUInteger)startingIndexForSelectMenu:(WKSelectMenuViewController *)selectMenu4495 {4496 if (_assistedNodeInformation.isMultiSelect)4497 return 0;4498 4499 auto firstSelectedIndex = self.assistedNodeSelectOptions.findMatching([&] (auto& option) {4500 return option.isSelected;4501 });4502 4503 return firstSelectedIndex == notFound ? 0 : firstSelectedIndex;4504 }4505 4506 4486 #endif // ENABLE(EXTRA_ZOOM_MODE) 4507 4487 … … 4510 4490 #if ENABLE(EXTRA_ZOOM_MODE) 4511 4491 if ([_numberPadViewController handleWheelEvent:event]) 4512 return;4513 4514 if ([_selectMenuViewController handleWheelEvent:event])4515 4492 return; 4516 4493 -
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
r229745 r229916 744 744 2EB6FC01203021960017E619 /* WKTimePickerViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 2EB6FBFF203021960017E619 /* WKTimePickerViewController.h */; }; 745 745 2EB6FC02203021960017E619 /* WKTimePickerViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2EB6FC00203021960017E619 /* WKTimePickerViewController.mm */; }; 746 2EE4529F20292D2A00D81777 /* WKSelectMenuViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 2EE4529C20292BD900D81777 /* WKSelectMenuViewController.h */; };747 2EE452A020292D2E00D81777 /* WKSelectMenuViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2EE4529B20292BD800D81777 /* WKSelectMenuViewController.mm */; };748 746 2F809DD71FBD1BC9005FE63A /* TouchBarMenuItemData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F809DD51FBD1BC9005FE63A /* TouchBarMenuItemData.cpp */; }; 749 747 2F8336861FA139DF00C6E080 /* TouchBarMenuData.h in Headers */ = {isa = PBXBuildFile; fileRef = 2FD43B911FA006A10083F51C /* TouchBarMenuData.h */; }; … … 2158 2156 F44DFEB21E9E752F0038D196 /* WebIconUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = F44DFEB01E9E752F0038D196 /* WebIconUtilities.h */; }; 2159 2157 F44DFEB31E9E752F0038D196 /* WebIconUtilities.mm in Sources */ = {isa = PBXBuildFile; fileRef = F44DFEB11E9E752F0038D196 /* WebIconUtilities.mm */; }; 2158 F478E92920644EE900EE03E8 /* WKSelectMenuListViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = F478E92720644EE900EE03E8 /* WKSelectMenuListViewController.h */; }; 2159 F478E92A20644EE900EE03E8 /* WKSelectMenuListViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F478E92820644EE900EE03E8 /* WKSelectMenuListViewController.mm */; }; 2160 2160 F496A4311F58A272004C1757 /* DragDropInteractionState.h in Headers */ = {isa = PBXBuildFile; fileRef = F496A42F1F58A272004C1757 /* DragDropInteractionState.h */; }; 2161 2161 F496A4321F58A272004C1757 /* DragDropInteractionState.mm in Sources */ = {isa = PBXBuildFile; fileRef = F496A4301F58A272004C1757 /* DragDropInteractionState.mm */; }; … … 3132 3132 2EB6FBFF203021960017E619 /* WKTimePickerViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WKTimePickerViewController.h; path = ios/forms/WKTimePickerViewController.h; sourceTree = "<group>"; }; 3133 3133 2EB6FC00203021960017E619 /* WKTimePickerViewController.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = WKTimePickerViewController.mm; path = ios/forms/WKTimePickerViewController.mm; sourceTree = "<group>"; }; 3134 2EE4529B20292BD800D81777 /* WKSelectMenuViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKSelectMenuViewController.mm; path = ios/forms/WKSelectMenuViewController.mm; sourceTree = "<group>"; };3135 2EE4529C20292BD900D81777 /* WKSelectMenuViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKSelectMenuViewController.h; path = ios/forms/WKSelectMenuViewController.h; sourceTree = "<group>"; };3136 3134 2F809DD51FBD1BC9005FE63A /* TouchBarMenuItemData.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TouchBarMenuItemData.cpp; sourceTree = "<group>"; }; 3137 3135 2F809DD91FBD1BF2005FE63A /* TouchBarMenuItemData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TouchBarMenuItemData.h; sourceTree = "<group>"; }; … … 4698 4696 F44DFEB01E9E752F0038D196 /* WebIconUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebIconUtilities.h; path = ios/WebIconUtilities.h; sourceTree = "<group>"; }; 4699 4697 F44DFEB11E9E752F0038D196 /* WebIconUtilities.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebIconUtilities.mm; path = ios/WebIconUtilities.mm; sourceTree = "<group>"; }; 4698 F478E92720644EE900EE03E8 /* WKSelectMenuListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKSelectMenuListViewController.h; sourceTree = "<group>"; }; 4699 F478E92820644EE900EE03E8 /* WKSelectMenuListViewController.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = WKSelectMenuListViewController.mm; sourceTree = "<group>"; }; 4700 4700 F496A42F1F58A272004C1757 /* DragDropInteractionState.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = DragDropInteractionState.h; path = ios/DragDropInteractionState.h; sourceTree = "<group>"; }; 4701 4701 F496A4301F58A272004C1757 /* DragDropInteractionState.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = DragDropInteractionState.mm; path = ios/DragDropInteractionState.mm; sourceTree = "<group>"; }; … … 8466 8466 2EA7B3CF2026CEF8009CE5AC /* WKNumberPadViewController.h */, 8467 8467 2EA7B3D02026CEF8009CE5AC /* WKNumberPadViewController.mm */, 8468 2EE4529C20292BD900D81777 /* WKSelectMenuViewController.h */,8469 2EE4529B20292BD800D81777 /* WKSelectMenuViewController.mm */,8468 F478E92720644EE900EE03E8 /* WKSelectMenuListViewController.h */, 8469 F478E92820644EE900EE03E8 /* WKSelectMenuListViewController.mm */, 8470 8470 2E16B69F2016E680008996D6 /* WKTextFormControlViewController.h */, 8471 8471 2E16B6A02016E680008996D6 /* WKTextFormControlViewController.mm */, … … 9669 9669 51CD1C671B34B9DF00142CA5 /* WKSecurityOriginInternal.h in Headers */, 9670 9670 51CD1C5E1B3493B400142CA5 /* WKSecurityOriginRef.h in Headers */, 9671 2EE4529F20292D2A00D81777 /* WKSelectMenuViewController.h in Headers */,9671 F478E92920644EE900EE03E8 /* WKSelectMenuListViewController.h in Headers */, 9672 9672 BC407604124FF0270068F20A /* WKSerializedScriptValue.h in Headers */, 9673 9673 1ADE46B31954EC61000F7985 /* WKSessionStateRef.h in Headers */, … … 11317 11317 51CD1C661B34B9DC00142CA5 /* WKSecurityOrigin.mm in Sources */, 11318 11318 51CD1C5D1B3493AF00142CA5 /* WKSecurityOriginRef.cpp in Sources */, 11319 2EE452A020292D2E00D81777 /* WKSelectMenuViewController.mm in Sources */,11319 F478E92A20644EE900EE03E8 /* WKSelectMenuListViewController.mm in Sources */, 11320 11320 BC407603124FF0270068F20A /* WKSerializedScriptValue.cpp in Sources */, 11321 11321 1ADE46B21954EC61000F7985 /* WKSessionStateRef.cpp in Sources */,
Note: See TracChangeset
for help on using the changeset viewer.