Changeset 280616 in webkit

Timestamp:

Aug 3, 2021, 1:54:22 PM (5 years ago)

Author:

Russell Epstein

Message:

Cherry-pick r280603. rdar://problem/81473647

[Live Text] [iOS] Provide a presenting UIViewController for machine readable code actions so that they are related to the same view
​https://bugs.webkit.org/show_bug.cgi?id=228722

Reviewed by Tim Horton.

Source/WebCore/PAL:

• pal/spi/cocoa/VisionKitCoreSPI.h:

Source/WebKit:

• UIProcess/ios/WKContentViewInteraction.mm: (-[WKContentView _updateContextMenuForMachineReadableCodeForImageAnalysis:]): Added. (-[WKContentView imageAnalysisGestureDidBegin:]): (-[WKContentView imageAnalysisGestureDidTimeOut:]):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@280603 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-612.1-branch/Source

Files:

• WebCore/PAL/ChangeLog (modified) (1 diff)
• WebCore/PAL/pal/spi/cocoa/VisionKitCoreSPI.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/UIProcess/ios/WKContentViewInteraction.mm (modified) (3 diffs)

branches/safari-612.1-branch/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2021-08-03  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r280603. rdar://problem/81473647
+
+    [Live Text] [iOS] Provide a presenting `UIViewController` for machine readable code actions so that they are related to the same view
+    https://bugs.webkit.org/show_bug.cgi?id=228722
+    
+    Reviewed by Tim Horton.
+    
+    Source/WebCore/PAL:
+    
+    * pal/spi/cocoa/VisionKitCoreSPI.h:
+    
+    Source/WebKit:
+    
+    * UIProcess/ios/WKContentViewInteraction.mm:
+    (-[WKContentView _updateContextMenuForMachineReadableCodeForImageAnalysis:]): Added.
+    (-[WKContentView imageAnalysisGestureDidBegin:]):
+    (-[WKContentView imageAnalysisGestureDidTimeOut:]):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280603 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-08-03  Devin Rousso  <drousso@apple.com>
+
+            [Live Text] [iOS] Provide a presenting `UIViewController` for machine readable code actions so that they are related to the same view
+            https://bugs.webkit.org/show_bug.cgi?id=228722
+
+            Reviewed by Tim Horton.
+
+            * pal/spi/cocoa/VisionKitCoreSPI.h:
+
 2021-08-02  Devin Rousso  <drousso@apple.com>
 

branches/safari-612.1-branch/Source/WebCore/PAL/pal/spi/cocoa/VisionKitCoreSPI.h

@@ -131 +131 @@
 #if HAVE(VK_IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
 @property (nonatomic) UIMenu *mrcMenu;
+@property (nonatomic, nullable, weak) UIViewController *presentingViewControllerForMrcAction;
 #endif
 @end

branches/safari-612.1-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2021-08-03  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r280603. rdar://problem/81473647
+
+    [Live Text] [iOS] Provide a presenting `UIViewController` for machine readable code actions so that they are related to the same view
+    https://bugs.webkit.org/show_bug.cgi?id=228722
+    
+    Reviewed by Tim Horton.
+    
+    Source/WebCore/PAL:
+    
+    * pal/spi/cocoa/VisionKitCoreSPI.h:
+    
+    Source/WebKit:
+    
+    * UIProcess/ios/WKContentViewInteraction.mm:
+    (-[WKContentView _updateContextMenuForMachineReadableCodeForImageAnalysis:]): Added.
+    (-[WKContentView imageAnalysisGestureDidBegin:]):
+    (-[WKContentView imageAnalysisGestureDidTimeOut:]):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280603 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-08-03  Devin Rousso  <drousso@apple.com>
+
+            [Live Text] [iOS] Provide a presenting `UIViewController` for machine readable code actions so that they are related to the same view
+            https://bugs.webkit.org/show_bug.cgi?id=228722
+
+            Reviewed by Tim Horton.
+
+            * UIProcess/ios/WKContentViewInteraction.mm:
+            (-[WKContentView _updateContextMenuForMachineReadableCodeForImageAnalysis:]): Added.
+            (-[WKContentView imageAnalysisGestureDidBegin:]):
+            (-[WKContentView imageAnalysisGestureDidTimeOut:]):
+
 2021-08-02  Peng Liu  <peng.liu6@apple.com>
 

branches/safari-612.1-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -10157 +10157 @@
 }
 
+#if USE(UICONTEXTMENU) && ENABLE(IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
+
+- (void)_updateContextMenuForMachineReadableCodeForImageAnalysis:(VKImageAnalysis *)analysis
+{
+    analysis.presentingViewControllerForMrcAction = [UIViewController _viewControllerForFullScreenPresentationFromView:self];
+    _contextMenuForMachineReadableCode = [analysis hasResultsForAnalysisTypes:VKAnalysisTypeMachineReadableCode | VKAnalysisTypeAppClip] ? analysis.mrcMenu : nil;
+}
+
+#endif // USE(UICONTEXTMENU) && ENABLE(IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
+
 - (BOOL)validateImageAnalysisRequestIdentifier:(WebKit::ImageAnalysisRequestIdentifier)identifier
 {
@@ -10324 +10334 @@
 #endif
 #if USE(UICONTEXTMENU) && ENABLE(IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
-                    strongSelf->_contextMenuForMachineReadableCode = [result hasResultsForAnalysisTypes:VKAnalysisTypeMachineReadableCode | VKAnalysisTypeAppClip] ? result.mrcMenu : nil;
+                    [strongSelf _updateContextMenuForMachineReadableCodeForImageAnalysis:result];
 #endif // USE(UICONTEXTMENU) && ENABLE(IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
                     [strongSelf _invokeAllActionsToPerformAfterPendingImageAnalysis:WebKit::ProceedWithTextSelectionInImage::No];
@@ -10393 +10403 @@
 #if USE(UICONTEXTMENU)
 #if ENABLE(IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
-            strongSelf->_contextMenuForMachineReadableCode = [result hasResultsForAnalysisTypes:VKAnalysisTypeMachineReadableCode | VKAnalysisTypeAppClip] ? result.mrcMenu : nil;
+            [strongSelf _updateContextMenuForMachineReadableCodeForImageAnalysis:result];
 #endif // ENABLE(IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
             strongSelf->_contextMenuWasTriggeredByImageAnalysisTimeout = YES;