<!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>[280558] 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/280558">280558</a></dd>
<dt>Author</dt> <dd>drousso@apple.com</dd>
<dt>Date</dt> <dd>2021-08-02 14:39:02 -0700 (Mon, 02 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Live Text] SPI for machine readable codes is only available on iOS
https://bugs.webkit.org/show_bug.cgi?id=228711

Reviewed by Tim Horton.

Source/WebCore/PAL:

* pal/spi/cocoa/VisionKitCoreSPI.h:

Source/WebKit:

* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _setUpImageAnalysis]):
(-[WKContentView _tearDownImageAnalysis]):
(-[WKContentView imageAnalysisGestureDidBegin:]):
(-[WKContentView imageAnalysisGestureDidTimeOut:]):
(-[WKContentView continueContextMenuInteraction:]):
(-[WKContentView contextMenuInteraction:willEndForConfiguration:animator:]):

Source/WTF:

* wtf/PlatformEnableCocoa.h:
* wtf/PlatformHave.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformEnableCocoah">trunk/Source/WTF/wtf/PlatformEnableCocoa.h</a></li>
<li><a href="#trunkSourceWTFwtfPlatformHaveh">trunk/Source/WTF/wtf/PlatformHave.h</a></li>
<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="#trunkSourceWebKitUIProcessiosWKContentViewInteractionh">trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h</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="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (280557 => 280558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog       2021-08-02 21:20:37 UTC (rev 280557)
+++ trunk/Source/WTF/ChangeLog  2021-08-02 21:39:02 UTC (rev 280558)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2021-08-02  Devin Rousso  <drousso@apple.com>
+
+        [Live Text] SPI for machine readable codes is only available on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=228711
+
+        Reviewed by Tim Horton.
+
+        * wtf/PlatformEnableCocoa.h:
+        * wtf/PlatformHave.h:
+
</ins><span class="cx"> 2021-08-02  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Enable WebRTCPlatformUDPSocketsEnabled experimental feature by default
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformEnableCocoah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PlatformEnableCocoa.h (280557 => 280558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PlatformEnableCocoa.h       2021-08-02 21:20:37 UTC (rev 280557)
+++ trunk/Source/WTF/wtf/PlatformEnableCocoa.h  2021-08-02 21:39:02 UTC (rev 280558)
</span><span class="lines">@@ -707,9 +707,10 @@
</span><span class="cx"> #define ENABLE_DESTINATION_COLOR_SPACE_LINEAR_SRGB 1
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000) \
-    || ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000)
-#if !defined(ENABLE_IMAGE_ANALYSIS)
</del><ins>+#if !defined(ENABLE_IMAGE_ANALYSIS) && HAVE(VK_IMAGE_ANALYSIS)
</ins><span class="cx"> #define ENABLE_IMAGE_ANALYSIS 1
</span><span class="cx"> #endif
</span><ins>+
+#if !defined(ENABLE_IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES) && HAVE(VK_IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
+#define ENABLE_IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES 1
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformHaveh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PlatformHave.h (280557 => 280558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PlatformHave.h      2021-08-02 21:20:37 UTC (rev 280557)
+++ trunk/Source/WTF/wtf/PlatformHave.h 2021-08-02 21:39:02 UTC (rev 280558)
</span><span class="lines">@@ -1070,6 +1070,12 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000
</span><ins>+#if !defined(HAVE_VK_IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
+#define HAVE_VK_IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES 1
+#endif
+#endif
+
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000
</ins><span class="cx"> #define HAVE_PER_APP_ACCESSIBILITY_PREFERENCES 1
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorePALChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/ChangeLog (280557 => 280558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/ChangeLog       2021-08-02 21:20:37 UTC (rev 280557)
+++ trunk/Source/WebCore/PAL/ChangeLog  2021-08-02 21:39:02 UTC (rev 280558)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2021-08-02  Devin Rousso  <drousso@apple.com>
+
+        [Live Text] SPI for machine readable codes is only available on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=228711
+
+        Reviewed by Tim Horton.
+
+        * pal/spi/cocoa/VisionKitCoreSPI.h:
+
</ins><span class="cx"> 2021-07-29  Devin Rousso  <drousso@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [Payment Request] `additionalShippingMethods` are not used if a `paymentMethodType` is provided
</span></span></pre></div>
<a id="trunkSourceWebCorePALpalspicocoaVisionKitCoreSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/VisionKitCoreSPI.h (280557 => 280558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/pal/spi/cocoa/VisionKitCoreSPI.h        2021-08-02 21:20:37 UTC (rev 280557)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/VisionKitCoreSPI.h   2021-08-02 21:39:02 UTC (rev 280558)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> 
</span><span class="cx"> @interface VKImageAnalysis (WebKitSPI)
</span><span class="cx"> @property (nonatomic, readonly) NSArray<VKWKLineInfo *> *allLines;
</span><del>-#if PLATFORM(IOS)
</del><ins>+#if HAVE(VK_IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
</ins><span class="cx"> @property (nonatomic) UIMenu *mrcMenu;
</span><span class="cx"> #endif
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (280557 => 280558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-08-02 21:20:37 UTC (rev 280557)
+++ trunk/Source/WebKit/ChangeLog       2021-08-02 21:39:02 UTC (rev 280558)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2021-08-02  Devin Rousso  <drousso@apple.com>
+
+        [Live Text] SPI for machine readable codes is only available on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=228711
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/ios/WKContentViewInteraction.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView _setUpImageAnalysis]):
+        (-[WKContentView _tearDownImageAnalysis]):
+        (-[WKContentView imageAnalysisGestureDidBegin:]):
+        (-[WKContentView imageAnalysisGestureDidTimeOut:]):
+        (-[WKContentView continueContextMenuInteraction:]):
+        (-[WKContentView contextMenuInteraction:willEndForConfiguration:animator:]):
+
</ins><span class="cx"> 2021-08-02  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Attribute nw connections to the page bundle identifier
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h (280557 => 280558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h     2021-08-02 21:20:37 UTC (rev 280557)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h        2021-08-02 21:39:02 UTC (rev 280558)
</span><span class="lines">@@ -502,7 +502,9 @@
</span><span class="cx">     std::optional<WebCore::ElementContext> _elementPendingImageAnalysis;
</span><span class="cx">     Vector<BlockPtr<void(WebKit::ProceedWithTextSelectionInImage)>> _actionsToPerformAfterPendingImageAnalysis;
</span><span class="cx"> #if USE(UICONTEXTMENU)
</span><ins>+#if ENABLE(IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
</ins><span class="cx">     RetainPtr<UIMenu> _contextMenuForMachineReadableCode;
</span><ins>+#endif // ENABLE(IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
</ins><span class="cx">     BOOL _contextMenuWasTriggeredByImageAnalysisTimeout;
</span><span class="cx"> #endif // USE(UICONTEXTMENU)
</span><span class="cx">     BOOL _isProceedingWithTextSelectionInImage;
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (280557 => 280558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm    2021-08-02 21:20:37 UTC (rev 280557)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm       2021-08-02 21:39:02 UTC (rev 280558)
</span><span class="lines">@@ -10104,9 +10104,9 @@
</span><span class="cx">     _hasSelectableTextInImage = NO;
</span><span class="cx">     _hasVisualSearchResults = NO;
</span><span class="cx"> #endif // USE(QUICK_LOOK)
</span><del>-#if USE(UICONTEXTMENU)
</del><ins>+#if USE(UICONTEXTMENU) && ENABLE(IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
</ins><span class="cx">     _contextMenuForMachineReadableCode.clear();
</span><del>-#endif // USE(UICONTEXTMENU)
</del><ins>+#endif // USE(UICONTEXTMENU) && ENABLE(IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)_tearDownImageAnalysis
</span><span class="lines">@@ -10128,9 +10128,9 @@
</span><span class="cx">     _hasSelectableTextInImage = NO;
</span><span class="cx">     _hasVisualSearchResults = NO;
</span><span class="cx"> #endif // USE(QUICK_LOOK)
</span><del>-#if USE(UICONTEXTMENU)
</del><ins>+#if USE(UICONTEXTMENU) && ENABLE(IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
</ins><span class="cx">     _contextMenuForMachineReadableCode.clear();
</span><del>-#endif // USE(UICONTEXTMENU)
</del><ins>+#endif // USE(UICONTEXTMENU) && ENABLE(IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
</ins><span class="cx">     [self _invokeAllActionsToPerformAfterPendingImageAnalysis:WebKit::ProceedWithTextSelectionInImage::No];
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -10215,9 +10215,9 @@
</span><span class="cx">     _hasVisualSearchResults = NO;
</span><span class="cx"> #endif // USE(QUICK_LOOK)
</span><span class="cx"> 
</span><del>-#if USE(UICONTEXTMENU)
</del><ins>+#if USE(UICONTEXTMENU) && ENABLE(IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
</ins><span class="cx">     _contextMenuForMachineReadableCode.clear();
</span><del>-#endif // USE(UICONTEXTMENU)
</del><ins>+#endif // USE(UICONTEXTMENU) && ENABLE(IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
</ins><span class="cx"> 
</span><span class="cx">     WebKit::InteractionInformationRequest request { WebCore::roundedIntPoint([gestureRecognizer locationInView:self]) };
</span><span class="cx">     request.includeImageData = true;
</span><span class="lines">@@ -10322,9 +10322,9 @@
</span><span class="cx"> #else
</span><span class="cx">                     UNUSED_PARAM(hasTextResults);
</span><span class="cx"> #endif
</span><del>-#if USE(UICONTEXTMENU)
</del><ins>+#if USE(UICONTEXTMENU) && ENABLE(IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
</ins><span class="cx">                     strongSelf->_contextMenuForMachineReadableCode = [result hasResultsForAnalysisTypes:VKAnalysisTypeMachineReadableCode | VKAnalysisTypeAppClip] ? result.mrcMenu : nil;
</span><del>-#endif
</del><ins>+#endif // USE(UICONTEXTMENU) && ENABLE(IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
</ins><span class="cx">                     [strongSelf _invokeAllActionsToPerformAfterPendingImageAnalysis:WebKit::ProceedWithTextSelectionInImage::No];
</span><span class="cx">                 }];
</span><span class="cx">             });
</span><span class="lines">@@ -10391,12 +10391,14 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if USE(UICONTEXTMENU)
</span><ins>+#if ENABLE(IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
</ins><span class="cx">             strongSelf->_contextMenuForMachineReadableCode = [result hasResultsForAnalysisTypes:VKAnalysisTypeMachineReadableCode | VKAnalysisTypeAppClip] ? result.mrcMenu : nil;
</span><ins>+#endif // ENABLE(IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
</ins><span class="cx">             strongSelf->_contextMenuWasTriggeredByImageAnalysisTimeout = YES;
</span><span class="cx">             [strongSelf->_contextMenuInteraction _presentMenuAtLocation:location];
</span><span class="cx"> #else
</span><span class="cx">             UNUSED_PARAM(location);
</span><del>-#endif
</del><ins>+#endif // USE(UICONTEXTMENU)
</ins><span class="cx">         }];
</span><span class="cx">     } forRequest:request];
</span><span class="cx"> }
</span><span class="lines">@@ -11074,10 +11076,10 @@
</span><span class="cx"> 
</span><span class="cx">                 RetainPtr<NSArray<_WKElementAction *>> defaultActionsFromAssistant = [strongSelf->_actionSheetAssistant defaultActionsForImageSheet:elementInfo.get()];
</span><span class="cx">                 auto actions = menuElementsFromDefaultActions(defaultActionsFromAssistant, elementInfo);
</span><del>-#if ENABLE(IMAGE_ANALYSIS)
</del><ins>+#if ENABLE(IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
</ins><span class="cx">                 if (UIMenu *menu = strongSelf->_contextMenuForMachineReadableCode.get())
</span><span class="cx">                     [actions addObject:menu];
</span><del>-#endif // ENABLE(IMAGE_ANALYSIS)
</del><ins>+#endif // ENABLE(IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
</ins><span class="cx">                 return [UIMenu menuWithTitle:strongSelf->_positionInformation.title children:actions];
</span><span class="cx">             };
</span><span class="cx"> 
</span><span class="lines">@@ -11347,9 +11349,9 @@
</span><span class="cx">     _contextMenuHasRequestedLegacyData = NO;
</span><span class="cx">     _contextMenuElementInfo = nullptr;
</span><span class="cx"> 
</span><del>-#if ENABLE(IMAGE_ANALYSIS)
</del><ins>+#if ENABLE(IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
</ins><span class="cx">     _contextMenuForMachineReadableCode.clear();
</span><del>-#endif // ENABLE(IMAGE_ANALYSIS)
</del><ins>+#endif // ENABLE(IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
</ins><span class="cx"> 
</span><span class="cx">     [animator addCompletion:[weakSelf = WeakObjCPtr<WKContentView>(self)] () {
</span><span class="cx">         auto strongSelf = weakSelf.get();
</span></span></pre>
</div>
</div>

</body>
</html>