<!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>[201294] 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/201294">201294</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2016-05-23 13:44:06 -0700 (Mon, 23 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: iOS: when bringing focus to a text field we may zoom the page even if author wanted max scale = 1
https://bugs.webkit.org/show_bug.cgi?id=157771
Reviewed by Tim Horton.
Source/WebCore:
If the author requests scaling not to be enabled, we should not scale in when keyboard focus moves to a text field.
Scaling should only happen when the user performs a gesture to do so in this case.
Tests: fast/viewport/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale.html
fast/viewport/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale.html
* page/ViewportConfiguration.h:
(WebCore::ViewportConfiguration::maximumScale):
Source/WebKit2:
* Shared/AssistedNodeInformation.cpp:
(WebKit::AssistedNodeInformation::encode):
(WebKit::AssistedNodeInformation::decode):
* Shared/AssistedNodeInformation.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _displayFormNodeInputView]):
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::getAssistedNodeInformation):</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
<h3>Added 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="trunkLayoutTestsfastviewportiosuserscalabledoesnotscaleforkeyboardfocuswithauthordefinedscaleexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/viewport/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale-expected.txt (0 => 201294)</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 (rev 0)
+++ trunk/LayoutTests/fast/viewport/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale-expected.txt 2016-05-23 20:44:06 UTC (rev 201294)
</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 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
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastviewportiosuserscalabledoesnotscaleforkeyboardfocuswithauthordefinedscalehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/viewport/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale.html (0 => 201294)</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 (rev 0)
+++ trunk/LayoutTests/fast/viewport/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale.html 2016-05-23 20:44:06 UTC (rev 201294)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+<!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.");
+
+ window.internals.setViewportForceAlwaysUserScalable(true);
+ if (window.testRunner) {
+ window.jsTestIsAsync = true;
+ }
+
+ function runTest()
+ {
+ if (testRunner.runUIScript) {
+ var uiScript = document.getElementById('ui-script').text;
+ window.internals.setViewportForceAlwaysUserScalable(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>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastviewportiosuserscalablescalesforkeyboardfocuswithnoauthordefinedscaleexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/viewport/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale-expected.txt (0 => 201294)</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 (rev 0)
+++ trunk/LayoutTests/fast/viewport/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale-expected.txt 2016-05-23 20:44:06 UTC (rev 201294)
</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 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
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastviewportiosuserscalablescalesforkeyboardfocuswithnoauthordefinedscalehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/viewport/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale.html (0 => 201294)</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 (rev 0)
+++ trunk/LayoutTests/fast/viewport/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale.html 2016-05-23 20:44:06 UTC (rev 201294)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+<!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.");
+
+ window.internals.setViewportForceAlwaysUserScalable(true);
+ if (window.testRunner) {
+ window.jsTestIsAsync = true;
+ }
+
+ function runTest()
+ {
+ if (testRunner.runUIScript) {
+ var uiScript = document.getElementById('ui-script').text;
+ window.internals.setViewportForceAlwaysUserScalable(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>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201293 => 201294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-23 20:27:28 UTC (rev 201293)
+++ trunk/Source/WebCore/ChangeLog 2016-05-23 20:44:06 UTC (rev 201294)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-05-23 Chris Fleizach <cfleizach@apple.com>
+
+ AX: iOS: when bringing focus to a text field we may zoom the page even if author wanted max scale = 1
+ https://bugs.webkit.org/show_bug.cgi?id=157771
+
+ Reviewed by Tim Horton.
+
+ If the author requests scaling not to be enabled, we should not scale in when keyboard focus moves to a text field.
+ Scaling should only happen when the user performs a gesture to do so in this case.
+
+ Tests: fast/viewport/ios/user-scalable-does-not-scale-for-keyboard-focus-with-author-defined-scale.html
+ fast/viewport/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale.html
+
+ * page/ViewportConfiguration.h:
+ (WebCore::ViewportConfiguration::maximumScale):
+
</ins><span class="cx"> 2016-05-23 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r200414.
</span></span></pre></div>
<a id="trunkSourceWebCorepageViewportConfigurationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ViewportConfiguration.cpp (201293 => 201294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ViewportConfiguration.cpp 2016-05-23 20:27:28 UTC (rev 201293)
+++ trunk/Source/WebCore/page/ViewportConfiguration.cpp 2016-05-23 20:44:06 UTC (rev 201294)
</span><span class="lines">@@ -209,8 +209,13 @@
</span><span class="cx">
</span><span class="cx"> bool ViewportConfiguration::allowsUserScaling() const
</span><span class="cx"> {
</span><del>- return m_forceAlwaysUserScalable || shouldIgnoreScalingConstraints() || m_configuration.allowsUserScaling;
</del><ins>+ return m_forceAlwaysUserScalable || allowsUserScalingIgnoringForceAlwaysScaling();
</ins><span class="cx"> }
</span><ins>+
+bool ViewportConfiguration::allowsUserScalingIgnoringForceAlwaysScaling() const
+{
+ return shouldIgnoreScalingConstraints() || m_configuration.allowsUserScaling;
+}
</ins><span class="cx">
</span><span class="cx"> ViewportConfiguration::Parameters ViewportConfiguration::webpageParameters()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorepageViewportConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ViewportConfiguration.h (201293 => 201294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ViewportConfiguration.h 2016-05-23 20:27:28 UTC (rev 201293)
+++ trunk/Source/WebCore/page/ViewportConfiguration.h 2016-05-23 20:44:06 UTC (rev 201294)
</span><span class="lines">@@ -93,6 +93,7 @@
</span><span class="cx"> WEBCORE_EXPORT double minimumScale() const;
</span><span class="cx"> double maximumScale() const { return m_forceAlwaysUserScalable ? forceAlwaysUserScalableMaximumScale : m_configuration.maximumScale; }
</span><span class="cx"> WEBCORE_EXPORT bool allowsUserScaling() const;
</span><ins>+ WEBCORE_EXPORT bool allowsUserScalingIgnoringForceAlwaysScaling() 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 (201293 => 201294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-05-23 20:27:28 UTC (rev 201293)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-23 20:44:06 UTC (rev 201294)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-05-23 Chris Fleizach <cfleizach@apple.com>
+
+ AX: iOS: when bringing focus to a text field we may zoom the page even if author wanted max scale = 1
+ https://bugs.webkit.org/show_bug.cgi?id=157771
+
+ Reviewed by Tim Horton.
+
+ * Shared/AssistedNodeInformation.cpp:
+ (WebKit::AssistedNodeInformation::encode):
+ (WebKit::AssistedNodeInformation::decode):
+ * Shared/AssistedNodeInformation.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _displayFormNodeInputView]):
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::getAssistedNodeInformation):
+
</ins><span class="cx"> 2016-05-23 Miguel Gomez <magomez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [ThreadedCompositor] Ensure that the BitmapTexture used by CoordinatedBackingStoreTile matches the opacity of the painted surface
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAssistedNodeInformationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/AssistedNodeInformation.cpp (201293 => 201294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/AssistedNodeInformation.cpp 2016-05-23 20:27:28 UTC (rev 201293)
+++ trunk/Source/WebKit2/Shared/AssistedNodeInformation.cpp 2016-05-23 20:44:06 UTC (rev 201294)
</span><span class="lines">@@ -80,6 +80,7 @@
</span><span class="cx"> encoder << isMultiSelect;
</span><span class="cx"> encoder << isReadOnly;
</span><span class="cx"> encoder << allowsUserScaling;
</span><ins>+ encoder << allowsUserScalingIgnoringForceAlwaysScaling;
</ins><span class="cx"> encoder << insideFixedPosition;
</span><span class="cx"> encoder << value;
</span><span class="cx"> encoder << valueAsNumber;
</span><span class="lines">@@ -139,6 +140,9 @@
</span><span class="cx">
</span><span class="cx"> if (!decoder.decode(result.allowsUserScaling))
</span><span class="cx"> return false;
</span><ins>+
+ if (!decoder.decode(result.allowsUserScalingIgnoringForceAlwaysScaling))
+ return false;
</ins><span class="cx">
</span><span class="cx"> if (!decoder.decode(result.insideFixedPosition))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAssistedNodeInformationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/AssistedNodeInformation.h (201293 => 201294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/AssistedNodeInformation.h 2016-05-23 20:27:28 UTC (rev 201293)
+++ trunk/Source/WebKit2/Shared/AssistedNodeInformation.h 2016-05-23 20:44:06 UTC (rev 201294)
</span><span class="lines">@@ -99,6 +99,7 @@
</span><span class="cx"> bool isMultiSelect { false };
</span><span class="cx"> bool isReadOnly {false };
</span><span class="cx"> bool allowsUserScaling { false };
</span><ins>+ bool allowsUserScalingIgnoringForceAlwaysScaling { 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 (201293 => 201294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-05-23 20:27:28 UTC (rev 201293)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-05-23 20:44:06 UTC (rev 201294)
</span><span class="lines">@@ -1045,12 +1045,14 @@
</span><span class="cx">
</span><span class="cx"> - (void)_displayFormNodeInputView
</span><span class="cx"> {
</span><ins>+ // In case user scaling is force enabled, do not use that scaling when zooming in with an input field.
+ // Zooming above the page's default scale factor should only happen when the user performs it.
</ins><span class="cx"> [self _zoomToFocusRect:_assistedNodeInformation.elementRect
</span><span class="cx"> selectionRect: _didAccessoryTabInitiateFocus ? IntRect() : _assistedNodeInformation.selectionRect
</span><span class="cx"> fontSize:_assistedNodeInformation.nodeFontSize
</span><span class="cx"> minimumScale:_assistedNodeInformation.minimumScaleFactor
</span><span class="cx"> maximumScale:_assistedNodeInformation.maximumScaleFactor
</span><del>- allowScaling:(_assistedNodeInformation.allowsUserScaling && !UICurrentUserInterfaceIdiomIsPad())
</del><ins>+ allowScaling:(_assistedNodeInformation.allowsUserScalingIgnoringForceAlwaysScaling && !UICurrentUserInterfaceIdiomIsPad())
</ins><span class="cx"> forceScroll:[self requiresAccessoryView]];
</span><span class="cx"> _didAccessoryTabInitiateFocus = NO;
</span><span class="cx"> [self _ensureFormAccessoryView];
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (201293 => 201294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-05-23 20:27:28 UTC (rev 201293)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-05-23 20:44:06 UTC (rev 201294)
</span><span class="lines">@@ -2547,6 +2547,7 @@
</span><span class="cx"> information.minimumScaleFactor = minimumPageScaleFactor();
</span><span class="cx"> information.maximumScaleFactor = maximumPageScaleFactor();
</span><span class="cx"> information.allowsUserScaling = m_viewportConfiguration.allowsUserScaling();
</span><ins>+ information.allowsUserScalingIgnoringForceAlwaysScaling = m_viewportConfiguration.allowsUserScalingIgnoringForceAlwaysScaling();
</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>