- Revision
- 282994
- Author
- [email protected]
- Date
- 2021-09-23 13:13:57 -0700 (Thu, 23 Sep 2021)
Log Message
Cherry-pick r281579. rdar://problem/83461036
[iOS] Crash when tapping <select> element and calling window.open()
https://bugs.webkit.org/show_bug.cgi?id=229468
rdar://82122972
Reviewed by Wenson Hsieh.
Source/WebKit:
UIKit throws an exception when attempting to present a context menu
for a view that is not in a window.
One instance where this can occur in Safari is when a call to
window.open() is made in response to a touch on a select element.
In this scenario, the call to window.open() opens a new tab, unparenting
the current webview. However, the touch also focuses the element, and
WebKit attempts to present a context menu in an unparented view.
To fix, guard against the case where the view is not parented, and do
not attempt to present a context menu.
Test: fast/forms/ios/show-select-menu-in-unparented-view-crash.html
* UIProcess/ios/WKActionSheetAssistant.mm:
Note that the helper method used in other classes is not used in
WKActionSheetAssistant, since the hosting view is not always a
WKContentView.
(-[WKActionSheetAssistant showDataDetectorsUIForPositionInformation:]):
(-[WKActionSheetAssistant showMediaControlsContextMenu:items:completionHandler:]):
* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView presentContextMenu:atLocation:]):
Added a helper method to ensure the view is parented prior to presenting
a context menu.
(-[WKContentView imageAnalysisGestureDidTimeOut:]):
* UIProcess/ios/WebDataListSuggestionsDropdownIOS.mm:
(-[WKDataListSuggestionsDropdown _showSuggestions]):
* UIProcess/ios/forms/WKDateTimeInputControl.mm:
(-[WKDateTimePicker showDateTimePicker]):
* UIProcess/ios/forms/WKFileUploadPanel.mm:
(-[WKFileUploadPanel showDocumentPickerMenu]):
* UIProcess/ios/forms/WKFormSelectPicker.mm:
(-[WKSelectPicker showSelectPicker]):
LayoutTests:
Added a test to verify a crash does not occur when tapping a <select>
element and unparenting the webview.
* fast/forms/ios/show-select-menu-in-unparented-view-crash-expected.txt: Added.
* fast/forms/ios/show-select-menu-in-unparented-view-crash.html: Added.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281579 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Added Paths
Diff
Modified: branches/safari-612-branch/LayoutTests/ChangeLog (282993 => 282994)
--- branches/safari-612-branch/LayoutTests/ChangeLog 2021-09-23 20:13:52 UTC (rev 282993)
+++ branches/safari-612-branch/LayoutTests/ChangeLog 2021-09-23 20:13:57 UTC (rev 282994)
@@ -1,3 +1,79 @@
+2021-09-23 Russell Epstein <[email protected]>
+
+ Cherry-pick r281579. rdar://problem/83461036
+
+ [iOS] Crash when tapping <select> element and calling window.open()
+ https://bugs.webkit.org/show_bug.cgi?id=229468
+ rdar://82122972
+
+ Reviewed by Wenson Hsieh.
+
+ Source/WebKit:
+
+ UIKit throws an exception when attempting to present a context menu
+ for a view that is not in a window.
+
+ One instance where this can occur in Safari is when a call to
+ window.open() is made in response to a touch on a select element.
+ In this scenario, the call to window.open() opens a new tab, unparenting
+ the current webview. However, the touch also focuses the element, and
+ WebKit attempts to present a context menu in an unparented view.
+
+ To fix, guard against the case where the view is not parented, and do
+ not attempt to present a context menu.
+
+ Test: fast/forms/ios/show-select-menu-in-unparented-view-crash.html
+
+ * UIProcess/ios/WKActionSheetAssistant.mm:
+
+ Note that the helper method used in other classes is not used in
+ WKActionSheetAssistant, since the hosting view is not always a
+ WKContentView.
+
+ (-[WKActionSheetAssistant showDataDetectorsUIForPositionInformation:]):
+ (-[WKActionSheetAssistant showMediaControlsContextMenu:items:completionHandler:]):
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView presentContextMenu:atLocation:]):
+
+ Added a helper method to ensure the view is parented prior to presenting
+ a context menu.
+
+ (-[WKContentView imageAnalysisGestureDidTimeOut:]):
+ * UIProcess/ios/WebDataListSuggestionsDropdownIOS.mm:
+ (-[WKDataListSuggestionsDropdown _showSuggestions]):
+ * UIProcess/ios/forms/WKDateTimeInputControl.mm:
+ (-[WKDateTimePicker showDateTimePicker]):
+ * UIProcess/ios/forms/WKFileUploadPanel.mm:
+ (-[WKFileUploadPanel showDocumentPickerMenu]):
+ * UIProcess/ios/forms/WKFormSelectPicker.mm:
+ (-[WKSelectPicker showSelectPicker]):
+
+ LayoutTests:
+
+ Added a test to verify a crash does not occur when tapping a <select>
+ element and unparenting the webview.
+
+ * fast/forms/ios/show-select-menu-in-unparented-view-crash-expected.txt: Added.
+ * fast/forms/ios/show-select-menu-in-unparented-view-crash.html: Added.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281579 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-08-25 Aditya Keerthi <[email protected]>
+
+ [iOS] Crash when tapping <select> element and calling window.open()
+ https://bugs.webkit.org/show_bug.cgi?id=229468
+ rdar://82122972
+
+ Reviewed by Wenson Hsieh.
+
+ Added a test to verify a crash does not occur when tapping a <select>
+ element and unparenting the webview.
+
+ * fast/forms/ios/show-select-menu-in-unparented-view-crash-expected.txt: Added.
+ * fast/forms/ios/show-select-menu-in-unparented-view-crash.html: Added.
+
2021-09-22 Alan Coon <[email protected]>
Cherry-pick r280705. rdar://problem/83430104
Added: branches/safari-612-branch/LayoutTests/fast/forms/ios/show-select-menu-in-unparented-view-crash-expected.txt (0 => 282994)
--- branches/safari-612-branch/LayoutTests/fast/forms/ios/show-select-menu-in-unparented-view-crash-expected.txt (rev 0)
+++ branches/safari-612-branch/LayoutTests/fast/forms/ios/show-select-menu-in-unparented-view-crash-expected.txt 2021-09-23 20:13:57 UTC (rev 282994)
@@ -0,0 +1,9 @@
+This test verifies that tapping on a select element and then unparenting the webview does not result in a crash.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: branches/safari-612-branch/LayoutTests/fast/forms/ios/show-select-menu-in-unparented-view-crash.html (0 => 282994)
--- branches/safari-612-branch/LayoutTests/fast/forms/ios/show-select-menu-in-unparented-view-crash.html (rev 0)
+++ branches/safari-612-branch/LayoutTests/fast/forms/ios/show-select-menu-in-unparented-view-crash.html 2021-09-23 20:13:57 UTC (rev 282994)
@@ -0,0 +1,42 @@
+<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true ] -->
+<html>
+ <head>
+ <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+ <script src=""
+ <script src=""
+ </head>
+<body>
+<select id="select">
+ <option>January</option>
+ <option>February</option>
+ <option>March</option>
+ <option>April</option>
+ <option>May</option>
+ <option>June</option>
+ <option>July</option>
+ <option>August</option>
+ <option>September</option>
+ <option>October</option>
+ <option>November</option>
+ <option>December</option>
+</select>
+</body>
+<script>
+jsTestIsAsync = true;
+
+addEventListener("load", async () => {
+ description("This test verifies that tapping on a select element and then unparenting the webview does not result in a crash.");
+
+ select.addEventListener("touchstart", () => {
+ UIHelper.removeViewFromWindow();
+ });
+
+ select.addEventListener("focus", async () => {
+ await UIHelper.ensurePresentationUpdate();
+ finishJSTest();
+ });
+
+ UIHelper.activateElement(select);
+});
+</script>
+</html>
Modified: branches/safari-612-branch/Source/WebKit/ChangeLog (282993 => 282994)
--- branches/safari-612-branch/Source/WebKit/ChangeLog 2021-09-23 20:13:52 UTC (rev 282993)
+++ branches/safari-612-branch/Source/WebKit/ChangeLog 2021-09-23 20:13:57 UTC (rev 282994)
@@ -1,5 +1,114 @@
2021-09-23 Russell Epstein <[email protected]>
+ Cherry-pick r281579. rdar://problem/83461036
+
+ [iOS] Crash when tapping <select> element and calling window.open()
+ https://bugs.webkit.org/show_bug.cgi?id=229468
+ rdar://82122972
+
+ Reviewed by Wenson Hsieh.
+
+ Source/WebKit:
+
+ UIKit throws an exception when attempting to present a context menu
+ for a view that is not in a window.
+
+ One instance where this can occur in Safari is when a call to
+ window.open() is made in response to a touch on a select element.
+ In this scenario, the call to window.open() opens a new tab, unparenting
+ the current webview. However, the touch also focuses the element, and
+ WebKit attempts to present a context menu in an unparented view.
+
+ To fix, guard against the case where the view is not parented, and do
+ not attempt to present a context menu.
+
+ Test: fast/forms/ios/show-select-menu-in-unparented-view-crash.html
+
+ * UIProcess/ios/WKActionSheetAssistant.mm:
+
+ Note that the helper method used in other classes is not used in
+ WKActionSheetAssistant, since the hosting view is not always a
+ WKContentView.
+
+ (-[WKActionSheetAssistant showDataDetectorsUIForPositionInformation:]):
+ (-[WKActionSheetAssistant showMediaControlsContextMenu:items:completionHandler:]):
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView presentContextMenu:atLocation:]):
+
+ Added a helper method to ensure the view is parented prior to presenting
+ a context menu.
+
+ (-[WKContentView imageAnalysisGestureDidTimeOut:]):
+ * UIProcess/ios/WebDataListSuggestionsDropdownIOS.mm:
+ (-[WKDataListSuggestionsDropdown _showSuggestions]):
+ * UIProcess/ios/forms/WKDateTimeInputControl.mm:
+ (-[WKDateTimePicker showDateTimePicker]):
+ * UIProcess/ios/forms/WKFileUploadPanel.mm:
+ (-[WKFileUploadPanel showDocumentPickerMenu]):
+ * UIProcess/ios/forms/WKFormSelectPicker.mm:
+ (-[WKSelectPicker showSelectPicker]):
+
+ LayoutTests:
+
+ Added a test to verify a crash does not occur when tapping a <select>
+ element and unparenting the webview.
+
+ * fast/forms/ios/show-select-menu-in-unparented-view-crash-expected.txt: Added.
+ * fast/forms/ios/show-select-menu-in-unparented-view-crash.html: Added.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281579 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-08-25 Aditya Keerthi <[email protected]>
+
+ [iOS] Crash when tapping <select> element and calling window.open()
+ https://bugs.webkit.org/show_bug.cgi?id=229468
+ rdar://82122972
+
+ Reviewed by Wenson Hsieh.
+
+ UIKit throws an exception when attempting to present a context menu
+ for a view that is not in a window.
+
+ One instance where this can occur in Safari is when a call to
+ window.open() is made in response to a touch on a select element.
+ In this scenario, the call to window.open() opens a new tab, unparenting
+ the current webview. However, the touch also focuses the element, and
+ WebKit attempts to present a context menu in an unparented view.
+
+ To fix, guard against the case where the view is not parented, and do
+ not attempt to present a context menu.
+
+ Test: fast/forms/ios/show-select-menu-in-unparented-view-crash.html
+
+ * UIProcess/ios/WKActionSheetAssistant.mm:
+
+ Note that the helper method used in other classes is not used in
+ WKActionSheetAssistant, since the hosting view is not always a
+ WKContentView.
+
+ (-[WKActionSheetAssistant showDataDetectorsUIForPositionInformation:]):
+ (-[WKActionSheetAssistant showMediaControlsContextMenu:items:completionHandler:]):
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView presentContextMenu:atLocation:]):
+
+ Added a helper method to ensure the view is parented prior to presenting
+ a context menu.
+
+ (-[WKContentView imageAnalysisGestureDidTimeOut:]):
+ * UIProcess/ios/WebDataListSuggestionsDropdownIOS.mm:
+ (-[WKDataListSuggestionsDropdown _showSuggestions]):
+ * UIProcess/ios/forms/WKDateTimeInputControl.mm:
+ (-[WKDateTimePicker showDateTimePicker]):
+ * UIProcess/ios/forms/WKFileUploadPanel.mm:
+ (-[WKFileUploadPanel showDocumentPickerMenu]):
+ * UIProcess/ios/forms/WKFormSelectPicker.mm:
+ (-[WKSelectPicker showSelectPicker]):
+
+2021-09-23 Russell Epstein <[email protected]>
+
Cherry-pick r281352. rdar://problem/83461013
[macCatalyst] Crash when clicking a phone number link
Modified: branches/safari-612-branch/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm (282993 => 282994)
--- branches/safari-612-branch/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm 2021-09-23 20:13:52 UTC (rev 282993)
+++ branches/safari-612-branch/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm 2021-09-23 20:13:57 UTC (rev 282994)
@@ -770,7 +770,8 @@
return;
#if USE(UICONTEXTMENU) && HAVE(UICONTEXTMENU_LOCATION)
- [self._ensureDataDetectorContextMenuInteraction _presentMenuAtLocation:_positionInformation->request.point];
+ if ([_view window])
+ [self._ensureDataDetectorContextMenuInteraction _presentMenuAtLocation:_positionInformation->request.point];
#else
NSMutableArray *elementActions = [NSMutableArray array];
for (NSUInteger actionNumber = 0; actionNumber < [dataDetectorsActions count]; actionNumber++) {
@@ -831,7 +832,7 @@
items = WTFMove(items[0].children);
}
- if (items.isEmpty()) {
+ if (![_view window] || items.isEmpty()) {
completionHandler(WebCore::MediaControlsContextMenuItem::invalidID);
return;
}
Modified: branches/safari-612-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h (282993 => 282994)
--- branches/safari-612-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h 2021-09-23 20:13:52 UTC (rev 282993)
+++ branches/safari-612-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h 2021-09-23 20:13:57 UTC (rev 282994)
@@ -728,6 +728,8 @@
#if USE(UICONTEXTMENU)
- (UIView *)textEffectsWindow;
+- (void)presentContextMenu:(UIContextMenuInteraction *)contextMenuInteraction atLocation:(CGPoint)location;
+
- (UITargetedPreview *)_createTargetedContextMenuHintPreviewForFocusedElement;
- (UITargetedPreview *)_createTargetedContextMenuHintPreviewIfPossible;
- (void)_removeContextMenuHintContainerIfPossible;
Modified: branches/safari-612-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (282993 => 282994)
--- branches/safari-612-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2021-09-23 20:13:52 UTC (rev 282993)
+++ branches/safari-612-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2021-09-23 20:13:57 UTC (rev 282994)
@@ -8753,6 +8753,14 @@
[self _removeContainerForContextMenuHintPreviews];
}
+- (void)presentContextMenu:(UIContextMenuInteraction *)contextMenuInteraction atLocation:(CGPoint) location
+{
+ if (!self.window)
+ return;
+
+ [contextMenuInteraction _presentMenuAtLocation:location];
+}
+
#endif // USE(UICONTEXTMENU)
#if HAVE(UI_WK_DOCUMENT_CONTEXT)
@@ -10445,7 +10453,7 @@
[strongSelf _updateContextMenuForMachineReadableCodeForImageAnalysis:result];
#endif // ENABLE(IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
strongSelf->_contextMenuWasTriggeredByImageAnalysisTimeout = YES;
- [strongSelf->_contextMenuInteraction _presentMenuAtLocation:location];
+ [strongSelf presentContextMenu:strongSelf->_contextMenuInteraction.get() atLocation:location];
#else
UNUSED_PARAM(location);
#endif // USE(UICONTEXTMENU)
Modified: branches/safari-612-branch/Source/WebKit/UIProcess/ios/WebDataListSuggestionsDropdownIOS.mm (282993 => 282994)
--- branches/safari-612-branch/Source/WebKit/UIProcess/ios/WebDataListSuggestionsDropdownIOS.mm 2021-09-23 20:13:52 UTC (rev 282993)
+++ branches/safari-612-branch/Source/WebKit/UIProcess/ios/WebDataListSuggestionsDropdownIOS.mm 2021-09-23 20:13:57 UTC (rev 282994)
@@ -473,7 +473,8 @@
if (!strongSelf)
return;
- [strongSelf->_suggestionsContextMenuInteraction _presentMenuAtLocation:[[strongSelf view] lastInteractionLocation]];
+ auto view = [strongSelf view];
+ [view presentContextMenu:strongSelf->_suggestionsContextMenuInteraction.get() atLocation:[view lastInteractionLocation]];
}];
} else {
[_suggestionsContextMenuInteraction updateVisibleMenuWithBlock:[&](UIMenu *visibleMenu) -> UIMenu * {
Modified: branches/safari-612-branch/Source/WebKit/UIProcess/ios/forms/WKDateTimeInputControl.mm (282993 => 282994)
--- branches/safari-612-branch/Source/WebKit/UIProcess/ios/forms/WKDateTimeInputControl.mm 2021-09-23 20:13:52 UTC (rev 282993)
+++ branches/safari-612-branch/Source/WebKit/UIProcess/ios/forms/WKDateTimeInputControl.mm 2021-09-23 20:13:57 UTC (rev 282994)
@@ -513,7 +513,7 @@
[_view.webView _didShowContextMenu];
#elif USE(UICONTEXTMENU) && HAVE(UICONTEXTMENU_LOCATION)
[self ensureContextMenuInteraction];
- [_dateTimeContextMenuInteraction _presentMenuAtLocation:_interactionPoint];
+ [_view presentContextMenu:_dateTimeContextMenuInteraction.get() atLocation:_interactionPoint];
#endif
}
Modified: branches/safari-612-branch/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm (282993 => 282994)
--- branches/safari-612-branch/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm 2021-09-23 20:13:52 UTC (rev 282993)
+++ branches/safari-612-branch/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm 2021-09-23 20:13:57 UTC (rev 282994)
@@ -531,7 +531,7 @@
#if HAVE(UICONTEXTMENU_LOCATION)
if (_allowedImagePickerTypes.containsAny({ WKFileUploadPanelImagePickerType::Image, WKFileUploadPanelImagePickerType::Video })) {
[self ensureContextMenuInteraction];
- [_documentContextMenuInteraction _presentMenuAtLocation:_interactionPoint];
+ [_view presentContextMenu:_documentContextMenuInteraction.get() atLocation:_interactionPoint];
} else // Image and Video types are not accepted so bypass the menu and open the file picker directly.
#endif
[self showFilePickerMenu];
Modified: branches/safari-612-branch/Source/WebKit/UIProcess/ios/forms/WKFormSelectPicker.mm (282993 => 282994)
--- branches/safari-612-branch/Source/WebKit/UIProcess/ios/forms/WKFormSelectPicker.mm 2021-09-23 20:13:52 UTC (rev 282993)
+++ branches/safari-612-branch/Source/WebKit/UIProcess/ios/forms/WKFormSelectPicker.mm 2021-09-23 20:13:57 UTC (rev 282994)
@@ -717,7 +717,7 @@
- (void)showSelectPicker
{
[self ensureContextMenuInteraction];
- [_selectContextMenuInteraction _presentMenuAtLocation:_interactionPoint];
+ [_view presentContextMenu:_selectContextMenuInteraction.get() atLocation:_interactionPoint];
}
#endif // USE(UICONTEXTMENU)
