Attachment 369813 Details for Bug 197867 – Patch

[patch] Patch

bug-197867-20190513194626.patch (text/plain), 7.59 KB, created by Wenson Hsieh on 2019-05-13 19:46:27 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Wenson Hsieh

Created: 2019-05-13 19:46:27 PDT

Size: 7.59 KB

patch

obsolete

>Subversion Revision: 245270
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 447dc476f4cfcba9f12c2544f5241993f91f17c2..da8d8e9fd937031d17c4283f1eb9329bc9d5c69c 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,29 @@
>+2019-05-13  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        Followup to r245267: fix some more deprecated uses of -[UIApplication interfaceOrientation]
>+        https://bugs.webkit.org/show_bug.cgi?id=197867
>+        <rdar://problem/50743963>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add a helper method on WKContentView that asks the view's window's scene for an interface orientation; then,
>+        use this helper from various places in WebKit instead of invoking -[UIApplication interfaceOrientation]
>+        directly. No change in behavior.
>+
>+        * UIProcess/ios/WKContentView.h:
>+        * UIProcess/ios/WKContentView.mm:
>+        (-[WKContentView interfaceOrientation]):
>+        * UIProcess/ios/WebDataListSuggestionsDropdownIOS.mm:
>+        (-[WKDataListSuggestionsPicker initWithInformation:inView:]):
>+        * UIProcess/ios/forms/WKFormColorPicker.mm:
>+        (-[WKColorPicker initWithView:]):
>+        * UIProcess/ios/forms/WKFormInputControl.mm:
>+        (-[WKDateTimePicker initWithView:datePickerMode:]):
>+        * UIProcess/ios/forms/WKFormSelectPicker.mm:
>+        (-[WKMultipleSelectPicker initWithView:]):
>+        * UIProcess/ios/forms/WKFormSelectPopover.mm:
>+        (-[WKSelectPopover initWithView:hasGroups:]):
>+
> 2019-05-13  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [iOS] When running layout tests that tap in the same location, subsequent tests fail to fire click handlers
>diff --git a/Source/WebKit/UIProcess/ios/WKContentView.h b/Source/WebKit/UIProcess/ios/WKContentView.h
>index daa39102c7d82e1adae4b5a669d5ee76197fffc3..2d5101b2c8566a94a0dccebe8c118fb6ed413a55 100644
>--- a/Source/WebKit/UIProcess/ios/WKContentView.h
>+++ b/Source/WebKit/UIProcess/ios/WKContentView.h
>@@ -67,6 +67,7 @@ class WebProcessPool;
> @property (nonatomic, getter=isShowingInspectorIndication) BOOL showingInspectorIndication;
> @property (nonatomic, readonly, getter=isResigningFirstResponder) BOOL resigningFirstResponder;
> @property (nonatomic) BOOL sizeChangedSinceLastVisibleContentRectUpdate;
>+@property (nonatomic, readonly) UIInterfaceOrientation interfaceOrientation;
> 
> - (instancetype)initWithFrame:(CGRect)frame processPool:(WebKit::WebProcessPool&)processPool configuration:(Ref<API::PageConfiguration>&&)configuration webView:(WKWebView *)webView;
> 
>diff --git a/Source/WebKit/UIProcess/ios/WKContentView.mm b/Source/WebKit/UIProcess/ios/WKContentView.mm
>index ab68809c9dac65f09545cd05f61ac6a25e064ace..44cb9a121c1e252dc27779ab3f9346d42d985d73 100644
>--- a/Source/WebKit/UIProcess/ios/WKContentView.mm
>+++ b/Source/WebKit/UIProcess/ios/WKContentView.mm
>@@ -547,6 +547,15 @@ - (NSUndoManager *)undoManager
> 
> #pragma mark Internal
> 
>+- (UIInterfaceOrientation)interfaceOrientation
>+{
>+#if HAVE(UISCENE)
>+    return self.window.windowScene.interfaceOrientation;
>+#else
>+    return UIApp.interfaceOrientation;
>+#endif
>+}
>+
> - (void)_windowDidMoveToScreenNotification:(NSNotification *)notification
> {
>     ASSERT(notification.object == self.window);
>diff --git a/Source/WebKit/UIProcess/ios/WebDataListSuggestionsDropdownIOS.mm b/Source/WebKit/UIProcess/ios/WebDataListSuggestionsDropdownIOS.mm
>index 5005ae68e1d131d7e463c8c6a8bec9a4bb4ee5bd..d11a96d5d2f21e5ba995e066dd87f0202413be09 100644
>--- a/Source/WebKit/UIProcess/ios/WebDataListSuggestionsDropdownIOS.mm
>+++ b/Source/WebKit/UIProcess/ios/WebDataListSuggestionsDropdownIOS.mm
>@@ -211,12 +211,7 @@ - (instancetype)initWithInformation:(WebCore::DataListSuggestionInformation&&)in
>     [_pickerView setDataSource:self];
>     [_pickerView setDelegate:self];
>     [_pickerView setControl:self];
>-#if HAVE(UISCENE)
>-    auto interfaceOrientation = view.window.windowScene.interfaceOrientation;
>-#else
>-    auto interfaceOrientation = UIApp.interfaceOrientation;
>-#endif
>-    [_pickerView setSize:[UIKeyboard defaultSizeForInterfaceOrientation:interfaceOrientation]];
>+    [_pickerView setSize:[UIKeyboard defaultSizeForInterfaceOrientation:view.interfaceOrientation]];
> 
>     return self;
> }
>diff --git a/Source/WebKit/UIProcess/ios/forms/WKFormColorPicker.mm b/Source/WebKit/UIProcess/ios/forms/WKFormColorPicker.mm
>index daac90aa0f8b5d642f627c8e8c27604397b3e2ef..45bb8462c12e69eb32c604759ea588393caf353d 100644
>--- a/Source/WebKit/UIProcess/ios/forms/WKFormColorPicker.mm
>+++ b/Source/WebKit/UIProcess/ios/forms/WKFormColorPicker.mm
>@@ -179,7 +179,7 @@ - (instancetype)initWithView:(WKContentView *)view
>     if (currentUserInterfaceIdiomIsPad())
>         colorPickerSize = CGSizeMake(pickerWidthForPopover, pickerWidthForPopover);
>     else {
>-        CGSize keyboardSize = [UIKeyboard defaultSizeForInterfaceOrientation:[UIApp interfaceOrientation]];
>+        auto keyboardSize = [UIKeyboard defaultSizeForInterfaceOrientation:view.interfaceOrientation];
>         colorPickerSize = CGSizeMake(keyboardSize.width, keyboardSize.height + additionalKeyboardAffordance);
>     }
> 
>diff --git a/Source/WebKit/UIProcess/ios/forms/WKFormInputControl.mm b/Source/WebKit/UIProcess/ios/forms/WKFormInputControl.mm
>index f57866a112cbd5e907b474c31daea48843a1da53..8384ace6f95a1fa195cfb35de6dd6f47807e990a 100644
>--- a/Source/WebKit/UIProcess/ios/forms/WKFormInputControl.mm
>+++ b/Source/WebKit/UIProcess/ios/forms/WKFormInputControl.mm
>@@ -106,7 +106,7 @@ - (id)initWithView:(WKContentView *)view datePickerMode:(UIDatePickerMode)mode
>         break;
>    }
> 
>-    CGSize size = currentUserInterfaceIdiomIsPad() ? [UIPickerView defaultSizeForCurrentOrientation] : [UIKeyboard defaultSizeForInterfaceOrientation:[UIApp interfaceOrientation]];
>+    auto size = currentUserInterfaceIdiomIsPad() ? [UIPickerView defaultSizeForCurrentOrientation] : [UIKeyboard defaultSizeForInterfaceOrientation:view.interfaceOrientation];
> 
>     _datePicker = adoptNS([[UIDatePicker alloc] initWithFrame:CGRectMake(0, 0, size.width, size.height)]);
>     _datePicker.get().datePickerMode = mode;
>diff --git a/Source/WebKit/UIProcess/ios/forms/WKFormSelectPicker.mm b/Source/WebKit/UIProcess/ios/forms/WKFormSelectPicker.mm
>index 520aa148b464f749d96c4802a0c65c9add76e452..d032d453e69b200a13b761df4e26d0d0bf33faf0 100644
>--- a/Source/WebKit/UIProcess/ios/forms/WKFormSelectPicker.mm
>+++ b/Source/WebKit/UIProcess/ios/forms/WKFormSelectPicker.mm
>@@ -161,7 +161,7 @@ - (instancetype)initWithView:(WKContentView *)view
>     ALLOW_DEPRECATED_DECLARATIONS_END
> 
>     [self setAllowsMultipleSelection:_allowsMultipleSelection];
>-    [self setSize:[UIKeyboard defaultSizeForInterfaceOrientation:[UIApp interfaceOrientation]]];
>+    [self setSize:[UIKeyboard defaultSizeForInterfaceOrientation:view.interfaceOrientation]];
>     [self reloadAllComponents];
> 
>     if (!_allowsMultipleSelection) {
>diff --git a/Source/WebKit/UIProcess/ios/forms/WKFormSelectPopover.mm b/Source/WebKit/UIProcess/ios/forms/WKFormSelectPopover.mm
>index 55496902e73312d957567db0abf75d846eab19d8..891a546b193dd33a9b43a9939e99f66456112f35 100644
>--- a/Source/WebKit/UIProcess/ios/forms/WKFormSelectPopover.mm
>+++ b/Source/WebKit/UIProcess/ios/forms/WKFormSelectPopover.mm
>@@ -395,7 +395,7 @@ - (instancetype)initWithView:(WKContentView *)view hasGroups:(BOOL)hasGroups
>     
>     CGRect frame;
>     frame.origin = CGPointZero;
>-    frame.size = [UIKeyboard defaultSizeForInterfaceOrientation:[UIApp interfaceOrientation]];
>+    frame.size = [UIKeyboard defaultSizeForInterfaceOrientation:view.interfaceOrientation];
> 
>     _tableViewController = adoptNS([[WKSelectTableViewController alloc] initWithView:view hasGroups:hasGroups]);
>     [_tableViewController setPopover:self];

Actions: View | Formatted Diff | Diff

Attachments on bug 197867: 369813 | 369815