<!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>[193553] branches/safari-601.1.46-branch</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/193553">193553</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-12-05 22:09:46 -0800 (Sat, 05 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/191072">r191072</a>. rdar://problem/23766294</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2ChangeLog">branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2UIProcessAPICocoaWKWebViewmm">branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2UIProcessiosWKContentViewInteractionh">branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2UIProcessiosWKContentViewInteractionmm">branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsfasteventsiosunscalableviewportclicksondoubletapexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/unscalable-viewport-clicks-on-doubletap-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfasteventsiosunscalableviewportclicksondoubletaphtml">branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/unscalable-viewport-clicks-on-doubletap.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (193552 => 193553)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-06 05:56:25 UTC (rev 193552)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-06 06:09:46 UTC (rev 193553)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-12-05 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r191072.
+
+ 2015-10-14 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Web pages with unscalable viewports shouldn't have a single tap delay
+ https://bugs.webkit.org/show_bug.cgi?id=149968
+ <rdar://problem/23054453>
+
+ Reviewed by Simon Fraser.
+
+ Add a layout test to check that when a viewport is unscalable (specified through
+ the meta viewport tag) we do not add a delay to our single tap gesture recognizer.
+
+ * fast/events/ios/unscalable-viewport-clicks-on-doubletap-expected.txt: Added.
+ * fast/events/ios/unscalable-viewport-clicks-on-doubletap.html: Added.
+
</ins><span class="cx"> 2015-12-05 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r191981. rdar://problem/23221177
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfasteventsiosunscalableviewportclicksondoubletapexpectedtxtfromrev193474branchessafari601branchLayoutTestsfasteventsiosunscalableviewportclicksondoubletapexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/unscalable-viewport-clicks-on-doubletap-expected.txt (from rev 193474, branches/safari-601-branch/LayoutTests/fast/events/ios/unscalable-viewport-clicks-on-doubletap-expected.txt) (0 => 193553)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/unscalable-viewport-clicks-on-doubletap-expected.txt (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/unscalable-viewport-clicks-on-doubletap-expected.txt 2015-12-06 06:09:46 UTC (rev 193553)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+
+Double tapping on the button should fire 2 click events.
+Click!
+Click!
+
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfasteventsiosunscalableviewportclicksondoubletaphtmlfromrev193474branchessafari601branchLayoutTestsfasteventsiosunscalableviewportclicksondoubletaphtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/unscalable-viewport-clicks-on-doubletap.html (from rev 193474, branches/safari-601-branch/LayoutTests/fast/events/ios/unscalable-viewport-clicks-on-doubletap.html) (0 => 193553)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/unscalable-viewport-clicks-on-doubletap.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/unscalable-viewport-clicks-on-doubletap.html 2015-12-06 06:09:46 UTC (rev 193553)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true ] -->
+
+<html>
+<meta id="viewport-data" name="viewport" content="user-scalable=no, initial-scale=1.0">
+
+<head>
+ <script id="ui-script" type="text/plain">
+ (function() {
+ uiController.doubleTapAtPoint(50, 50, function() {});
+ })();
+ </script>
+
+ <script>
+ var clickCount = 0;
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ function getUIScript() {
+ return document.getElementById("ui-script").text;
+ }
+
+ function runTest() {
+ if (testRunner.runUIScript) {
+ testRunner.runUIScript(getUIScript(), function(result) {});
+ }
+ }
+ function handleClicked() {
+ clickCount++;
+ document.body.appendChild(document.createTextNode("Click!"));
+ document.body.appendChild(document.createElement("br"));
+ if (clickCount == 2)
+ testRunner.notifyDone();
+ }
+ </script>
+
+ <style>
+ body {
+ margin: 0;
+ }
+
+ #target {
+ width: 100px;
+ height: 100px;
+ }
+ </style>
+</head>
+
+<body onload="runTest()">
+ <button id="target" onclick="handleClicked()"></button>
+ <div>Double tapping on the button should fire 2 click events.</div>
+</body>
+
+</html>
</ins></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (193552 => 193553)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-12-06 05:56:25 UTC (rev 193552)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-12-06 06:09:46 UTC (rev 193553)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-12-05 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r191072.
+
+ 2015-10-14 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Web pages with unscalable viewports shouldn't have a single tap delay
+ https://bugs.webkit.org/show_bug.cgi?id=149968
+ <rdar://problem/23054453>
+
+ Reviewed by Simon Fraser.
+
+ When a viewport is unscalable (specified through the meta viewport tag) we
+ do not add a delay to our single tap gesture recognizer. We do this by
+ disabling or reinitializing the WKContentView's double tap gesture recognizer
+ when the viewport becomes unscalable or scalable, respectively. A viewport is
+ deemed unscalable when it has user-scalable = no, or when the minimum scale is
+ greater than or equal to the maximum scale.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _didCommitLayerTree:]):
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _createAndConfigureDoubleTapGestureRecognizer]): Pulled logic
+ for initializing a double tap gesture recognizer out into a helper function.
+ (-[WKContentView setupInteraction]):
+ (-[WKContentView _setDoubleTapGesturesEnabled:]): Turns gesture recognition for double
+ taps on or off.
+
</ins><span class="cx"> 2015-12-02 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r192811. rdar://problem/23730032
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (193552 => 193553)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-12-06 05:56:25 UTC (rev 193552)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-12-06 06:09:46 UTC (rev 193553)
</span><span class="lines">@@ -994,6 +994,8 @@
</span><span class="cx"> if (!layerTreeTransaction.scaleWasSetByUIProcess() && ![_scrollView isZooming] && ![_scrollView isZoomBouncing] && ![_scrollView _isAnimatingZoom])
</span><span class="cx"> [_scrollView setZoomScale:layerTreeTransaction.pageScaleFactor()];
</span><span class="cx">
</span><ins>+ [_contentView _setDoubleTapGesturesEnabled:[_scrollView isZoomEnabled] && [_scrollView minimumZoomScale] < [_scrollView maximumZoomScale]];
+
</ins><span class="cx"> [self _updateScrollViewBackground];
</span><span class="cx">
</span><span class="cx"> if (_gestureController)
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2UIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (193552 => 193553)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2015-12-06 05:56:25 UTC (rev 193552)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2015-12-06 06:09:46 UTC (rev 193553)
</span><span class="lines">@@ -208,6 +208,7 @@
</span><span class="cx"> - (void)_enableInspectorNodeSearch;
</span><span class="cx"> - (void)_disableInspectorNodeSearch;
</span><span class="cx"> - (void)_becomeFirstResponderWithSelectionMovingForward:(BOOL)selectingForward completionHandler:(void (^)(BOOL didBecomeFirstResponder))completionHandler;
</span><ins>+- (void)_setDoubleTapGesturesEnabled:(BOOL)enabled;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #if HAVE(LINK_PREVIEW)
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (193552 => 193553)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-12-06 05:56:25 UTC (rev 193552)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-12-06 06:09:46 UTC (rev 193553)
</span><span class="lines">@@ -320,6 +320,15 @@
</span><span class="cx"> return UIWebSelectionModeWeb;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_createAndConfigureDoubleTapGestureRecognizer
+{
+ _doubleTapGestureRecognizer = adoptNS([[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_doubleTapRecognized:)]);
+ [_doubleTapGestureRecognizer setNumberOfTapsRequired:2];
+ [_doubleTapGestureRecognizer setDelegate:self];
+ [self addGestureRecognizer:_doubleTapGestureRecognizer.get()];
+ [_singleTapGestureRecognizer requireOtherGestureToFail:_doubleTapGestureRecognizer.get()];
+}
+
</ins><span class="cx"> - (void)setupInteraction
</span><span class="cx"> {
</span><span class="cx"> if (!_interactionViewsContainerView) {
</span><span class="lines">@@ -343,11 +352,7 @@
</span><span class="cx"> [_singleTapGestureRecognizer setResetTarget:self action:@selector(_singleTapDidReset:)];
</span><span class="cx"> [self addGestureRecognizer:_singleTapGestureRecognizer.get()];
</span><span class="cx">
</span><del>- _doubleTapGestureRecognizer = adoptNS([[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_doubleTapRecognized:)]);
- [_doubleTapGestureRecognizer setNumberOfTapsRequired:2];
- [_doubleTapGestureRecognizer setDelegate:self];
- [self addGestureRecognizer:_doubleTapGestureRecognizer.get()];
- [_singleTapGestureRecognizer requireOtherGestureToFail:_doubleTapGestureRecognizer.get()];
</del><ins>+ [self _createAndConfigureDoubleTapGestureRecognizer];
</ins><span class="cx">
</span><span class="cx"> _twoFingerDoubleTapGestureRecognizer = adoptNS([[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_twoFingerDoubleTapRecognized:)]);
</span><span class="cx"> [_twoFingerDoubleTapGestureRecognizer setNumberOfTapsRequired:2];
</span><span class="lines">@@ -2266,6 +2271,18 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_setDoubleTapGesturesEnabled:(BOOL)enabled
+{
+ if (enabled && ![_doubleTapGestureRecognizer isEnabled]) {
+ // The first tap recognized after re-enabling double tap gestures will not wait for the
+ // second tap before committing. To fix this, we use a new double tap gesture recognizer.
+ [self removeGestureRecognizer:_doubleTapGestureRecognizer.get()];
+ [_doubleTapGestureRecognizer setDelegate:nil];
+ [self _createAndConfigureDoubleTapGestureRecognizer];
+ }
+ [_doubleTapGestureRecognizer setEnabled:enabled];
+}
+
</ins><span class="cx"> - (void)accessoryAutoFill
</span><span class="cx"> {
</span><span class="cx"> id <_WKFormDelegate> formDelegate = [_webView _formDelegate];
</span></span></pre>
</div>
</div>
</body>
</html>