Title: [280217] trunk/Source/WebKit
- Revision
- 280217
- Author
- [email protected]
- Date
- 2021-07-22 20:20:56 -0700 (Thu, 22 Jul 2021)
Log Message
[Live Text] [iOS] Analysis should also search for any App Clip codes
https://bugs.webkit.org/show_bug.cgi?id=228207
Reviewed by Wenson Hsieh.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView imageAnalysisGestureDidBegin:]):
(-[WKContentView imageAnalysisGestureDidTimeOut:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (280216 => 280217)
--- trunk/Source/WebKit/ChangeLog 2021-07-23 03:17:51 UTC (rev 280216)
+++ trunk/Source/WebKit/ChangeLog 2021-07-23 03:20:56 UTC (rev 280217)
@@ -1,3 +1,14 @@
+2021-07-22 Devin Rousso <[email protected]>
+
+ [Live Text] [iOS] Analysis should also search for any App Clip codes
+ https://bugs.webkit.org/show_bug.cgi?id=228207
+
+ Reviewed by Wenson Hsieh.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView imageAnalysisGestureDidBegin:]):
+ (-[WKContentView imageAnalysisGestureDidTimeOut:]):
+
2021-07-22 Aditya Keerthi <[email protected]>
[iOS] Unable to open arxiv links on Chrome
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (280216 => 280217)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2021-07-23 03:17:51 UTC (rev 280216)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2021-07-23 03:20:56 UTC (rev 280217)
@@ -10267,7 +10267,7 @@
WebCore::ElementContext elementContext = *information.imageElementContext;
auto requestForTextSelection = [strongSelf createImageAnalysisRequest:VKAnalysisTypeText image:image.get()];
- auto requestForContextMenu = [strongSelf createImageAnalysisRequest:VKAnalysisTypeVisualSearch | VKAnalysisTypeMachineReadableCode image:image.get()];
+ auto requestForContextMenu = [strongSelf createImageAnalysisRequest:VKAnalysisTypeVisualSearch | VKAnalysisTypeMachineReadableCode | VKAnalysisTypeAppClip image:image.get()];
auto textAnalysisStartTime = MonotonicTime::now();
[[strongSelf imageAnalyzer] processRequest:requestForTextSelection.get() progressHandler:nil completionHandler:[requestIdentifier = WTFMove(requestIdentifier), weakSelf, elementContext, requestLocation, requestForContextMenu, gestureDeferralToken, textAnalysisStartTime] (VKImageAnalysis *result, NSError *error) mutable {
@@ -10320,7 +10320,7 @@
UNUSED_PARAM(hasTextResults);
#endif
#if USE(UICONTEXTMENU)
- strongSelf->_contextMenuForMachineReadableCode = [result hasResultsForAnalysisTypes:VKAnalysisTypeMachineReadableCode] ? result.mrcMenu : nil;
+ strongSelf->_contextMenuForMachineReadableCode = [result hasResultsForAnalysisTypes:VKAnalysisTypeMachineReadableCode | VKAnalysisTypeAppClip] ? result.mrcMenu : nil;
#endif
[strongSelf _invokeAllActionsToPerformAfterPendingImageAnalysis:WebKit::ProceedWithTextSelectionInImage::No];
}];
@@ -10372,7 +10372,7 @@
// making redundant image analysis requests for the same image data.
auto visualSearchAnalysisStartTime = MonotonicTime::now();
- auto requestForContextMenu = [strongSelf createImageAnalysisRequest:VKAnalysisTypeVisualSearch | VKAnalysisTypeMachineReadableCode image:image.get()];
+ auto requestForContextMenu = [strongSelf createImageAnalysisRequest:VKAnalysisTypeVisualSearch | VKAnalysisTypeMachineReadableCode | VKAnalysisTypeAppClip image:image.get()];
[[strongSelf imageAnalyzer] processRequest:requestForContextMenu.get() progressHandler:nil completionHandler:[weakSelf, location, visualSearchAnalysisStartTime] (VKImageAnalysis *result, NSError *error) {
auto strongSelf = weakSelf.get();
if (!strongSelf)
@@ -10388,7 +10388,7 @@
#endif
#if USE(UICONTEXTMENU)
- strongSelf->_contextMenuForMachineReadableCode = [result hasResultsForAnalysisTypes:VKAnalysisTypeMachineReadableCode] ? result.mrcMenu : nil;
+ strongSelf->_contextMenuForMachineReadableCode = [result hasResultsForAnalysisTypes:VKAnalysisTypeMachineReadableCode | VKAnalysisTypeAppClip] ? result.mrcMenu : nil;
strongSelf->_contextMenuWasTriggeredByImageAnalysisTimeout = YES;
[strongSelf->_contextMenuInteraction _presentMenuAtLocation:location];
#else
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
