Title: [279317] trunk/Source/WebKit
- Revision
- 279317
- Author
- [email protected]
- Date
- 2021-06-27 10:39:38 -0700 (Sun, 27 Jun 2021)
Log Message
Unreviewed, fix the iOS build after rdar://76781873
Remove support for `-[UIResponder _insertTextFromCamera:]` in WebKit2, now that UIKit only supports the public
API version (`-[UIResponder captureTextFromCamera:]`).
* Platform/spi/ios/UIKitSPI.h:
* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView canPerformActionForWebView:withSender:]):
(-[WKContentView _insertTextFromCameraForWebView:]): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (279316 => 279317)
--- trunk/Source/WebKit/ChangeLog 2021-06-27 17:20:08 UTC (rev 279316)
+++ trunk/Source/WebKit/ChangeLog 2021-06-27 17:39:38 UTC (rev 279317)
@@ -1,3 +1,16 @@
+2021-06-27 Wenson Hsieh <[email protected]>
+
+ Unreviewed, fix the iOS build after rdar://76781873
+
+ Remove support for `-[UIResponder _insertTextFromCamera:]` in WebKit2, now that UIKit only supports the public
+ API version (`-[UIResponder captureTextFromCamera:]`).
+
+ * Platform/spi/ios/UIKitSPI.h:
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView canPerformActionForWebView:withSender:]):
+ (-[WKContentView _insertTextFromCameraForWebView:]): Deleted.
+
2021-06-27 Antoine Quint <[email protected]>
[Model] [iOS] Add support for rendering model resources
Modified: trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h (279316 => 279317)
--- trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2021-06-27 17:20:08 UTC (rev 279316)
+++ trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2021-06-27 17:39:38 UTC (rev 279317)
@@ -386,10 +386,6 @@
- (void)_beginPinningInputViews;
- (void)_endPinningInputViews;
-#if HAVE(VK_IMAGE_ANALYSIS)
-- (void)_insertTextFromCamera:(id)sender;
-#endif
-
@end
@class FBSDisplayConfiguration;
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h (279316 => 279317)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h 2021-06-27 17:20:08 UTC (rev 279316)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h 2021-06-27 17:39:38 UTC (rev 279317)
@@ -151,7 +151,6 @@
#if ENABLE(IMAGE_ANALYSIS)
#define FOR_EACH_INSERT_TEXT_FROM_CAMERA_WKCONTENTVIEW_ACTION(M) \
- M(_insertTextFromCamera) \
M(captureTextFromCamera)
#else
#define FOR_EACH_INSERT_TEXT_FROM_CAMERA_WKCONTENTVIEW_ACTION(M)
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (279316 => 279317)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2021-06-27 17:20:08 UTC (rev 279316)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2021-06-27 17:39:38 UTC (rev 279317)
@@ -3879,7 +3879,7 @@
}
#if ENABLE(IMAGE_ANALYSIS)
- if ((action == @selector(captureTextFromCamera:) || action == @selector(_insertTextFromCamera:)) && !editorState.isContentEditable)
+ if (action == @selector(captureTextFromCamera:) && !editorState.isContentEditable)
return NO;
#endif
@@ -10316,11 +10316,6 @@
} forRequest:request];
}
-- (void)_insertTextFromCameraForWebView:(id)sender
-{
- [super _insertTextFromCamera:sender];
-}
-
- (void)captureTextFromCameraForWebView:(id)sender
{
[super captureTextFromCamera:sender];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
