Title: [260218] trunk/Source/WebKit
- Revision
- 260218
- Author
- [email protected]
- Date
- 2020-04-16 13:38:32 -0700 (Thu, 16 Apr 2020)
Log Message
Fix the iOS build when building without EDITABLE_REGION after r260192
(https://bugs.webkit.org/show_bug.cgi?id=210398)
Have -_mayContainEditableElementsInRect compile-time conditionally call WebKit::mayContainEditableElementsInRect().
If ENABLE(EDITABLE_REGION) is not enabled then return NO.
* UIProcess/API/ios/WKWebViewTestingIOS.mm:
(-[WKWebView _mayContainEditableElementsInRect:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (260217 => 260218)
--- trunk/Source/WebKit/ChangeLog 2020-04-16 20:27:12 UTC (rev 260217)
+++ trunk/Source/WebKit/ChangeLog 2020-04-16 20:38:32 UTC (rev 260218)
@@ -1,3 +1,14 @@
+2020-04-16 Daniel Bates <[email protected]>
+
+ Fix the iOS build when building without EDITABLE_REGION after r260192
+ (https://bugs.webkit.org/show_bug.cgi?id=210398)
+
+ Have -_mayContainEditableElementsInRect compile-time conditionally call WebKit::mayContainEditableElementsInRect().
+ If ENABLE(EDITABLE_REGION) is not enabled then return NO.
+
+ * UIProcess/API/ios/WKWebViewTestingIOS.mm:
+ (-[WKWebView _mayContainEditableElementsInRect:]):
+
2020-04-16 David Kilzer <[email protected]>
Rollout: [IPC Hardening] MachMessage::create() should use checked arithmetic
Modified: trunk/Source/WebKit/UIProcess/API/ios/WKWebViewTestingIOS.mm (260217 => 260218)
--- trunk/Source/WebKit/UIProcess/API/ios/WKWebViewTestingIOS.mm 2020-04-16 20:27:12 UTC (rev 260217)
+++ trunk/Source/WebKit/UIProcess/API/ios/WKWebViewTestingIOS.mm 2020-04-16 20:38:32 UTC (rev 260218)
@@ -80,7 +80,11 @@
- (BOOL)_mayContainEditableElementsInRect:(CGRect)rect
{
+#if ENABLE(EDITABLE_REGION)
return WebKit::mayContainEditableElementsInRect(_contentView.get(), [self convertRect:rect toView:_contentView.get()]);
+#else
+ return NO;
+#endif
}
- (void)keyboardAccessoryBarNext
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
