<!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>[286823] trunk</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/286823">286823</a></dd>
<dt>Author</dt> <dd>akeerthi@apple.com</dd>
<dt>Date</dt> <dd>2021-12-09 18:16:28 -0800 (Thu, 09 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[iOS] Add SPI to enable find interactions on WKWebView
https://bugs.webkit.org/show_bug.cgi?id=234017
rdar://86140542

Reviewed by Wenson Hsieh.

Source/WebKit:

* Platform/spi/ios/UIKitSPI.h:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _initializeWithConfiguration:]):
* UIProcess/API/Cocoa/WKWebViewInternal.h:
* UIProcess/API/Cocoa/WKWebViewPrivate.h:
* UIProcess/API/ios/WKWebViewIOS.mm:
(-[WKWebView _findInteractionEnabled]):
(-[WKWebView _setFindInteractionEnabled:]):

Make the contentView the searchableObject, rather than self (the WKWebView)
to avoid a retain cycle.

(-[WKWebView _findInteraction]):
(-[WKWebView offsetFromPosition:toPosition:inDocument:]):
(-[WKWebView decorateFoundTextRange:inDocument:usingStyle:]):
* UIProcess/ios/WKContentViewInteraction.h:

Make WKContentView conform to _UITextSearching so that it can be set as
the interaction's searchableObject.

* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView decorateFoundTextRange:inDocument:usingStyle:]):
(-[WKContentView offsetFromPosition:toPosition:inDocument:]):
(-[WKContentView decorateFoundTextRange:usingStyle:]): Deleted.

Tools:

* TestWebKitAPI/Tests/WebKitCocoa/FindInPage.mm:
(TEST):

