<!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>[171352] 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/171352">171352</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-22 12:25:45 -0700 (Tue, 22 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS][WK2] UI helpers that zoom on an element ignore the viewport's allowsUserScaling
https://bugs.webkit.org/show_bug.cgi?id=135140
<rdar://problem/17754921>
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-07-22
Reviewed by Tim Horton.
UIScrollView makes a difference between min/max zoom and allowUserScaling. To express that,
everything is set up on the LayerTransaction.
For zooming related helpers (find on page, double tap to zoom, etc), the min and max zoom
should be the actual min/max for the current page state.
This patch split the two explicitely.
For layer transactions, the values are taken from the viewport configuration directly.
For everything else, we should use minimumPageScaleFactor/maximumPageScaleFactor. Those two methods
have been updated to take into account allowsUserScaling.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::willCommitLayerTree):
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::minimumPageScaleFactor):
(WebKit::WebPage::maximumPageScaleFactor):
(WebKit::WebPage::getAssistedNodeInformation):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (171351 => 171352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-22 18:35:32 UTC (rev 171351)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-22 19:25:45 UTC (rev 171352)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-07-22 Benjamin Poulain <bpoulain@apple.com>
+
+ [iOS][WK2] UI helpers that zoom on an element ignore the viewport's allowsUserScaling
+ https://bugs.webkit.org/show_bug.cgi?id=135140
+ <rdar://problem/17754921>
+
+ Reviewed by Tim Horton.
+
+ UIScrollView makes a difference between min/max zoom and allowUserScaling. To express that,
+ everything is set up on the LayerTransaction.
+
+ For zooming related helpers (find on page, double tap to zoom, etc), the min and max zoom
+ should be the actual min/max for the current page state.
+
+ This patch split the two explicitely.
+ For layer transactions, the values are taken from the viewport configuration directly.
+ For everything else, we should use minimumPageScaleFactor/maximumPageScaleFactor. Those two methods
+ have been updated to take into account allowsUserScaling.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::willCommitLayerTree):
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::minimumPageScaleFactor):
+ (WebKit::WebPage::maximumPageScaleFactor):
+ (WebKit::WebPage::getAssistedNodeInformation):
+
</ins><span class="cx"> 2014-07-22 Shivakumar JM <shiva.jm@samsung.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Fix unused parameter build warning
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (171351 => 171352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-07-22 18:35:32 UTC (rev 171351)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-07-22 19:25:45 UTC (rev 171352)
</span><span class="lines">@@ -2865,8 +2865,8 @@
</span><span class="cx"> layerTransaction.setPageExtendedBackgroundColor(corePage()->pageExtendedBackgroundColor());
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> layerTransaction.setScaleWasSetByUIProcess(scaleWasSetByUIProcess());
</span><del>- layerTransaction.setMinimumScaleFactor(minimumPageScaleFactor());
- layerTransaction.setMaximumScaleFactor(maximumPageScaleFactor());
</del><ins>+ layerTransaction.setMinimumScaleFactor(m_viewportConfiguration.minimumScale());
+ layerTransaction.setMaximumScaleFactor(m_viewportConfiguration.maximumScale());
</ins><span class="cx"> layerTransaction.setAllowsUserScaling(allowsUserScaling());
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (171351 => 171352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-07-22 18:35:32 UTC (rev 171351)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-07-22 19:25:45 UTC (rev 171352)
</span><span class="lines">@@ -251,11 +251,15 @@
</span><span class="cx">
</span><span class="cx"> double WebPage::minimumPageScaleFactor() const
</span><span class="cx"> {
</span><ins>+ if (!m_viewportConfiguration.allowsUserScaling())
+ return m_page->pageScaleFactor();
</ins><span class="cx"> return m_viewportConfiguration.minimumScale();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double WebPage::maximumPageScaleFactor() const
</span><span class="cx"> {
</span><ins>+ if (!m_viewportConfiguration.allowsUserScaling())
+ return m_page->pageScaleFactor();
</ins><span class="cx"> return m_viewportConfiguration.maximumScale();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2024,8 +2028,8 @@
</span><span class="cx"> } else
</span><span class="cx"> information.elementRect = IntRect();
</span><span class="cx">
</span><del>- information.minimumScaleFactor = m_viewportConfiguration.minimumScale();
- information.maximumScaleFactor = m_viewportConfiguration.maximumScale();
</del><ins>+ information.minimumScaleFactor = minimumPageScaleFactor();
+ information.maximumScaleFactor = maximumPageScaleFactor();
</ins><span class="cx"> information.allowsUserScaling = m_viewportConfiguration.allowsUserScaling();
</span><span class="cx"> information.hasNextNode = hasFocusableElement(m_assistedNode.get(), m_page.get(), true);
</span><span class="cx"> information.hasPreviousNode = hasFocusableElement(m_assistedNode.get(), m_page.get(), false);
</span></span></pre>
</div>
</div>
</body>
</html>