Title: [261665] trunk/Source/WebKit
- Revision
- 261665
- Author
- megan_gard...@apple.com
- Date
- 2020-05-13 17:35:40 -0700 (Wed, 13 May 2020)
Log Message
Unreviewed Build Fix.
* UIProcess/ios/PageClientImplIOS.mm:
(WebKit::PageClientImpl::setMouseEventPolicy):
* UIProcess/ios/forms/WKDateTimeInputControl.mm:
(-[WKDateTimePicker dealloc]):
(-[WKDateTimePicker controlBeginEditing]):
(-[WKDateTimePicker controlEndEditing]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (261664 => 261665)
--- trunk/Source/WebKit/ChangeLog 2020-05-14 00:21:50 UTC (rev 261664)
+++ trunk/Source/WebKit/ChangeLog 2020-05-14 00:35:40 UTC (rev 261665)
@@ -1,3 +1,14 @@
+2020-05-13 Megan Gardner <megan_gard...@apple.com>
+
+ Unreviewed Build Fix.
+
+ * UIProcess/ios/PageClientImplIOS.mm:
+ (WebKit::PageClientImpl::setMouseEventPolicy):
+ * UIProcess/ios/forms/WKDateTimeInputControl.mm:
+ (-[WKDateTimePicker dealloc]):
+ (-[WKDateTimePicker controlBeginEditing]):
+ (-[WKDateTimePicker controlEndEditing]):
+
2020-05-13 Kate Cheney <katherine_che...@apple.com>
SHOULD NEVER BE REACHED in WebKit::ResourceLoadStatisticsDatabaseStore::openAndUpdateSchemaIfNecessary
Modified: trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm (261664 => 261665)
--- trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm 2020-05-14 00:21:50 UTC (rev 261664)
+++ trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm 2020-05-14 00:35:40 UTC (rev 261665)
@@ -963,7 +963,9 @@
void PageClientImpl::setMouseEventPolicy(WebCore::MouseEventPolicy policy)
{
+#if HAVE(UIKIT_WITH_MOUSE_SUPPORT)
[m_contentView _setMouseEventPolicy:policy];
+#endif
}
} // namespace WebKit
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKDateTimeInputControl.mm (261664 => 261665)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKDateTimeInputControl.mm 2020-05-14 00:21:50 UTC (rev 261664)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKDateTimeInputControl.mm 2020-05-14 00:35:40 UTC (rev 261665)
@@ -255,7 +255,9 @@
- (void)dealloc
{
[_datePicker removeTarget:self action:NULL forControlEvents:UIControlEventValueChanged];
+#if USE(UICONTEXTMENU)
[self removeContextMenuInteraction];
+#endif
[super dealloc];
}
@@ -369,10 +371,12 @@
_initialValueAsNumber = _view.focusedElementInformation.valueAsNumber;
[self setDateTimePickerToInitialValue];
+#if USE(UICONTEXTMENU)
WebKit::InteractionInformationRequest positionInformationRequest { WebCore::IntPoint(_view.focusedElementInformation.lastInteractionLocation) };
[_view doAfterPositionInformationUpdate:^(WebKit::InteractionInformationAtPosition interactionInformation) {
[self showDateTimePicker];
} forRequest:positionInformationRequest];
+#endif
}
@@ -395,7 +399,9 @@
[_view releaseFocus];
_preservingFocus = NO;
}
+#if USE(UICONTEXTMENU)
[self removeContextMenuInteraction];
+#endif
}
@end
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
