Title: [260219] branches/safari-610.1.10-branch/Source/WebKit
- Revision
- 260219
- Author
- [email protected]
- Date
- 2020-04-16 13:41:12 -0700 (Thu, 16 Apr 2020)
Log Message
Cherry-pick r260218. rdar://problem/61897737
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:]):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260218 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610.1.10-branch/Source/WebKit/ChangeLog (260218 => 260219)
--- branches/safari-610.1.10-branch/Source/WebKit/ChangeLog 2020-04-16 20:38:32 UTC (rev 260218)
+++ branches/safari-610.1.10-branch/Source/WebKit/ChangeLog 2020-04-16 20:41:12 UTC (rev 260219)
@@ -1,5 +1,31 @@
2020-04-16 Alan Coon <[email protected]>
+ Cherry-pick r260218. rdar://problem/61897737
+
+ 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:]):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260218 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 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 Alan Coon <[email protected]>
+
Cherry-pick r260120. rdar://problem/61899305
Unreviewed, reverting r259891.
Modified: branches/safari-610.1.10-branch/Source/WebKit/UIProcess/API/ios/WKWebViewTestingIOS.mm (260218 => 260219)
--- branches/safari-610.1.10-branch/Source/WebKit/UIProcess/API/ios/WKWebViewTestingIOS.mm 2020-04-16 20:38:32 UTC (rev 260218)
+++ branches/safari-610.1.10-branch/Source/WebKit/UIProcess/API/ios/WKWebViewTestingIOS.mm 2020-04-16 20:41:12 UTC (rev 260219)
@@ -74,7 +74,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
