<!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>[195767] 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/195767">195767</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-01-28 11:30:55 -0800 (Thu, 28 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/195607">r195607</a>. rdar://problem/23962929</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoredomViewportArgumentscpp">branches/safari-601.1.46-branch/Source/WebCore/dom/ViewportArguments.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoredomViewportArgumentsh">branches/safari-601.1.46-branch/Source/WebCore/dom/ViewportArguments.h</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2ChangeLog">branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2SharedmacRemoteLayerTreeTransactionh">branches/safari-601.1.46-branch/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2SharedmacRemoteLayerTreeTransactionmm">branches/safari-601.1.46-branch/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2UIProcessAPICocoaWKWebViewmm">branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2WebProcessWebPageWebPagecpp">branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsfasteventsiosthingradientjpg">branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/thin-gradient.jpg</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfasteventsiosviewportnowidthvalueallowsdoubletapexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/viewport-no-width-value-allows-double-tap-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfasteventsiosviewportnowidthvalueallowsdoubletaphtml">branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/viewport-no-width-value-allows-double-tap.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 (195766 => 195767)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-01-28 19:21:37 UTC (rev 195766)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-01-28 19:30:55 UTC (rev 195767)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-01-28 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r195607.
+
+ 2016-01-27 Dean Jackson <dino@apple.com>
+
+ [iOS] Documents without an explicit width should not get fast tapping
+ https://bugs.webkit.org/show_bug.cgi?id=153465
+
+ Reviewed by Simon Fraser (and Wenson Hseih).
+
+ * fast/events/ios/thin-gradient.jpg: Added.
+ * fast/events/ios/viewport-no-width-value-allows-double-tap-expected.txt: Added.
+ * fast/events/ios/viewport-no-width-value-allows-double-tap.html: Added.
+ * platform/ios-simulator/TestExpectations:
+
</ins><span class="cx"> 2016-01-27 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r195625.
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfasteventsiosthingradientjpg"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/thin-gradient.jpg ( => )</h4>
<pre class="diff"><span>
<span class="info">Added: branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/viewport-no-width-value-allows-double-tap-expected.txt
===================================================================
</span><del>--- branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/viewport-no-width-value-allows-double-tap-expected.txt (rev 0)
</del><ins>+++ branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/viewport-no-width-value-allows-double-tap-expected.txt 2016-01-28 19:30:55 UTC (rev 195767)
</ins><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+Double tapping on the image should scroll.
+
+This test is best run in WebKitTestRunner. If you are running this test manually, verify that double tapping on the bottom of the viewport caused a scroll.
+
+
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfasteventsiosviewportnowidthvalueallowsdoubletaphtml"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/viewport-no-width-value-allows-double-tap.html (0 => 195767)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/viewport-no-width-value-allows-double-tap.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/viewport-no-width-value-allows-double-tap.html 2016-01-28 19:30:55 UTC (rev 195767)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true ] -->
+
+<html>
+<meta name="viewport" content="initial-scale=1.0">
+
+<head>
+ <script src="../../../resources/js-test-pre.js"></script>
+ <script id="ui-script" type="text/plain">
+ (function() {
+ uiController.doubleTapAtPoint(15, 400, function() {
+ uiController.uiScriptComplete();
+ });
+ })();
+ </script>
+
+ <script>
+ var scriptCompleted = false;
+ var clickCount = 0;
+ if (window.testRunner)
+ testRunner.waitUntilDone();
+
+ function getUIScript() {
+ return document.getElementById("ui-script").text;
+ }
+
+ function runTest() {
+ window.addEventListener("scroll", scrolled, false);
+ if (testRunner.runUIScript)
+ testRunner.runUIScript(getUIScript());
+ }
+ function scrolled() {
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }
+ </script>
+
+ <style>
+ body {
+ margin: 0;
+ }
+ </style>
+</head>
+
+<body onload="runTest()">
+ <p>Double tapping on the image should scroll.</p>
+ <p>This test is best run in WebKitTestRunner. If you are running this test manually, verify that double tapping on the bottom of the viewport caused a scroll.</p>
+ <img src="thin-gradient.jpg">
+ <script src="../../../resources/js-test-post.js"></script>
+</body>
+
+</html>
</ins></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (195766 => 195767)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-01-28 19:21:37 UTC (rev 195766)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-01-28 19:30:55 UTC (rev 195767)
</span><span class="lines">@@ -1,5 +1,39 @@
</span><span class="cx"> 2016-01-28 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r195607.
+
+ 2016-01-27 Dean Jackson <dino@apple.com>
+
+ [iOS] Documents without an explicit width should not get fast tapping
+ https://bugs.webkit.org/show_bug.cgi?id=153465
+ <rdar://problem/23962529>
+
+ Reviewed by Simon Fraser (and Wenson Hseih).
+
+ As the title says, documents that do not set a viewport should
+ not get the fast click behaviour. There were complaints that we broke
+ double-tap to scroll in ImageDocuments where the image was narrow and long.
+
+ The fix is to just keep a flag that tells the UI process if the
+ width was explicit. However, it turns out that those ImageDocuments
+ are given an explicit device-width, which is fine for scaling but
+ really should behave as auto for fast tapping. So we also need
+ to tell the UIProcess if the viewport arguments came from an
+ ImageDocument.
+
+ Test: fast/events/ios/viewport-no-width-value-allows-double-tap.html
+
+ * dom/ViewportArguments.cpp:
+ (WebCore::findSizeValue): Add a parameter that toggles a flag
+ if the size was explicitly set.
+ (WebCore::setViewportFeature): Remember if the width was
+ explicit.
+ * dom/ViewportArguments.h: Add a widthWasExplicit flag.
+ (WebCore::ViewportArguments::operator==):
+
+
+2016-01-28 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Follow-up fix for r195625.
</span><span class="cx">
</span><span class="cx"> 2016-01-27 Babak Shafiei <bshafiei@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoredomViewportArgumentscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/dom/ViewportArguments.cpp (195766 => 195767)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/dom/ViewportArguments.cpp 2016-01-28 19:21:37 UTC (rev 195766)
+++ branches/safari-601.1.46-branch/Source/WebCore/dom/ViewportArguments.cpp 2016-01-28 19:30:55 UTC (rev 195767)
</span><span class="lines">@@ -306,24 +306,31 @@
</span><span class="cx"> return value;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static float findSizeValue(const String& keyString, const String& valueString, Document* document)
</del><ins>+static float findSizeValue(const String& keyString, const String& valueString, Document* document, bool* valueWasExplicit = nullptr)
</ins><span class="cx"> {
</span><span class="cx"> // 1) Non-negative number values are translated to px lengths.
</span><span class="cx"> // 2) Negative number values are translated to auto.
</span><span class="cx"> // 3) device-width and device-height are used as keywords.
</span><span class="cx"> // 4) Other keywords and unknown values translate to 0.0.
</span><span class="cx">
</span><ins>+ if (valueWasExplicit)
+ *valueWasExplicit = true;
+
</ins><span class="cx"> if (equalIgnoringCase(valueString, "device-width"))
</span><span class="cx"> return ViewportArguments::ValueDeviceWidth;
</span><ins>+
</ins><span class="cx"> if (equalIgnoringCase(valueString, "device-height"))
</span><span class="cx"> return ViewportArguments::ValueDeviceHeight;
</span><span class="cx">
</span><del>- float value = numericPrefix(keyString, valueString, document);
</del><ins>+ float sizeValue = numericPrefix(keyString, valueString, document);
</ins><span class="cx">
</span><del>- if (value < 0)
</del><ins>+ if (sizeValue < 0) {
+ if (valueWasExplicit)
+ *valueWasExplicit = false;
</ins><span class="cx"> return ViewportArguments::ValueAuto;
</span><ins>+ }
</ins><span class="cx">
</span><del>- return value;
</del><ins>+ return sizeValue;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static float findScaleValue(const String& keyString, const String& valueString, Document* document)
</span><span class="lines">@@ -382,7 +389,7 @@
</span><span class="cx"> ViewportArguments* arguments = static_cast<ViewportArguments*>(data);
</span><span class="cx">
</span><span class="cx"> if (keyString == "width")
</span><del>- arguments->width = findSizeValue(keyString, valueString, document);
</del><ins>+ arguments->width = findSizeValue(keyString, valueString, document, &arguments->widthWasExplicit);
</ins><span class="cx"> else if (keyString == "height")
</span><span class="cx"> arguments->height = findSizeValue(keyString, valueString, document);
</span><span class="cx"> else if (keyString == "initial-scale")
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoredomViewportArgumentsh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/dom/ViewportArguments.h (195766 => 195767)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/dom/ViewportArguments.h 2016-01-28 19:21:37 UTC (rev 195766)
+++ branches/safari-601.1.46-branch/Source/WebCore/dom/ViewportArguments.h 2016-01-28 19:30:55 UTC (rev 195767)
</span><span class="lines">@@ -95,6 +95,7 @@
</span><span class="cx"> float userZoom { ValueAuto };
</span><span class="cx"> float orientation { ValueAuto };
</span><span class="cx"> float shrinkToFit { ValueAuto };
</span><ins>+ bool widthWasExplicit { false };
</ins><span class="cx">
</span><span class="cx"> bool operator==(const ViewportArguments& other) const
</span><span class="cx"> {
</span><span class="lines">@@ -111,7 +112,8 @@
</span><span class="cx"> && maxZoom == other.maxZoom
</span><span class="cx"> && userZoom == other.userZoom
</span><span class="cx"> && orientation == other.orientation
</span><del>- && shrinkToFit == other.shrinkToFit;
</del><ins>+ && shrinkToFit == other.shrinkToFit
+ && widthWasExplicit == other.widthWasExplicit;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool operator!=(const ViewportArguments& other) const
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (195766 => 195767)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2016-01-28 19:21:37 UTC (rev 195766)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2016-01-28 19:30:55 UTC (rev 195767)
</span><span class="lines">@@ -1,5 +1,47 @@
</span><span class="cx"> 2016-01-28 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r195607.
+
+ 2016-01-27 Dean Jackson <dino@apple.com>
+
+ [iOS] Documents without an explicit width should not get fast tapping
+ https://bugs.webkit.org/show_bug.cgi?id=153465
+ <rdar://problem/23962529>
+
+ Reviewed by Simon Fraser (and Wenson Hseih).
+
+ As the title says, documents that do not set a viewport should
+ not get the fast click behaviour. There were complaints that we broke
+ double-tap to scroll in ImageDocuments where the image was narrow and long.
+
+ The fix is to just keep a flag that tells the UI process if the
+ width was explicit. However, it turns out that those ImageDocuments
+ are given an explicit device-width, which is fine for scaling but
+ really should behave as auto for fast tapping. So we also need
+ to tell the UIProcess if the viewport arguments came from an
+ ImageDocument.
+
+ * Shared/mac/RemoteLayerTreeTransaction.h: Add two new flags into
+ the transaction.
+ (WebKit::RemoteLayerTreeTransaction::viewportMetaTagWidthWasExplicit):
+ (WebKit::RemoteLayerTreeTransaction::setViewportMetaTagWidthWasExplicit):
+ (WebKit::RemoteLayerTreeTransaction::viewportMetaTagCameFromImageDocument):
+ (WebKit::RemoteLayerTreeTransaction::setViewportMetaTagCameFromImageDocument):
+ * Shared/mac/RemoteLayerTreeTransaction.mm:
+ (WebKit::RemoteLayerTreeTransaction::encode):
+ (WebKit::RemoteLayerTreeTransaction::decode):
+ (WebKit::RemoteLayerTreeTransaction::description):
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _didCommitLayerTree:]): Notice whether or not the viewport
+ width was explicit.
+ (-[WKWebView _allowsDoubleTapGestures]): Return yes if the width
+ was not explicit, or if the viewport came from an ImageDocument.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::willCommitLayerTree):
+
+2016-01-28 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Follow-up fix for r194750.
</span><span class="cx">
</span><span class="cx"> 2016-01-27 Babak Shafiei <bshafiei@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2SharedmacRemoteLayerTreeTransactionh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h (195766 => 195767)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h 2016-01-28 19:21:37 UTC (rev 195766)
+++ branches/safari-601.1.46-branch/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h 2016-01-28 19:30:55 UTC (rev 195767)
</span><span class="lines">@@ -228,6 +228,12 @@
</span><span class="cx"> double viewportMetaTagWidth() const { return m_viewportMetaTagWidth; }
</span><span class="cx"> void setViewportMetaTagWidth(double width) { m_viewportMetaTagWidth = width; }
</span><span class="cx">
</span><ins>+ bool viewportMetaTagWidthWasExplicit() const { return m_viewportMetaTagWidthWasExplicit; }
+ void setViewportMetaTagWidthWasExplicit(bool widthWasExplicit) { m_viewportMetaTagWidthWasExplicit = widthWasExplicit; }
+
+ bool viewportMetaTagCameFromImageDocument() const { return m_viewportMetaTagCameFromImageDocument; }
+ void setViewportMetaTagCameFromImageDocument(bool cameFromImageDocument) { m_viewportMetaTagCameFromImageDocument = cameFromImageDocument; }
+
</ins><span class="cx"> bool allowsUserScaling() const { return m_allowsUserScaling; }
</span><span class="cx"> void setAllowsUserScaling(bool allowsUserScaling) { m_allowsUserScaling = allowsUserScaling; }
</span><span class="cx">
</span><span class="lines">@@ -265,6 +271,8 @@
</span><span class="cx"> uint64_t m_transactionID;
</span><span class="cx"> bool m_scaleWasSetByUIProcess;
</span><span class="cx"> bool m_allowsUserScaling;
</span><ins>+ bool m_viewportMetaTagWidthWasExplicit { false };
+ bool m_viewportMetaTagCameFromImageDocument { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2SharedmacRemoteLayerTreeTransactionmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm (195766 => 195767)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm 2016-01-28 19:21:37 UTC (rev 195766)
+++ branches/safari-601.1.46-branch/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm 2016-01-28 19:30:55 UTC (rev 195767)
</span><span class="lines">@@ -533,6 +533,9 @@
</span><span class="cx"> encoder << m_scaleWasSetByUIProcess;
</span><span class="cx"> encoder << m_allowsUserScaling;
</span><span class="cx">
</span><ins>+ encoder << m_viewportMetaTagWidthWasExplicit;
+ encoder << m_viewportMetaTagCameFromImageDocument;
+
</ins><span class="cx"> encoder << m_callbackIDs;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -622,6 +625,12 @@
</span><span class="cx"> if (!decoder.decode(result.m_allowsUserScaling))
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (!decoder.decode(result.m_viewportMetaTagWidthWasExplicit))
+ return false;
+
+ if (!decoder.decode(result.m_viewportMetaTagCameFromImageDocument))
+ return false;
+
</ins><span class="cx"> if (!decoder.decode(result.m_callbackIDs))
</span><span class="cx"> return false;
</span><span class="cx">
</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 (195766 => 195767)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-01-28 19:21:37 UTC (rev 195766)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-01-28 19:30:55 UTC (rev 195767)
</span><span class="lines">@@ -188,6 +188,8 @@
</span><span class="cx"> CGSize _maximumUnobscuredSizeOverride;
</span><span class="cx"> CGRect _inputViewBounds;
</span><span class="cx"> CGFloat _viewportMetaTagWidth;
</span><ins>+ BOOL _viewportMetaTagWidthWasExplicit;
+ BOOL _viewportMetaTagCameFromImageDocument;
</ins><span class="cx"> CGFloat _initialScaleFactor;
</span><span class="cx"> BOOL _fastClickingIsDisabled;
</span><span class="cx">
</span><span class="lines">@@ -1038,6 +1040,8 @@
</span><span class="cx"> [_scrollView setZoomScale:layerTreeTransaction.pageScaleFactor()];
</span><span class="cx">
</span><span class="cx"> _viewportMetaTagWidth = layerTreeTransaction.viewportMetaTagWidth();
</span><ins>+ _viewportMetaTagWidthWasExplicit = layerTreeTransaction.viewportMetaTagWidthWasExplicit();
+ _viewportMetaTagCameFromImageDocument = layerTreeTransaction.viewportMetaTagCameFromImageDocument();
</ins><span class="cx"> _initialScaleFactor = layerTreeTransaction.initialScaleFactor();
</span><span class="cx"> if (![_contentView _mayDisableDoubleTapGesturesDuringSingleTap])
</span><span class="cx"> [_contentView _setDoubleTapGesturesEnabled:self._allowsDoubleTapGestures];
</span><span class="lines">@@ -3138,6 +3142,10 @@
</span><span class="cx"> if (![_scrollView isZoomEnabled] || [_scrollView minimumZoomScale] >= [_scrollView maximumZoomScale])
</span><span class="cx"> return NO;
</span><span class="cx">
</span><ins>+ // If the viewport width was not explicit, we allow double tap gestures.
+ if (!_viewportMetaTagWidthWasExplicit || _viewportMetaTagCameFromImageDocument)
+ return YES;
+
</ins><span class="cx"> // For scalable viewports, only disable double tap gestures if the viewport width is device width.
</span><span class="cx"> if (_viewportMetaTagWidth != WebCore::ViewportArguments::ValueDeviceWidth)
</span><span class="cx"> return YES;
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (195766 => 195767)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-01-28 19:21:37 UTC (rev 195766)
+++ branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-01-28 19:30:55 UTC (rev 195767)
</span><span class="lines">@@ -2954,6 +2954,8 @@
</span><span class="cx"> layerTransaction.setMaximumScaleFactor(m_viewportConfiguration.maximumScale());
</span><span class="cx"> layerTransaction.setInitialScaleFactor(m_viewportConfiguration.initialScale());
</span><span class="cx"> layerTransaction.setViewportMetaTagWidth(m_viewportConfiguration.viewportArguments().width);
</span><ins>+ layerTransaction.setViewportMetaTagWidthWasExplicit(m_viewportConfiguration.viewportArguments().widthWasExplicit);
+ layerTransaction.setViewportMetaTagCameFromImageDocument(m_viewportConfiguration.viewportArguments().type == ViewportArguments::ImageDocument);
</ins><span class="cx"> layerTransaction.setAllowsUserScaling(allowsUserScaling());
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(MAC)
</span></span></pre>
</div>
</div>
</body>
</html>