<!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>[202354] 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/202354">202354</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2016-06-22 15:52:00 -0700 (Wed, 22 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION: Double tap to zoom does not work on yahoo finance
https://bugs.webkit.org/show_bug.cgi?id=158886
<rdar://problem/24917760>
Reviewed by Simon Fraser.
Source/WebKit2:
We shouldn't enable fast click on pages that have
had to shrink to fit. In other words, we should enable
double-tap-to-zoom if the page has already zoomed.
Test: fast/events/ios/viewport-shrink-to-fit-allows-double-tap.html
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _allowsDoubleTapGestures]):
LayoutTests:
* fast/events/ios/viewport-shrink-to-fit-allows-double-tap-expected.txt: Added.
* fast/events/ios/viewport-shrink-to-fit-allows-double-tap.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasteventsiosviewportshrinktofitallowsdoubletapexpectedtxt">trunk/LayoutTests/fast/events/ios/viewport-shrink-to-fit-allows-double-tap-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventsiosviewportshrinktofitallowsdoubletaphtml">trunk/LayoutTests/fast/events/ios/viewport-shrink-to-fit-allows-double-tap.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202353 => 202354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-22 22:19:22 UTC (rev 202353)
+++ trunk/LayoutTests/ChangeLog 2016-06-22 22:52:00 UTC (rev 202354)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-06-17 Dean Jackson <dino@apple.com>
+
+ REGRESSION: Double tap to zoom does not work on yahoo finance
+ https://bugs.webkit.org/show_bug.cgi?id=158886
+ <rdar://problem/24917760>
+
+ Reviewed by Simon Fraser.
+
+ * fast/events/ios/viewport-shrink-to-fit-allows-double-tap-expected.txt: Added.
+ * fast/events/ios/viewport-shrink-to-fit-allows-double-tap.html: Added.
+
</ins><span class="cx"> 2016-06-22 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Test gardening for css3/line-break-language-sensitive
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsiosviewportshrinktofitallowsdoubletapexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/ios/viewport-shrink-to-fit-allows-double-tap-expected.txt (0 => 202354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/ios/viewport-shrink-to-fit-allows-double-tap-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/events/ios/viewport-shrink-to-fit-allows-double-tap-expected.txt 2016-06-22 22:52:00 UTC (rev 202354)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+The viewport zoomed to scale: 1.6
+This test ensures that a page with width=device-width but content that causes a shrink-to-fit will not block double-tap-to-zoom. It runs automatically in WebKit tests. If you're viewing this manually, double tap on this text and the page should zoom in.
+
+This is an element that will cause shrinkage.
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/events/ios/viewport-shrink-to-fit-allows-double-tap-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+native
</ins><span class="cx">\ No newline at end of property
</span><a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<ins>+Date Revision
</ins><span class="cx">\ No newline at end of property
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<ins>+text/plain
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkLayoutTestsfasteventsiosviewportshrinktofitallowsdoubletaphtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/ios/viewport-shrink-to-fit-allows-double-tap.html (0 => 202354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/ios/viewport-shrink-to-fit-allows-double-tap.html (rev 0)
+++ trunk/LayoutTests/fast/events/ios/viewport-shrink-to-fit-allows-double-tap.html 2016-06-22 22:52:00 UTC (rev 202354)
</span><span class="lines">@@ -0,0 +1,61 @@
</span><ins>+<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true ] -->
+
+<html>
+<meta name="viewport" content="width=device-width">
+<head>
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ function getUIScript()
+ {
+ return `
+ (function() {
+ uiController.didEndZoomingCallback = function() {
+ uiController.uiScriptComplete(uiController.zoomScale);
+ };
+ uiController.doubleTapAtPoint(15, 60, function() {});
+ })();`;
+ }
+
+ function runTest()
+ {
+ if (!window.eventSender || !testRunner.runUIScript)
+ return;
+
+ testRunner.runUIScript(getUIScript(), function(result) {
+ document.getElementById("target").innerText = "The viewport zoomed to scale: " + result;
+ testRunner.notifyDone();
+ });
+ }
+ </script>
+ <style>
+ body {
+ margin: 0;
+ min-width: 800px;
+ }
+ p {
+ width: 300px;
+ }
+ #target {
+ height: 100px;
+ width: 100px;
+ background-color: silver;
+ }
+ </style>
+</head>
+<body onload="runTest()">
+<div id="target"></div>
+<p>
+ This test ensures that a page with width=device-width but content that
+ causes a shrink-to-fit will not block double-tap-to-zoom. It runs automatically
+ in WebKit tests. If you're viewing this manually, double tap on this text and
+ the page should zoom in.
+</p>
+<p style="height: 3000px; background-color: #f0e0f0">
+ This is an element that will cause shrinkage.
+</p>
+</body>
+</html>
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/events/ios/viewport-shrink-to-fit-allows-double-tap.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+native
</ins><span class="cx">\ No newline at end of property
</span><a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<ins>+Date Revision
</ins><span class="cx">\ No newline at end of property
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<ins>+text/html
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (202353 => 202354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-06-22 22:19:22 UTC (rev 202353)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-22 22:52:00 UTC (rev 202354)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-06-17 Dean Jackson <dino@apple.com>
+
+ REGRESSION: Double tap to zoom does not work on yahoo finance
+ https://bugs.webkit.org/show_bug.cgi?id=158886
+ <rdar://problem/24917760>
+
+ Reviewed by Simon Fraser.
+
+ We shouldn't enable fast click on pages that have
+ had to shrink to fit. In other words, we should enable
+ double-tap-to-zoom if the page has already zoomed.
+
+ Test: fast/events/ios/viewport-shrink-to-fit-allows-double-tap.html
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _allowsDoubleTapGestures]):
+
</ins><span class="cx"> 2016-06-22 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Automation: Automation.inspectBrowsingContext should have an option to enable timeline auto-capturing
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (202353 => 202354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-06-22 22:19:22 UTC (rev 202353)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-06-22 22:52:00 UTC (rev 202354)
</span><span class="lines">@@ -1738,11 +1738,16 @@
</span><span class="cx"> if (!_viewportMetaTagWidthWasExplicit || _viewportMetaTagCameFromImageDocument)
</span><span class="cx"> return YES;
</span><span class="cx">
</span><del>- // For scalable viewports, only disable double tap gestures if the viewport width is device width.
</del><ins>+ // If the page set a viewport width that wasn't the device width, then it was
+ // scaled and thus will probably need to zoom.
</ins><span class="cx"> if (_viewportMetaTagWidth != WebCore::ViewportArguments::ValueDeviceWidth)
</span><span class="cx"> return YES;
</span><span class="cx">
</span><del>- return !areEssentiallyEqualAsFloat(contentZoomScale(self), _initialScaleFactor);
</del><ins>+ // At this point, we have a page that asked for width = device-width. However,
+ // if the content's width and height were large, we might have had to shrink it.
+ // Since we'll enable double tap zoom whenever we're not at the actual
+ // initial scale, this simply becomes a test of the current scale against 1.
+ return !areEssentiallyEqualAsFloat(contentZoomScale(self), 1);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark - UIScrollViewDelegate
</span></span></pre>
</div>
</div>
</body>
</html>