<!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>[248516] branches/safari-608.1-branch/Source/WebKit</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/248516">248516</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2019-08-10 22:03:30 -0700 (Sat, 10 Aug 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Apply patch. rdar://problem/54130665</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6081branchSourceWebKitChangeLog">branches/safari-608.1-branch/Source/WebKit/ChangeLog</a></li>
<li><a href="#branchessafari6081branchSourceWebKitUIProcessiosWKContentViewmm">branches/safari-608.1-branch/Source/WebKit/UIProcess/ios/WKContentView.mm</a></li>
<li><a href="#branchessafari6081branchSourceWebKitUIProcessiosWKContentViewInteractionh">branches/safari-608.1-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h</a></li>
<li><a href="#branchessafari6081branchSourceWebKitUIProcessiosWKContentViewInteractionmm">branches/safari-608.1-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6081branchSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1-branch/Source/WebKit/ChangeLog (248515 => 248516)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1-branch/Source/WebKit/ChangeLog     2019-08-11 04:48:55 UTC (rev 248515)
+++ branches/safari-608.1-branch/Source/WebKit/ChangeLog        2019-08-11 05:03:30 UTC (rev 248516)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2019-08-10  Babak Shafiei  <bshafiei@apple.com>
</span><span class="cx"> 
</span><ins>+        Apply patch. rdar://problem/54130665
+
+    2019-08-10  Simon Fraser  <simon.fraser@apple.com>
+
+            [iOS WK2] Remove context menu hints on navigation
+            https://bugs.webkit.org/show_bug.cgi?id=200588
+            rdar://problem/54061796
+
+            Reviewed by Tim Horton.
+
+            Make sure the context menu hint doesn't linger across navigations by hosting it in its
+            own container view (shared with drag previews), and hiding that view on navigation (unparenting
+            may have bad consequences). We remove the view when the animation ends.
+
+            * UIProcess/ios/WKContentViewInteraction.h:
+            * UIProcess/ios/WKContentViewInteraction.mm:
+            (-[WKContentView _didCommitLoadForMainFrame]):
+            (-[WKContentView containerViewForTargetedPreviews]):
+            (-[WKContentView _hideContextMenu]):
+            (-[WKContentView contextMenuInteraction:willEndForConfiguration:animator:]):
+
+2019-08-10  Babak Shafiei  <bshafiei@apple.com>
+
</ins><span class="cx">         Cherry-pick r248502. rdar://problem/54130678
</span><span class="cx"> 
</span><span class="cx">     Disable ContentChangeObserver TouchEvent adjustment on youtube.com on iOS in mobile browsing mode
</span></span></pre></div>
<a id="branchessafari6081branchSourceWebKitUIProcessiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1-branch/Source/WebKit/UIProcess/ios/WKContentView.mm (248515 => 248516)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1-branch/Source/WebKit/UIProcess/ios/WKContentView.mm        2019-08-11 04:48:55 UTC (rev 248515)
+++ branches/safari-608.1-branch/Source/WebKit/UIProcess/ios/WKContentView.mm   2019-08-11 05:03:30 UTC (rev 248516)
</span><span class="lines">@@ -585,6 +585,7 @@
</span><span class="cx"> {
</span><span class="cx">     [self _elementDidBlur];
</span><span class="cx">     [self _cancelLongPressGestureRecognizer];
</span><ins>+    [self _hideContextMenuHintContainer];
</ins><span class="cx">     [_webView _didCommitLoadForMainFrame];
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari6081branchSourceWebKitUIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h (248515 => 248516)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h      2019-08-11 04:48:55 UTC (rev 248515)
+++ branches/safari-608.1-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h 2019-08-11 05:03:30 UTC (rev 248516)
</span><span class="lines">@@ -238,6 +238,7 @@
</span><span class="cx">     RetainPtr<UIWebFormAccessory> _formAccessoryView;
</span><span class="cx">     RetainPtr<_UIHighlightView> _highlightView;
</span><span class="cx">     RetainPtr<UIView> _interactionViewsContainerView;
</span><ins>+    RetainPtr<UIView> _contextMenuHintContainerView;
</ins><span class="cx">     RetainPtr<NSString> _markedText;
</span><span class="cx">     RetainPtr<WKActionSheetAssistant> _actionSheetAssistant;
</span><span class="cx"> #if ENABLE(AIRPLAY_PICKER)
</span><span class="lines">@@ -455,6 +456,7 @@
</span><span class="cx"> - (void)_handleSmartMagnificationInformationForPotentialTap:(uint64_t)requestID renderRect:(const WebCore::FloatRect&)renderRect fitEntireRect:(BOOL)fitEntireRect viewportMinimumScale:(double)viewportMinimumScale viewportMaximumScale:(double)viewportMaximumScale;
</span><span class="cx"> - (void)_elementDidFocus:(const WebKit::FocusedElementInformation&)information userIsInteracting:(BOOL)userIsInteracting blurPreviousNode:(BOOL)blurPreviousNode activityStateChanges:(OptionSet<WebCore::ActivityState::Flag>)activityStateChanges userObject:(NSObject <NSSecureCoding> *)userObject;
</span><span class="cx"> - (void)_elementDidBlur;
</span><ins>+- (void)_hideContextMenuHintContainer;
</ins><span class="cx"> - (void)_didUpdateInputMode:(WebCore::InputMode)mode;
</span><span class="cx"> - (void)_didReceiveEditorStateUpdateAfterFocus;
</span><span class="cx"> - (void)_hardwareKeyboardAvailabilityChanged;
</span></span></pre></div>
<a id="branchessafari6081branchSourceWebKitUIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (248515 => 248516)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm     2019-08-11 04:48:55 UTC (rev 248515)
+++ branches/safari-608.1-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm        2019-08-11 05:03:30 UTC (rev 248516)
</span><span class="lines">@@ -6362,11 +6362,28 @@
</span><span class="cx">     return _focusedElementInformation.shouldAvoidScrollingWhenFocusedContentIsVisible;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+// FIXME: This is used for drag previews and context menu hints; it needs a better name.
</ins><span class="cx"> - (UIView *)containerViewForTargetedPreviews
</span><span class="cx"> {
</span><del>-    return self.unscaledView ?: self;
</del><ins>+    if (_contextMenuHintContainerView) {
+        ASSERT([_contextMenuHintContainerView superview]);
+        [_contextMenuHintContainerView setHidden:NO];
+        return _contextMenuHintContainerView.get();
+    }
+
+    _contextMenuHintContainerView = adoptNS([[UIView alloc] init]);
+    [_contextMenuHintContainerView layer].anchorPoint = CGPointZero;
+    [_contextMenuHintContainerView layer].name = @"Context Menu Container";
+    [_interactionViewsContainerView addSubview:_contextMenuHintContainerView.get()];
+
+    return _contextMenuHintContainerView.get();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+- (void)_hideContextMenuHintContainer
+{
+    [_contextMenuHintContainerView setHidden:YES];
+}
+
</ins><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx"> 
</span><span class="cx"> static BOOL shouldEnableDragInteractionForPolicy(_WKDragInteractionPolicy policy)
</span><span class="lines">@@ -8331,6 +8348,11 @@
</span><span class="cx">     _contextMenuLegacyMenu = nullptr;
</span><span class="cx">     _contextMenuHasRequestedLegacyData = NO;
</span><span class="cx">     _contextMenuElementInfo = nullptr;
</span><ins>+
+    [animator addCompletion:[weakSelf = WeakObjCPtr<WKContentView>(self)] () {
+        if (auto strongSelf = weakSelf.get())
+            [std::exchange(strongSelf->_contextMenuHintContainerView, nil) removeFromSuperview];
+    }];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #endif // USE(UICONTEXTMENU)
</span></span></pre>
</div>
</div>

</body>
</html>