<!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>[206626] 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/206626">206626</a></dd>
<dt>Author</dt> <dd>n_wang@apple.com</dd>
<dt>Date</dt> <dd>2016-09-29 17:38:18 -0700 (Thu, 29 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: iOS: Tapping <input> in Safari zooms in a bit when page has max scale = 1
https://bugs.webkit.org/show_bug.cgi?id=162471
Reviewed by Simon Fraser.
Source/WebCore:
If the author has defined a maximum scale, we should honor that when keyboard focus moves
to a text field, instead of using the forceAlwaysUserScalableMaximumScale.
Tests: fast/forms/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale.html
fast/forms/ios/user-scalable-does-not-scale-for-keyboard-focus-with-user-scalable-no.html
fast/forms/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale.html
* page/ViewportConfiguration.cpp:
(WebCore::ViewportConfiguration::allowsUserScaling):
(WebCore::ViewportConfiguration::allowsUserScalingIgnoringAlwaysScalable):
(WebCore::ViewportConfiguration::allowsUserScalingIgnoringForceAlwaysScaling): Deleted.
* page/ViewportConfiguration.h:
(WebCore::ViewportConfiguration::maximumScaleIgnoringAlwaysScalable):
(WebCore::ViewportConfiguration::maximumScale): Deleted.
Source/WebKit2:
* Shared/AssistedNodeInformation.cpp:
(WebKit::AssistedNodeInformation::encode):
(WebKit::AssistedNodeInformation::decode):
* Shared/AssistedNodeInformation.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _displayFormNodeInputView]):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::maximumPageScaleFactorIgnoringAlwaysScalable):
(WebKit::WebPage::getAssistedNodeInformation):
LayoutTests:
Moved focus input related tests to the right place.
* fast/forms/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale-expected.txt: Added.
* fast/forms/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale.html: Added.
* fast/forms/ios/user-scalable-does-not-scale-for-keyboard-focus-with-user-scalable-no-expected.txt: Added.
* fast/forms/ios/user-scalable-does-not-scale-for-keyboard-focus-with-user-scalable-no.html: Added.
* fast/forms/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale-expected.txt: Added.
* fast/forms/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale.html: Added.
* fast/viewport/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale-expected.txt: Removed.
* fast/viewport/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale.html: Removed.
* fast/viewport/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale-expected.txt: Removed.
* fast/viewport/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale.html: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageViewportConfigurationcpp">trunk/Source/WebCore/page/ViewportConfiguration.cpp</a></li>
<li><a href="#trunkSourceWebCorepageViewportConfigurationh">trunk/Source/WebCore/page/ViewportConfiguration.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAssistedNodeInformationcpp">trunk/Source/WebKit2/Shared/AssistedNodeInformation.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAssistedNodeInformationh">trunk/Source/WebKit2/Shared/AssistedNodeInformation.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastformsiosuserscalabledoesnotscaleforkeyboardfocuswithauthordefinedscaleexpectedtxt">trunk/LayoutTests/fast/forms/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastformsiosuserscalabledoesnotscaleforkeyboardfocuswithauthordefinedscalehtml">trunk/LayoutTests/fast/forms/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale.html</a></li>
<li><a href="#trunkLayoutTestsfastformsiosuserscalabledoesnotscaleforkeyboardfocuswithuserscalablenoexpectedtxt">trunk/LayoutTests/fast/forms/ios/user-scalable-does-not-scale-for-keyboard-focus-with-user-scalable-no-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastformsiosuserscalabledoesnotscaleforkeyboardfocuswithuserscalablenohtml">trunk/LayoutTests/fast/forms/ios/user-scalable-does-not-scale-for-keyboard-focus-with-user-scalable-no.html</a></li>
<li><a href="#trunkLayoutTestsfastformsiosuserscalablescalesforkeyboardfocuswithnoauthordefinedscaleexpectedtxt">trunk/LayoutTests/fast/forms/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastformsiosuserscalablescalesforkeyboardfocuswithnoauthordefinedscalehtml">trunk/LayoutTests/fast/forms/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale.html</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastviewportiosuserscalabledoesnotscaleforkeyboardfocuswithauthordefinedscaleexpectedtxt">trunk/LayoutTests/fast/viewport/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastviewportiosuserscalabledoesnotscaleforkeyboardfocuswithauthordefinedscalehtml">trunk/LayoutTests/fast/viewport/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale.html</a></li>
<li><a href="#trunkLayoutTestsfastviewportiosuserscalablescalesforkeyboardfocuswithnoauthordefinedscaleexpectedtxt">trunk/LayoutTests/fast/viewport/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastviewportiosuserscalablescalesforkeyboardfocuswithnoauthordefinedscalehtml">trunk/LayoutTests/fast/viewport/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (206625 => 206626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-09-30 00:15:27 UTC (rev 206625)
+++ trunk/LayoutTests/ChangeLog 2016-09-30 00:38:18 UTC (rev 206626)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-09-29 Nan Wang <n_wang@apple.com>
+
+ AX: iOS: Tapping <input> in Safari zooms in a bit when page has max scale = 1
+ https://bugs.webkit.org/show_bug.cgi?id=162471
+
+ Reviewed by Simon Fraser.
+
+ Moved focus input related tests to the right place.
+
+ * fast/forms/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale-expected.txt: Added.
+ * fast/forms/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale.html: Added.
+ * fast/forms/ios/user-scalable-does-not-scale-for-keyboard-focus-with-user-scalable-no-expected.txt: Added.
+ * fast/forms/ios/user-scalable-does-not-scale-for-keyboard-focus-with-user-scalable-no.html: Added.
+ * fast/forms/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale-expected.txt: Added.
+ * fast/forms/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale.html: Added.
+ * fast/viewport/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale-expected.txt: Removed.
+ * fast/viewport/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale.html: Removed.
+ * fast/viewport/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale-expected.txt: Removed.
+ * fast/viewport/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale.html: Removed.
+
</ins><span class="cx"> 2016-09-29 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Update Touch constructor test to cover clientX / clientY attributes
</span></span></pre></div>
<a id="trunkLayoutTestsfastformsiosuserscalabledoesnotscaleforkeyboardfocuswithauthordefinedscaleexpectedtxtfromrev206621trunkLayoutTestsfastviewportiosuserscalabledoesnotscaleforkeyboardfocuswithauthordefinedscaleexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/fast/forms/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale-expected.txt (from rev 206621, trunk/LayoutTests/fast/viewport/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale-expected.txt) (0 => 206626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/forms/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale-expected.txt 2016-09-30 00:38:18 UTC (rev 206626)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+
+This test has to run in iOS WebKitTestRunner.
+
+This tests that even though force user scalable = true, we won't scale if a text field gets focus and the page has maximum-scale=1
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Zoom scale is: 1
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastformsiosuserscalabledoesnotscaleforkeyboardfocuswithauthordefinedscalehtmlfromrev206621trunkLayoutTestsfastviewportiosuserscalabledoesnotscaleforkeyboardfocuswithauthordefinedscalehtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/fast/forms/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale.html (from rev 206621, trunk/LayoutTests/fast/viewport/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale.html) (0 => 206626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale.html (rev 0)
+++ trunk/LayoutTests/fast/forms/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale.html 2016-09-30 00:38:18 UTC (rev 206626)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true ] -->
+<html>
+<head>
+<script src="../../../resources/js-test-pre.js"></script>
+<meta name="viewport" content="width=device-width, maximum-scale=1">
+<script id="ui-script" type="text/plain">
+ (function() {
+ uiController.didEndZoomingCallback = function() {
+ uiController.uiScriptComplete(uiController.zoomScale);
+ };
+
+ uiController.singleTapAtPoint(10, 10, function() {});
+ })();
+</script></head>
+
+<body onload="runTest();">
+<input type="text" id="textfield">
+<p id="result">This test has to run in iOS WebKitTestRunner.</p>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+ description("This tests that even though force user scalable = true, we won't scale if a text field gets focus and the page has maximum-scale=1");
+
+ if (window.testRunner) {
+ window.jsTestIsAsync = true;
+ testRunner.setIgnoresViewportScaleLimits(true);
+ }
+
+ function runTest()
+ {
+ if (testRunner.runUIScript) {
+ var uiScript = document.getElementById('ui-script').text;
+ testRunner.runUIScript(document.getElementById('ui-script').text, function(result) {
+ debug("Zoom scale is: " + result);
+ finishJSTest();
+ });
+ }
+ }
+</script>
+
+<script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastformsiosuserscalabledoesnotscaleforkeyboardfocuswithuserscalablenoexpectedtxtfromrev206621trunkLayoutTestsfastviewportiosuserscalablescalesforkeyboardfocuswithnoauthordefinedscaleexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/fast/forms/ios/user-scalable-does-not-scale-for-keyboard-focus-with-user-scalable-no-expected.txt (from rev 206621, trunk/LayoutTests/fast/viewport/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale-expected.txt) (0 => 206626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/ios/user-scalable-does-not-scale-for-keyboard-focus-with-user-scalable-no-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/forms/ios/user-scalable-does-not-scale-for-keyboard-focus-with-user-scalable-no-expected.txt 2016-09-30 00:38:18 UTC (rev 206626)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+
+This test has to run in iOS WebKitTestRunner.
+
+This tests that even though force user scalable = true, we won't scale if a text field gets focus and the page has user-scalable=no
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Zoom scale is: 1
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastformsiosuserscalabledoesnotscaleforkeyboardfocuswithuserscalablenohtmlfromrev206621trunkLayoutTestsfastviewportiosuserscalabledoesnotscaleforkeyboardfocuswithauthordefinedscalehtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/fast/forms/ios/user-scalable-does-not-scale-for-keyboard-focus-with-user-scalable-no.html (from rev 206621, trunk/LayoutTests/fast/viewport/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale.html) (0 => 206626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/ios/user-scalable-does-not-scale-for-keyboard-focus-with-user-scalable-no.html (rev 0)
+++ trunk/LayoutTests/fast/forms/ios/user-scalable-does-not-scale-for-keyboard-focus-with-user-scalable-no.html 2016-09-30 00:38:18 UTC (rev 206626)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true ] -->
+<html>
+<head>
+<script src="../../../resources/js-test-pre.js"></script>
+<meta name="viewport" content="width=device-width, user-scalable=no">
+<script id="ui-script" type="text/plain">
+ (function() {
+ uiController.didEndZoomingCallback = function() {
+ uiController.uiScriptComplete(uiController.zoomScale);
+ };
+
+ uiController.singleTapAtPoint(10, 10, function() {});
+ })();
+</script></head>
+
+<body onload="runTest();">
+<input type="text" id="textfield">
+<p id="result">This test has to run in iOS WebKitTestRunner.</p>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+ description("This tests that even though force user scalable = true, we won't scale if a text field gets focus and the page has user-scalable=no");
+
+ if (window.testRunner) {
+ window.jsTestIsAsync = true;
+ testRunner.setIgnoresViewportScaleLimits(true);
+ }
+
+ function runTest()
+ {
+ if (testRunner.runUIScript) {
+ var uiScript = document.getElementById('ui-script').text;
+ testRunner.runUIScript(document.getElementById('ui-script').text, function(result) {
+ debug("Zoom scale is: " + result);
+ finishJSTest();
+ });
+ }
+ }
+</script>
+
+<script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastformsiosuserscalablescalesforkeyboardfocuswithnoauthordefinedscaleexpectedtxtfromrev206621trunkLayoutTestsfastviewportiosuserscalablescalesforkeyboardfocuswithnoauthordefinedscaleexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/fast/forms/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale-expected.txt (from rev 206621, trunk/LayoutTests/fast/viewport/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale-expected.txt) (0 => 206626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/forms/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale-expected.txt 2016-09-30 00:38:18 UTC (rev 206626)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+
+This test has to run in iOS WebKitTestRunner.
+
+This tests that when the author does not define a scale or set user-scalable=no, that zooming in on focused nodes changes the scale.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Zoom scale is: 1.45
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastformsiosuserscalablescalesforkeyboardfocuswithnoauthordefinedscalehtmlfromrev206621trunkLayoutTestsfastviewportiosuserscalablescalesforkeyboardfocuswithnoauthordefinedscalehtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/fast/forms/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale.html (from rev 206621, trunk/LayoutTests/fast/viewport/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale.html) (0 => 206626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale.html (rev 0)
+++ trunk/LayoutTests/fast/forms/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale.html 2016-09-30 00:38:18 UTC (rev 206626)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true ] -->
+<html>
+<head>
+<script src="../../../resources/js-test-pre.js"></script>
+<meta name="viewport">
+<script id="ui-script" type="text/plain">
+ (function() {
+ uiController.didEndZoomingCallback = function() {
+ uiController.uiScriptComplete(uiController.zoomScale);
+ };
+
+ uiController.singleTapAtPoint(10, 10, function() {});
+ })();
+</script></head>
+
+<body onload="runTest();">
+<input type="text" id="textfield">
+<p id="result">This test has to run in iOS WebKitTestRunner.</p>
+
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+ description("This tests that when the author does not define a scale or set user-scalable=no, that zooming in on focused nodes changes the scale.");
+
+ if (window.testRunner) {
+ window.jsTestIsAsync = true;
+ testRunner.setIgnoresViewportScaleLimits(true);
+ }
+
+ function runTest()
+ {
+ if (testRunner.runUIScript) {
+ var uiScript = document.getElementById('ui-script').text;;
+ document.getElementById("textfield").focus();
+ testRunner.runUIScript(document.getElementById('ui-script').text, function(result) {
+ debug("Zoom scale is: " + Number(result).toFixed(2));
+ finishJSTest();
+ });
+ }
+ }
+</script>
+
+<script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastviewportiosuserscalabledoesnotscaleforkeyboardfocuswithauthordefinedscaleexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/viewport/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale-expected.txt (206625 => 206626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/viewport/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale-expected.txt 2016-09-30 00:15:27 UTC (rev 206625)
+++ trunk/LayoutTests/fast/viewport/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale-expected.txt 2016-09-30 00:38:18 UTC (rev 206626)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-This test has to run in iOS WebKitTestRunner.
-
-
-This tests that even though force user scalable = true, we won't scale if a text field gets focus by default.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-Maximum zoom scale was: 1
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
</del></span></pre></div>
<a id="trunkLayoutTestsfastviewportiosuserscalabledoesnotscaleforkeyboardfocuswithauthordefinedscalehtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/viewport/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale.html (206625 => 206626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/viewport/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale.html 2016-09-30 00:15:27 UTC (rev 206625)
+++ trunk/LayoutTests/fast/viewport/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale.html 2016-09-30 00:38:18 UTC (rev 206626)
</span><span class="lines">@@ -1,44 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<script src="../../../resources/js-test-pre.js"></script>
-<meta name="viewport" content="width=device-width, maximum-scale=1">
-<script id="ui-script" type="text/plain">
- (function() {
- uiController.uiScriptComplete(uiController.zoomScale);
- })();
-</script></head>
-
-<body onload="runTest();">
-<p id="result">This test has to run in iOS WebKitTestRunner.</p>
-
-<input type="text" id="textfield">
-
-<p id="description"></p>
-<div id="console"></div>
-
-<script>
- description("This tests that even though force user scalable = true, we won't scale if a text field gets focus by default.");
-
- if (window.testRunner) {
- window.jsTestIsAsync = true;
- testRunner.setIgnoresViewportScaleLimits(true);
- }
-
- function runTest()
- {
- if (testRunner.runUIScript) {
- var uiScript = document.getElementById('ui-script').text;
- testRunner.setIgnoresViewportScaleLimits(false);
- document.getElementById("textfield").focus();
- testRunner.runUIScript(document.getElementById('ui-script').text, function(result) {
- debug("Maximum zoom scale was: " + result);
- finishJSTest();
- });
- }
- }
-</script>
-
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastviewportiosuserscalablescalesforkeyboardfocuswithnoauthordefinedscaleexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/viewport/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale-expected.txt (206625 => 206626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/viewport/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale-expected.txt 2016-09-30 00:15:27 UTC (rev 206625)
+++ trunk/LayoutTests/fast/viewport/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale-expected.txt 2016-09-30 00:38:18 UTC (rev 206626)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-This test has to run in iOS WebKitTestRunner.
-
-
-This tests that when the author does not define a scale or width, that zooming in on focused nodes changes the scale.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-Maximum zoom scale was: 0.33
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
</del></span></pre></div>
<a id="trunkLayoutTestsfastviewportiosuserscalablescalesforkeyboardfocuswithnoauthordefinedscalehtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/viewport/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale.html (206625 => 206626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/viewport/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale.html 2016-09-30 00:15:27 UTC (rev 206625)
+++ trunk/LayoutTests/fast/viewport/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale.html 2016-09-30 00:38:18 UTC (rev 206626)
</span><span class="lines">@@ -1,44 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<script src="../../../resources/js-test-pre.js"></script>
-<meta name="viewport">
-<script id="ui-script" type="text/plain">
- (function() {
- uiController.uiScriptComplete(uiController.zoomScale);
- })();
-</script></head>
-
-<body onload="runTest();">
-<p id="result">This test has to run in iOS WebKitTestRunner.</p>
-
-<input type="text" id="textfield">
-
-<p id="description"></p>
-<div id="console"></div>
-
-<script>
- description("This tests that when the author does not define a scale or width, that zooming in on focused nodes changes the scale.");
-
- if (window.testRunner) {
- window.jsTestIsAsync = true;
- testRunner.setIgnoresViewportScaleLimits(true);
- }
-
- function runTest()
- {
- if (testRunner.runUIScript) {
- var uiScript = document.getElementById('ui-script').text;
- testRunner.setIgnoresViewportScaleLimits(false);
- document.getElementById("textfield").focus();
- testRunner.runUIScript(document.getElementById('ui-script').text, function(result) {
- debug("Maximum zoom scale was: " + Number(result).toFixed(2));
- finishJSTest();
- });
- }
- }
-</script>
-
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206625 => 206626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-30 00:15:27 UTC (rev 206625)
+++ trunk/Source/WebCore/ChangeLog 2016-09-30 00:38:18 UTC (rev 206626)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-09-29 Nan Wang <n_wang@apple.com>
+
+ AX: iOS: Tapping <input> in Safari zooms in a bit when page has max scale = 1
+ https://bugs.webkit.org/show_bug.cgi?id=162471
+
+ Reviewed by Simon Fraser.
+
+ If the author has defined a maximum scale, we should honor that when keyboard focus moves
+ to a text field, instead of using the forceAlwaysUserScalableMaximumScale.
+
+ Tests: fast/forms/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale.html
+ fast/forms/ios/user-scalable-does-not-scale-for-keyboard-focus-with-user-scalable-no.html
+ fast/forms/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale.html
+
+ * page/ViewportConfiguration.cpp:
+ (WebCore::ViewportConfiguration::allowsUserScaling):
+ (WebCore::ViewportConfiguration::allowsUserScalingIgnoringAlwaysScalable):
+ (WebCore::ViewportConfiguration::allowsUserScalingIgnoringForceAlwaysScaling): Deleted.
+ * page/ViewportConfiguration.h:
+ (WebCore::ViewportConfiguration::maximumScaleIgnoringAlwaysScalable):
+ (WebCore::ViewportConfiguration::maximumScale): Deleted.
+
</ins><span class="cx"> 2016-09-29 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix syntax violation handling in IPv4 address parsing
</span></span></pre></div>
<a id="trunkSourceWebCorepageViewportConfigurationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ViewportConfiguration.cpp (206625 => 206626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ViewportConfiguration.cpp 2016-09-30 00:15:27 UTC (rev 206625)
+++ trunk/Source/WebCore/page/ViewportConfiguration.cpp 2016-09-30 00:38:18 UTC (rev 206626)
</span><span class="lines">@@ -209,10 +209,10 @@
</span><span class="cx">
</span><span class="cx"> bool ViewportConfiguration::allowsUserScaling() const
</span><span class="cx"> {
</span><del>- return m_forceAlwaysUserScalable || allowsUserScalingIgnoringForceAlwaysScaling();
</del><ins>+ return m_forceAlwaysUserScalable || allowsUserScalingIgnoringAlwaysScalable();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool ViewportConfiguration::allowsUserScalingIgnoringForceAlwaysScaling() const
</del><ins>+bool ViewportConfiguration::allowsUserScalingIgnoringAlwaysScalable() const
</ins><span class="cx"> {
</span><span class="cx"> return shouldIgnoreScalingConstraints() || m_configuration.allowsUserScaling;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageViewportConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ViewportConfiguration.h (206625 => 206626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ViewportConfiguration.h 2016-09-30 00:15:27 UTC (rev 206625)
+++ trunk/Source/WebCore/page/ViewportConfiguration.h 2016-09-30 00:38:18 UTC (rev 206626)
</span><span class="lines">@@ -92,8 +92,9 @@
</span><span class="cx"> WEBCORE_EXPORT double initialScaleIgnoringContentSize() const;
</span><span class="cx"> WEBCORE_EXPORT double minimumScale() const;
</span><span class="cx"> double maximumScale() const { return m_forceAlwaysUserScalable ? forceAlwaysUserScalableMaximumScale : m_configuration.maximumScale; }
</span><ins>+ double maximumScaleIgnoringAlwaysScalable() const { return m_configuration.maximumScale; }
</ins><span class="cx"> WEBCORE_EXPORT bool allowsUserScaling() const;
</span><del>- WEBCORE_EXPORT bool allowsUserScalingIgnoringForceAlwaysScaling() const;
</del><ins>+ WEBCORE_EXPORT bool allowsUserScalingIgnoringAlwaysScalable() const;
</ins><span class="cx"> bool allowsShrinkToFit() const;
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT static Parameters webpageParameters();
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (206625 => 206626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-09-30 00:15:27 UTC (rev 206625)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-30 00:38:18 UTC (rev 206626)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-09-29 Nan Wang <n_wang@apple.com>
+
+ AX: iOS: Tapping <input> in Safari zooms in a bit when page has max scale = 1
+ https://bugs.webkit.org/show_bug.cgi?id=162471
+
+ Reviewed by Simon Fraser.
+
+ * Shared/AssistedNodeInformation.cpp:
+ (WebKit::AssistedNodeInformation::encode):
+ (WebKit::AssistedNodeInformation::decode):
+ * Shared/AssistedNodeInformation.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _displayFormNodeInputView]):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::maximumPageScaleFactorIgnoringAlwaysScalable):
+ (WebKit::WebPage::getAssistedNodeInformation):
+
</ins><span class="cx"> 2016-09-29 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Mark NetworkLoad as final
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAssistedNodeInformationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/AssistedNodeInformation.cpp (206625 => 206626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/AssistedNodeInformation.cpp 2016-09-30 00:15:27 UTC (rev 206625)
+++ trunk/Source/WebKit2/Shared/AssistedNodeInformation.cpp 2016-09-30 00:38:18 UTC (rev 206626)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx"> encoder << selectionRect;
</span><span class="cx"> encoder << minimumScaleFactor;
</span><span class="cx"> encoder << maximumScaleFactor;
</span><ins>+ encoder << maximumScaleFactorIgnoringAlwaysScalable;
</ins><span class="cx"> encoder << nodeFontSize;
</span><span class="cx"> encoder << hasNextNode;
</span><span class="cx"> encoder << hasPreviousNode;
</span><span class="lines">@@ -79,7 +80,7 @@
</span><span class="cx"> encoder << isMultiSelect;
</span><span class="cx"> encoder << isReadOnly;
</span><span class="cx"> encoder << allowsUserScaling;
</span><del>- encoder << allowsUserScalingIgnoringForceAlwaysScaling;
</del><ins>+ encoder << allowsUserScalingIgnoringAlwaysScalable;
</ins><span class="cx"> encoder << insideFixedPosition;
</span><span class="cx"> encoder << value;
</span><span class="cx"> encoder << valueAsNumber;
</span><span class="lines">@@ -100,6 +101,9 @@
</span><span class="cx">
</span><span class="cx"> if (!decoder.decode(result.maximumScaleFactor))
</span><span class="cx"> return false;
</span><ins>+
+ if (!decoder.decode(result.maximumScaleFactorIgnoringAlwaysScalable))
+ return false;
</ins><span class="cx">
</span><span class="cx"> if (!decoder.decode(result.nodeFontSize))
</span><span class="cx"> return false;
</span><span class="lines">@@ -140,7 +144,7 @@
</span><span class="cx"> if (!decoder.decode(result.allowsUserScaling))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (!decoder.decode(result.allowsUserScalingIgnoringForceAlwaysScaling))
</del><ins>+ if (!decoder.decode(result.allowsUserScalingIgnoringAlwaysScalable))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (!decoder.decode(result.insideFixedPosition))
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAssistedNodeInformationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/AssistedNodeInformation.h (206625 => 206626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/AssistedNodeInformation.h 2016-09-30 00:15:27 UTC (rev 206625)
+++ trunk/Source/WebKit2/Shared/AssistedNodeInformation.h 2016-09-30 00:38:18 UTC (rev 206626)
</span><span class="lines">@@ -91,6 +91,7 @@
</span><span class="cx"> WebCore::IntRect selectionRect;
</span><span class="cx"> double minimumScaleFactor { -INFINITY };
</span><span class="cx"> double maximumScaleFactor { INFINITY };
</span><ins>+ double maximumScaleFactorIgnoringAlwaysScalable { INFINITY };
</ins><span class="cx"> double nodeFontSize { 0 };
</span><span class="cx"> bool hasNextNode { false };
</span><span class="cx"> bool hasPreviousNode { false };
</span><span class="lines">@@ -99,7 +100,7 @@
</span><span class="cx"> bool isMultiSelect { false };
</span><span class="cx"> bool isReadOnly {false };
</span><span class="cx"> bool allowsUserScaling { false };
</span><del>- bool allowsUserScalingIgnoringForceAlwaysScaling { false };
</del><ins>+ bool allowsUserScalingIgnoringAlwaysScalable { false };
</ins><span class="cx"> bool insideFixedPosition { false };
</span><span class="cx"> WebAutocapitalizeType autocapitalizeType { WebAutocapitalizeTypeDefault };
</span><span class="cx"> InputType elementType { InputType::None };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (206625 => 206626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-09-30 00:15:27 UTC (rev 206625)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-09-30 00:38:18 UTC (rev 206626)
</span><span class="lines">@@ -1102,8 +1102,8 @@
</span><span class="cx"> selectionRect: _didAccessoryTabInitiateFocus ? IntRect() : _assistedNodeInformation.selectionRect
</span><span class="cx"> fontSize:_assistedNodeInformation.nodeFontSize
</span><span class="cx"> minimumScale:_assistedNodeInformation.minimumScaleFactor
</span><del>- maximumScale:_assistedNodeInformation.maximumScaleFactor
- allowScaling:(_assistedNodeInformation.allowsUserScalingIgnoringForceAlwaysScaling && !UICurrentUserInterfaceIdiomIsPad())
</del><ins>+ maximumScale:_assistedNodeInformation.maximumScaleFactorIgnoringAlwaysScalable
+ allowScaling:(_assistedNodeInformation.allowsUserScalingIgnoringAlwaysScalable && !UICurrentUserInterfaceIdiomIsPad())
</ins><span class="cx"> forceScroll:[self requiresAccessoryView]];
</span><span class="cx">
</span><span class="cx"> _didAccessoryTabInitiateFocus = NO;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (206625 => 206626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-09-30 00:15:27 UTC (rev 206625)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-09-30 00:38:18 UTC (rev 206626)
</span><span class="lines">@@ -518,6 +518,7 @@
</span><span class="cx">
</span><span class="cx"> double minimumPageScaleFactor() const;
</span><span class="cx"> double maximumPageScaleFactor() const;
</span><ins>+ double maximumPageScaleFactorIgnoringAlwaysScalable() const;
</ins><span class="cx"> bool allowsUserScaling() const;
</span><span class="cx"> bool hasStablePageScaleFactor() const { return m_hasStablePageScaleFactor; }
</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 (206625 => 206626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-09-30 00:15:27 UTC (rev 206625)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-09-30 00:38:18 UTC (rev 206626)
</span><span class="lines">@@ -327,6 +327,13 @@
</span><span class="cx"> return m_viewportConfiguration.maximumScale();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+double WebPage::maximumPageScaleFactorIgnoringAlwaysScalable() const
+{
+ if (!m_viewportConfiguration.allowsUserScalingIgnoringAlwaysScalable())
+ return m_page->pageScaleFactor();
+ return m_viewportConfiguration.maximumScaleIgnoringAlwaysScalable();
+}
+
</ins><span class="cx"> bool WebPage::allowsUserScaling() const
</span><span class="cx"> {
</span><span class="cx"> return m_viewportConfiguration.allowsUserScaling();
</span><span class="lines">@@ -2543,8 +2550,9 @@
</span><span class="cx">
</span><span class="cx"> information.minimumScaleFactor = minimumPageScaleFactor();
</span><span class="cx"> information.maximumScaleFactor = maximumPageScaleFactor();
</span><ins>+ information.maximumScaleFactorIgnoringAlwaysScalable = maximumPageScaleFactorIgnoringAlwaysScalable();
</ins><span class="cx"> information.allowsUserScaling = m_viewportConfiguration.allowsUserScaling();
</span><del>- information.allowsUserScalingIgnoringForceAlwaysScaling = m_viewportConfiguration.allowsUserScalingIgnoringForceAlwaysScaling();
</del><ins>+ information.allowsUserScalingIgnoringAlwaysScalable = m_viewportConfiguration.allowsUserScalingIgnoringAlwaysScalable();
</ins><span class="cx"> information.hasNextNode = hasAssistableElement(m_assistedNode.get(), *m_page, true);
</span><span class="cx"> information.hasPreviousNode = hasAssistableElement(m_assistedNode.get(), *m_page, false);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>