<!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>[188053] trunk/Source/WebKit2</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/188053">188053</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2015-08-06 13:14:58 -0700 (Thu, 06 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow long press to cancel link preview.
https://bugs.webkit.org/show_bug.cgi?id=147743
rdar://problem/22128839
Reviewed by Tim Horton.
We should be able to show the context menu at the beginnig of link preview.
* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _removeDefaultGestureRecognizers]):
(-[WKContentView _addDefaultGestureRecognizers]):
(-[WKContentView gestureRecognizer:shouldRecognizeSimultaneouslyWithGestureRecognizer:]):
(-[WKContentView _longPressRecognized:]):
(-[WKContentView _singleTapRecognized:]):
(-[WKContentView _registerPreview]):
(-[WKContentView _unregisterPreview]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionh">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (188052 => 188053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-08-06 19:48:29 UTC (rev 188052)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-06 20:14:58 UTC (rev 188053)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-08-06 Enrica Casucci <enrica@apple.com>
+
+ Allow long press to cancel link preview.
+ https://bugs.webkit.org/show_bug.cgi?id=147743
+ rdar://problem/22128839
+
+ Reviewed by Tim Horton.
+
+ We should be able to show the context menu at the beginnig of link preview.
+
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _removeDefaultGestureRecognizers]):
+ (-[WKContentView _addDefaultGestureRecognizers]):
+ (-[WKContentView gestureRecognizer:shouldRecognizeSimultaneouslyWithGestureRecognizer:]):
+ (-[WKContentView _longPressRecognized:]):
+ (-[WKContentView _singleTapRecognized:]):
+ (-[WKContentView _registerPreview]):
+ (-[WKContentView _unregisterPreview]):
+
</ins><span class="cx"> 2015-08-06 Matt Rajca <mrajca@apple.com>
</span><span class="cx">
</span><span class="cx"> Media Session: rename isFocusedContentMediaElementPaused and get rid of callback
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (188052 => 188053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2015-08-06 19:48:29 UTC (rev 188052)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2015-08-06 20:14:58 UTC (rev 188053)
</span><span class="lines">@@ -117,6 +117,7 @@
</span><span class="cx"> RetainPtr<WKFormInputSession> _formInputSession;
</span><span class="cx"> RetainPtr<WKFileUploadPanel> _fileUploadPanel;
</span><span class="cx"> RetainPtr<UIGestureRecognizer> _previewGestureRecognizer;
</span><ins>+ RetainPtr<UIGestureRecognizer> _previewSecondaryGestureRecognizer;
</ins><span class="cx"> #if HAVE(LINK_PREVIEW)
</span><span class="cx"> RetainPtr<UIPreviewItemController> _previewItemController;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (188052 => 188053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-06 19:48:29 UTC (rev 188052)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-06 20:14:58 UTC (rev 188053)
</span><span class="lines">@@ -412,7 +412,6 @@
</span><span class="cx"> [self removeGestureRecognizer:_touchEventGestureRecognizer.get()];
</span><span class="cx"> [self removeGestureRecognizer:_singleTapGestureRecognizer.get()];
</span><span class="cx"> [self removeGestureRecognizer:_highlightLongPressGestureRecognizer.get()];
</span><del>- [self removeGestureRecognizer:_longPressGestureRecognizer.get()];
</del><span class="cx"> [self removeGestureRecognizer:_doubleTapGestureRecognizer.get()];
</span><span class="cx"> [self removeGestureRecognizer:_twoFingerDoubleTapGestureRecognizer.get()];
</span><span class="cx"> }
</span><span class="lines">@@ -422,7 +421,6 @@
</span><span class="cx"> [self addGestureRecognizer:_touchEventGestureRecognizer.get()];
</span><span class="cx"> [self addGestureRecognizer:_singleTapGestureRecognizer.get()];
</span><span class="cx"> [self addGestureRecognizer:_highlightLongPressGestureRecognizer.get()];
</span><del>- [self addGestureRecognizer:_longPressGestureRecognizer.get()];
</del><span class="cx"> [self addGestureRecognizer:_doubleTapGestureRecognizer.get()];
</span><span class="cx"> [self addGestureRecognizer:_twoFingerDoubleTapGestureRecognizer.get()];
</span><span class="cx"> }
</span><span class="lines">@@ -873,6 +871,9 @@
</span><span class="cx"> if (isSamePair(gestureRecognizer, otherGestureRecognizer, _singleTapGestureRecognizer.get(), _textSelectionAssistant.get().singleTapGesture))
</span><span class="cx"> return YES;
</span><span class="cx">
</span><ins>+ if (isSamePair(gestureRecognizer, otherGestureRecognizer, _highlightLongPressGestureRecognizer.get(), _previewSecondaryGestureRecognizer.get()))
+ return YES;
+
</ins><span class="cx"> if (isSamePair(gestureRecognizer, otherGestureRecognizer, _highlightLongPressGestureRecognizer.get(), _previewGestureRecognizer.get()))
</span><span class="cx"> return YES;
</span><span class="cx">
</span><span class="lines">@@ -1073,21 +1074,25 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(gestureRecognizer == _longPressGestureRecognizer);
</span><span class="cx">
</span><del>-#if HAVE(LINK_PREVIEW)
- if ([_previewItemController interactionInProgress])
- return;
-#endif
-
</del><span class="cx"> _lastInteractionLocation = gestureRecognizer.startPoint;
</span><span class="cx">
</span><del>- if ([gestureRecognizer state] == UIGestureRecognizerStateBegan) {
</del><ins>+ switch ([gestureRecognizer state]) {
+ case UIGestureRecognizerStateBegan:
+ {
</ins><span class="cx"> SEL action = [self _actionForLongPress];
</span><span class="cx"> if (action) {
</span><span class="cx"> [self performSelector:action];
</span><span class="cx"> [self _cancelLongPressGestureRecognizer];
</span><del>- [UIApp _cancelAllTouches];
</del><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ break;
+ case UIGestureRecognizerStateCancelled:
+ case UIGestureRecognizerStateEnded:
+ [_actionSheetAssistant cleanupSheet];
+ break;
+ default:
+ break;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_singleTapRecognized:(UITapGestureRecognizer *)gestureRecognizer
</span><span class="lines">@@ -3217,12 +3222,14 @@
</span><span class="cx"> _previewItemController = adoptNS([[UIPreviewItemController alloc] initWithView:self]);
</span><span class="cx"> [_previewItemController setDelegate:self];
</span><span class="cx"> _previewGestureRecognizer = _previewItemController.get().presentationGestureRecognizer;
</span><ins>+ _previewSecondaryGestureRecognizer = _previewItemController.get().presentationSecondaryGestureRecognizer;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_unregisterPreview
</span><span class="cx"> {
</span><span class="cx"> [_previewItemController setDelegate:nil];
</span><span class="cx"> _previewGestureRecognizer = nil;
</span><ins>+ _previewSecondaryGestureRecognizer = nil;
</ins><span class="cx"> _previewItemController = nil;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>