<!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>[286552] 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/286552">286552</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-12-06 11:00:25 -0800 (Mon, 06 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[iOS] Allow WKWebView clients to override undoManager
https://bugs.webkit.org/show_bug.cgi?id=233297
<rdar://problem/85526549>

Patch by Matt Gilligan <matthew_gilligan@apple.com> on 2021-12-06
Reviewed by Wenson Hsieh.

Source/WebKit:

Move WKContentView's undoManager up the responder chain to WKWebView so web view
subclasses can customize the undo manager used when WKContentView is first responder.

Test: KeyboardInputTests.OverrideUndoManager

* UIProcess/API/ios/WKWebViewIOS.mm:
(-[WKWebView undoManager]):
Return the undo manager provided by _contentView when it is current.

* UIProcess/ios/WKContentView.h:
* UIProcess/ios/WKContentView.mm:
(-[WKContentView undoManagerForWebView]):
Provide the view's undo manager via this property so that -undoManager will look up the
responder chain to WKWebView.

(-[WKContentView undoManager]): Deleted.

Tools:

* TestWebKitAPI/Tests/ios/KeyboardInputTestsIOS.mm:
(-[CustomUndoManagerWebView undoManager]):
(TestWebKitAPI::TEST):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPIiosWKWebViewIOSmm">trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKContentViewh">trunk/Source/WebKit/UIProcess/ios/WKContentView.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKContentViewmm">trunk/Source/WebKit/UIProcess/ios/WKContentView.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsiosKeyboardInputTestsIOSmm">trunk/Tools/TestWebKitAPI/Tests/ios/KeyboardInputTestsIOS.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (286551 => 286552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-12-06 18:49:35 UTC (rev 286551)
+++ trunk/Source/WebKit/ChangeLog       2021-12-06 19:00:25 UTC (rev 286552)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2021-12-06  Matt Gilligan  <matthew_gilligan@apple.com>
+
+        [iOS] Allow WKWebView clients to override undoManager
+        https://bugs.webkit.org/show_bug.cgi?id=233297
+        <rdar://problem/85526549>
+
+        Reviewed by Wenson Hsieh.
+
+        Move WKContentView's undoManager up the responder chain to WKWebView so web view
+        subclasses can customize the undo manager used when WKContentView is first responder.
+
+        Test: KeyboardInputTests.OverrideUndoManager
+
+        * UIProcess/API/ios/WKWebViewIOS.mm:
+        (-[WKWebView undoManager]):
+        Return the undo manager provided by _contentView when it is current.
+
+        * UIProcess/ios/WKContentView.h:
+        * UIProcess/ios/WKContentView.mm:
+        (-[WKContentView undoManagerForWebView]):
+        Provide the view's undo manager via this property so that -undoManager will look up the
+        responder chain to WKWebView.
+
+        (-[WKContentView undoManager]): Deleted.
+
</ins><span class="cx"> 2021-12-06  Lauro Moura  <lmoura@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         REGRESSION(r286535) [GTK] Fix clean builds after DerivedSources/WebKit2 move
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPIiosWKWebViewIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm (286551 => 286552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm    2021-12-06 18:49:35 UTC (rev 286551)
+++ trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm       2021-12-06 19:00:25 UTC (rev 286552)
</span><span class="lines">@@ -318,6 +318,14 @@
</span><span class="cx">     return [super resignFirstResponder];
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+- (NSUndoManager *)undoManager
+{
+    if (self._currentContentView == _contentView)
+        return [_contentView undoManagerForWebView];
+
+    return [super undoManager];
+}
+
</ins><span class="cx"> FOR_EACH_WKCONTENTVIEW_ACTION(FORWARD_ACTION_TO_WKCONTENTVIEW)
</span><span class="cx"> 
</span><span class="cx"> - (BOOL)canPerformAction:(SEL)action withSender:(id)sender
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentView.h (286551 => 286552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentView.h        2021-12-06 18:49:35 UTC (rev 286551)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentView.h   2021-12-06 19:00:25 UTC (rev 286552)
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx"> @property (nonatomic, readonly, getter=isResigningFirstResponder) BOOL resigningFirstResponder;
</span><span class="cx"> @property (nonatomic) BOOL sizeChangedSinceLastVisibleContentRectUpdate;
</span><span class="cx"> @property (nonatomic, readonly) UIInterfaceOrientation interfaceOrientation;
</span><ins>+@property (nonatomic, readonly) NSUndoManager *undoManagerForWebView;
</ins><span class="cx"> 
</span><span class="cx"> - (instancetype)initWithFrame:(CGRect)frame processPool:(NakedRef<WebKit::WebProcessPool>)processPool configuration:(Ref<API::PageConfiguration>&&)configuration webView:(WKWebView *)webView;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentView.mm (286551 => 286552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentView.mm       2021-12-06 18:49:35 UTC (rev 286551)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentView.mm  2021-12-06 19:00:25 UTC (rev 286552)
</span><span class="lines">@@ -562,7 +562,7 @@
</span><span class="cx">     [self _didEndScrollingOrZooming];
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (NSUndoManager *)undoManager
</del><ins>+- (NSUndoManager *)undoManagerForWebView
</ins><span class="cx"> {
</span><span class="cx">     if (self.focusedElementInformation.shouldSynthesizeKeyEventsForEditing && self.hasHiddenContentEditable) {
</span><span class="cx">         if (!_quirkyUndoManager)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (286551 => 286552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-12-06 18:49:35 UTC (rev 286551)
+++ trunk/Tools/ChangeLog       2021-12-06 19:00:25 UTC (rev 286552)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2021-12-06  Matt Gilligan  <matthew_gilligan@apple.com>
+
+        [iOS] Allow WKWebView clients to override undoManager
+        https://bugs.webkit.org/show_bug.cgi?id=233297
+        <rdar://problem/85526549>
+
+        Reviewed by Wenson Hsieh.
+
+        * TestWebKitAPI/Tests/ios/KeyboardInputTestsIOS.mm:
+        (-[CustomUndoManagerWebView undoManager]):
+        (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2021-12-06  Wenson Hsieh  <wenson_hsieh@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [iOS] AppHighlights.AppHighlightCreateAndRestoreAndScroll is a flaky failure
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsiosKeyboardInputTestsIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/ios/KeyboardInputTestsIOS.mm (286551 => 286552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/ios/KeyboardInputTestsIOS.mm     2021-12-06 18:49:35 UTC (rev 286551)
+++ trunk/Tools/TestWebKitAPI/Tests/ios/KeyboardInputTestsIOS.mm        2021-12-06 19:00:25 UTC (rev 286552)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> #import <cmath>
</span><span class="cx"> 
</span><span class="cx"> @interface WKContentView ()
</span><ins>+@property (nonatomic, readonly) NSUndoManager *undoManagerForWebView;
</ins><span class="cx"> - (BOOL)_shouldSimulateKeyboardInputOnTextInsertion;
</span><span class="cx"> @end
</span><span class="cx"> 
</span><span class="lines">@@ -187,6 +188,19 @@
</span><span class="cx"> 
</span><span class="cx"> @end
</span><span class="cx"> 
</span><ins>+@interface CustomUndoManagerWebView : TestWKWebView
+@property (nonatomic, strong) NSUndoManager *customUndoManager;
+@end
+
+@implementation CustomUndoManagerWebView
+
+- (NSUndoManager *)undoManager
+{
+    return _customUndoManager ?: super.undoManager;
+}
+
+@end
+
</ins><span class="cx"> static RetainPtr<TestWKWebView> webViewWithAutofocusedInput(const RetainPtr<TestInputDelegate>& inputDelegate)
</span><span class="cx"> {
</span><span class="cx">     auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]);
</span><span class="lines">@@ -801,6 +815,17 @@
</span><span class="cx">     EXPECT_NS_EQUAL((@[@"keydown", @"beforeinput", @"input", @"keyup", @"change"]), [webView objectByEvaluatingJavaScript:@"firedEvents"]);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+TEST(KeyboardInputTests, OverrideUndoManager)
+{
+    auto webView = adoptNS([[CustomUndoManagerWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]);
+    auto contentView = [webView wkContentView];
+    EXPECT_EQ(contentView.undoManager, contentView.undoManagerForWebView);
+
+    auto undoManager = adoptNS([[NSUndoManager alloc] init]);
+    [webView setCustomUndoManager:undoManager.get()];
+    EXPECT_EQ(contentView.undoManager, undoManager);
+}
+
</ins><span class="cx"> } // namespace TestWebKitAPI
</span><span class="cx"> 
</span><span class="cx"> #endif // PLATFORM(IOS_FAMILY)
</span></span></pre>
</div>
</div>

</body>
</html>