<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[280603] trunk/Source</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/280603">280603</a></dd>
<dt>Author</dt> <dd>drousso@apple.com</dd>
<dt>Date</dt> <dd>2021-08-03 11:22:46 -0700 (Tue, 03 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[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:]):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorePALChangeLog">trunk/Source/WebCore/PAL/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePALpalspicocoaVisionKitCoreSPIh">trunk/Source/WebCore/PAL/pal/spi/cocoa/VisionKitCoreSPI.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCorePALChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/ChangeLog (280602 => 280603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/ChangeLog       2021-08-03 17:49:05 UTC (rev 280602)
+++ trunk/Source/WebCore/PAL/ChangeLog  2021-08-03 18:22:46 UTC (rev 280603)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+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:
+
</ins><span class="cx"> 2021-08-02  Devin Rousso  <drousso@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [Live Text] SPI for machine readable codes is only available on iOS
</span></span></pre></div>
<a id="trunkSourceWebCorePALpalspicocoaVisionKitCoreSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/VisionKitCoreSPI.h (280602 => 280603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/pal/spi/cocoa/VisionKitCoreSPI.h        2021-08-03 17:49:05 UTC (rev 280602)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/VisionKitCoreSPI.h   2021-08-03 18:22:46 UTC (rev 280603)
</span><span class="lines">@@ -130,6 +130,7 @@
</span><span class="cx"> @property (nonatomic, readonly) NSArray<VKWKLineInfo *> *allLines;
</span><span class="cx"> #if HAVE(VK_IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
</span><span class="cx"> @property (nonatomic) UIMenu *mrcMenu;
</span><ins>+@property (nonatomic, nullable, weak) UIViewController *presentingViewControllerForMrcAction;
</ins><span class="cx"> #endif
</span><span class="cx"> @end
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (280602 => 280603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-08-03 17:49:05 UTC (rev 280602)
+++ trunk/Source/WebKit/ChangeLog       2021-08-03 18:22:46 UTC (rev 280603)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+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:]):
+
</ins><span class="cx"> 2021-08-02  Peng Liu  <peng.liu6@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [GPUP] RemoteAudioSession::setPreferredBufferSize() does not change its preferredBufferSize
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (280602 => 280603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm    2021-08-03 17:49:05 UTC (rev 280602)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm       2021-08-03 18:22:46 UTC (rev 280603)
</span><span class="lines">@@ -10156,6 +10156,16 @@
</span><span class="cx">     return [self createImageAnalysisRequest:analysisTypes image:image imageURL:_positionInformation.imageURL];
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#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)
+
</ins><span class="cx"> - (BOOL)validateImageAnalysisRequestIdentifier:(WebKit::ImageAnalysisRequestIdentifier)identifier
</span><span class="cx"> {
</span><span class="cx">     if (_pendingImageAnalysisRequestIdentifier == identifier)
</span><span class="lines">@@ -10323,7 +10333,7 @@
</span><span class="cx">                     UNUSED_PARAM(hasTextResults);
</span><span class="cx"> #endif
</span><span class="cx"> #if USE(UICONTEXTMENU) && ENABLE(IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
</span><del>-                    strongSelf->_contextMenuForMachineReadableCode = [result hasResultsForAnalysisTypes:VKAnalysisTypeMachineReadableCode | VKAnalysisTypeAppClip] ? result.mrcMenu : nil;
</del><ins>+                    [strongSelf _updateContextMenuForMachineReadableCodeForImageAnalysis:result];
</ins><span class="cx"> #endif // USE(UICONTEXTMENU) && ENABLE(IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
</span><span class="cx">                     [strongSelf _invokeAllActionsToPerformAfterPendingImageAnalysis:WebKit::ProceedWithTextSelectionInImage::No];
</span><span class="cx">                 }];
</span><span class="lines">@@ -10392,7 +10402,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if USE(UICONTEXTMENU)
</span><span class="cx"> #if ENABLE(IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
</span><del>-            strongSelf->_contextMenuForMachineReadableCode = [result hasResultsForAnalysisTypes:VKAnalysisTypeMachineReadableCode | VKAnalysisTypeAppClip] ? result.mrcMenu : nil;
</del><ins>+            [strongSelf _updateContextMenuForMachineReadableCodeForImageAnalysis:result];
</ins><span class="cx"> #endif // ENABLE(IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
</span><span class="cx">             strongSelf->_contextMenuWasTriggeredByImageAnalysisTimeout = YES;
</span><span class="cx">             [strongSelf->_contextMenuInteraction _presentMenuAtLocation:location];
</span></span></pre>
</div>
</div>

</body>
</html>