Test that the new SPI installs a _UIFindInteraction on the web view.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformspiiosUIKitSPIh">trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKWebViewInternalh">trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKWebViewPrivateh">trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPIiosWKWebViewIOSmm">trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm</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>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoaFindInPagemm">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FindInPage.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (286822 => 286823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-12-10 02:07:11 UTC (rev 286822)
+++ trunk/Source/WebKit/ChangeLog       2021-12-10 02:16:28 UTC (rev 286823)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2021-12-09  Aditya Keerthi  <akeerthi@apple.com>
+
+        [iOS] Add SPI to enable find interactions on WKWebView
+        https://bugs.webkit.org/show_bug.cgi?id=234017
+        rdar://86140542
+
+        Reviewed by Wenson Hsieh.
+
+        * Platform/spi/ios/UIKitSPI.h:
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _initializeWithConfiguration:]):
+        * UIProcess/API/Cocoa/WKWebViewInternal.h:
+        * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+        * UIProcess/API/ios/WKWebViewIOS.mm:
+        (-[WKWebView _findInteractionEnabled]):
+        (-[WKWebView _setFindInteractionEnabled:]):
+
+        Make the contentView the searchableObject, rather than self (the WKWebView)
+        to avoid a retain cycle.
+
+        (-[WKWebView _findInteraction]):
+        (-[WKWebView offsetFromPosition:toPosition:inDocument:]):
+        (-[WKWebView decorateFoundTextRange:inDocument:usingStyle:]):
+        * UIProcess/ios/WKContentViewInteraction.h:
+
+        Make WKContentView conform to _UITextSearching so that it can be set as
+        the interaction's searchableObject.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView decorateFoundTextRange:inDocument:usingStyle:]):
+        (-[WKContentView offsetFromPosition:toPosition:inDocument:]):
+        (-[WKContentView decorateFoundTextRange:usingStyle:]): Deleted.
+
</ins><span class="cx"> 2021-12-09  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Prepare for transition to C++20
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformspiiosUIKitSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h (286822 => 286823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h  2021-12-10 02:07:11 UTC (rev 286822)
+++ trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h     2021-12-10 02:16:28 UTC (rev 286823)
</span><span class="lines">@@ -131,6 +131,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if HAVE(UIFINDINTERACTION)
</span><ins>+#import <UIKit/_UIFindInteraction.h>
</ins><span class="cx"> #import <UIKit/_UITextSearching.h>
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="lines">@@ -328,6 +329,10 @@
</span><span class="cx"> 
</span><span class="cx"> @end
</span><span class="cx"> 
</span><ins>+@interface _UIFindInteraction : NSObject <UIInteraction>
+@property (nonatomic, strong) id<_UITextSearching> searchableObject;
+@end
+
</ins><span class="cx"> #endif // HAVE(UIFINDINTERACTION)
</span><span class="cx"> 
</span><span class="cx"> typedef enum {
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (286822 => 286823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm     2021-12-10 02:07:11 UTC (rev 286822)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm        2021-12-10 02:16:28 UTC (rev 286823)
</span><span class="lines">@@ -367,6 +367,10 @@
</span><span class="cx">     _allowsViewportShrinkToFit = defaultAllowsViewportShrinkToFit;
</span><span class="cx">     _allowsLinkPreview = linkedOnOrAfter(WebCore::SDKVersion::FirstWithLinkPreviewEnabledByDefault);
</span><span class="cx"> 
</span><ins>+#if HAVE(UIFINDINTERACTION)
+    _findInteractionEnabled = NO;
+#endif
+
</ins><span class="cx">     auto fastClickingEnabled = []() {
</span><span class="cx">         if (NSNumber *enabledValue = [[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitFastClickingDisabled"])
</span><span class="cx">             return enabledValue.boolValue;
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKWebViewInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h (286822 => 286823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h      2021-12-10 02:07:11 UTC (rev 286822)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h 2021-12-10 02:16:28 UTC (rev 286823)
</span><span class="lines">@@ -151,6 +151,11 @@
</span><span class="cx">     RetainPtr<WKFullScreenWindowController> _fullScreenWindowController;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if HAVE(UIFINDINTERACTION)
+    RetainPtr<_UIFindInteraction> _findInteraction;
+    BOOL _findInteractionEnabled;
+#endif
+
</ins><span class="cx">     RetainPtr<_WKRemoteObjectRegistry> _remoteObjectRegistry;
</span><span class="cx"> 
</span><span class="cx">     std::optional<CGSize> _viewLayoutSizeOverride;
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h (286822 => 286823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h       2021-12-10 02:07:11 UTC (rev 286822)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h  2021-12-10 02:16:28 UTC (rev 286823)
</span><span class="lines">@@ -24,6 +24,9 @@
</span><span class="cx">  */
</span><span class="cx"> 
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><ins>+#if __has_include(<UIKit/_UIFindInteraction.h>)
+#import <UIKit/_UIFindInteraction.h>
+#endif
</ins><span class="cx"> #if __has_include(<UIKit/_UITextSearching.h>)
</span><span class="cx"> #import <UIKit/_UITextSearching.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -438,8 +441,14 @@
</span><span class="cx"> @property (nonatomic, copy, setter=_setUIEventAttribution:) UIEventAttribution *_uiEventAttribution WK_API_AVAILABLE(ios(15.0));
</span><span class="cx"> @property (nonatomic, copy, setter=_setEphemeralUIEventAttribution:) UIEventAttribution *_ephemeralUIEventAttribution WK_API_AVAILABLE(ios(WK_IOS_TBA));
</span><span class="cx"> - (void)_setEphemeralUIEventAttribution:(UIEventAttribution *)attribution forApplicationWithBundleID:(NSString *)bundleID WK_API_AVAILABLE(ios(WK_IOS_TBA));
</span><ins>+
+#if __has_include(<UIKit/_UIFindInteraction.h>)
+@property (nonatomic, readonly) _UIFindInteraction *_findInteraction WK_API_AVAILABLE(ios(WK_IOS_TBA));
+@property (nonatomic, readwrite, setter=_setFindInteractionEnabled:) BOOL _findInteractionEnabled WK_API_AVAILABLE(ios(WK_IOS_TBA));
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#endif
+
</ins><span class="cx"> @property (nonatomic, readonly) CGRect _contentVisibleRect WK_API_AVAILABLE(ios(10.0));
</span><span class="cx"> 
</span><span class="cx"> // DERECATED: The setters of the three following function are deprecated, please use overrideLayoutParameters.
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPIiosWKWebViewIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm (286822 => 286823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm    2021-12-10 02:07:11 UTC (rev 286822)
+++ trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm       2021-12-10 02:16:28 UTC (rev 286823)
</span><span class="lines">@@ -3483,6 +3483,35 @@
</span><span class="cx"> 
</span><span class="cx"> #if HAVE(UIFINDINTERACTION)
</span><span class="cx"> 
</span><ins>+- (BOOL)_findInteractionEnabled
+{
+    return _findInteractionEnabled;
+}
+
+- (void)_setFindInteractionEnabled:(BOOL)enabled
+{
+    if (_findInteractionEnabled != enabled) {
+        _findInteractionEnabled = enabled;
+
+        if (enabled) {
+            if (!_findInteraction) {
+                _findInteraction = adoptNS([[_UIFindInteraction alloc] init]);
+                [_findInteraction setSearchableObject:_contentView.get()];
+            }
+
+            [self addInteraction:_findInteraction.get()];
+        } else {
+            [self removeInteraction:_findInteraction.get()];
+            _findInteraction = nil;
+        }
+    }
+}
+
+- (_UIFindInteraction *)_findInteraction
+{
+    return _findInteraction.get();
+}
+
</ins><span class="cx"> - (UITextRange *)selectedTextRange
</span><span class="cx"> {
</span><span class="cx">     return nil;
</span><span class="lines">@@ -3490,7 +3519,7 @@
</span><span class="cx"> 
</span><span class="cx"> - (NSInteger)offsetFromPosition:(UITextPosition *)from toPosition:(UITextPosition *)toPosition inDocument:(_UITextSearchDocumentIdentifier)document
</span><span class="cx"> {
</span><del>-    return [_contentView offsetFromPosition:from toPosition:toPosition];
</del><ins>+    return [_contentView offsetFromPosition:from toPosition:toPosition inDocument:document];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)performTextSearchWithQueryString:(NSString *)string usingOptions:(_UITextSearchOptions *)options resultAggregator:(id<_UITextSearchAggregator>)aggregator
</span><span class="lines">@@ -3500,7 +3529,7 @@
</span><span class="cx"> 
</span><span class="cx"> - (void)decorateFoundTextRange:(UITextRange *)range inDocument:(_UITextSearchDocumentIdentifier)document usingStyle:(_UIFoundTextStyle)style
</span><span class="cx"> {
</span><del>-    [_contentView decorateFoundTextRange:range usingStyle:style];
</del><ins>+    [_contentView decorateFoundTextRange:range inDocument:document usingStyle:style];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)clearAllDecoratedFoundText
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h (286822 => 286823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h     2021-12-10 02:07:11 UTC (rev 286822)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h        2021-12-10 02:16:28 UTC (rev 286823)
</span><span class="lines">@@ -537,6 +537,9 @@
</span><span class="cx"> #if HAVE(UIKIT_WITH_MOUSE_SUPPORT) || ENABLE(HOVER_GESTURE_RECOGNIZER)
</span><span class="cx">     , WKHoverPlatterDelegate
</span><span class="cx"> #endif
</span><ins>+#if HAVE(UIFINDINTERACTION)
+    , _UITextSearching
+#endif
</ins><span class="cx"> >
</span><span class="cx"> 
</span><span class="cx"> @property (nonatomic, readonly) CGPoint lastInteractionLocation;
</span><span class="lines">@@ -714,12 +717,6 @@
</span><span class="cx"> - (void)setTextIndicatorAnimationProgress:(float)NSAnimationProgress;
</span><span class="cx"> - (void)clearTextIndicator:(WebCore::TextIndicatorDismissalAnimation)animation;
</span><span class="cx"> 
</span><del>-#if HAVE(UIFINDINTERACTION)
-- (void)performTextSearchWithQueryString:(NSString *)string usingOptions:(_UITextSearchOptions *)options resultAggregator:(id<_UITextSearchAggregator>)aggregator;
-- (void)decorateFoundTextRange:(UITextRange *)range usingStyle:(_UIFoundTextStyle)style;
-- (void)clearAllDecoratedFoundText;
-#endif
-
</del><span class="cx"> @property (nonatomic, readonly) BOOL _shouldUseContextMenus;
</span><span class="cx"> @property (nonatomic, readonly) BOOL _shouldUseContextMenusForFormControls;
</span><span class="cx"> @property (nonatomic, readonly) BOOL _shouldAvoidResizingWhenInputViewBoundsChange;
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (286822 => 286823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm    2021-12-10 02:07:11 UTC (rev 286822)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm       2021-12-10 02:16:28 UTC (rev 286823)
</span><span class="lines">@@ -9987,7 +9987,7 @@
</span><span class="cx">     });
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (void)decorateFoundTextRange:(UITextRange *)range usingStyle:(_UIFoundTextStyle)style
</del><ins>+- (void)decorateFoundTextRange:(UITextRange *)range inDocument:(_UITextSearchDocumentIdentifier)document usingStyle:(_UIFoundTextStyle)style
</ins><span class="cx"> {
</span><span class="cx">     if (![range isKindOfClass:[WKFoundTextRange class]])
</span><span class="cx">         return;
</span><span class="lines">@@ -10006,6 +10006,11 @@
</span><span class="cx">     _page->hideFindUI();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+- (NSInteger)offsetFromPosition:(UITextPosition *)from toPosition:(UITextPosition *)toPosition inDocument:(_UITextSearchDocumentIdentifier)document
+{
+    return [self offsetFromPosition:from toPosition:toPosition];
+}
+
</ins><span class="cx"> #endif // HAVE(UIFINDINTERACTION)
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(IMAGE_ANALYSIS)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (286822 => 286823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-12-10 02:07:11 UTC (rev 286822)
+++ trunk/Tools/ChangeLog       2021-12-10 02:16:28 UTC (rev 286823)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2021-12-09  Aditya Keerthi  <akeerthi@apple.com>
+
+        [iOS] Add SPI to enable find interactions on WKWebView
+        https://bugs.webkit.org/show_bug.cgi?id=234017
+        rdar://86140542
+
+        Reviewed by Wenson Hsieh.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/FindInPage.mm:
+        (TEST):
+
+        Test that the new SPI installs a _UIFindInteraction on the web view.
+
</ins><span class="cx"> 2021-12-09  Lauro Moura  <lmoura@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [webkitpy] Make check-webkit-style check WebDriverTests/TestExpectations.json
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoaFindInPagemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FindInPage.mm (286822 => 286823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FindInPage.mm        2021-12-10 02:07:11 UTC (rev 286822)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FindInPage.mm   2021-12-10 02:16:28 UTC (rev 286823)
</span><span class="lines">@@ -452,4 +452,17 @@
</span><span class="cx">     testPerformTextSearchWithQueryStringInWebView(webView.get(), @"Birth", searchOptions.get(), 0UL);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+TEST(WebKit, FindInteraction)
+{
+    RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:CGRectMake(0, 0, 200, 200)]);
+
+    EXPECT_NULL([webView _findInteraction]);
+
+    [webView _setFindInteractionEnabled:YES];
+    EXPECT_NOT_NULL([webView _findInteraction]);
+
+    [webView _setFindInteractionEnabled:NO];
+    EXPECT_NULL([webView _findInteraction]);
+}
+
</ins><span class="cx"> #endif // HAVE(UIFINDINTERACTION)
</span></span></pre>
</div>
</div>

</body>
</html>