<!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>[206217] 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/206217">206217</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-21 10:44:43 -0700 (Wed, 21 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/201090">r201090</a>): Setting style.webkitTextSizeAdjust does not change text change on iPad
https://bugs.webkit.org/show_bug.cgi?id=162227
<rdar://problem/27201529>
Reviewed by Simon Fraser.
Source/WebCore:
The CSS property -webkit-text-size-adjust should be respected on all iOS devices. Following
<a href="http://trac.webkit.org/projects/webkit/changeset/201090">r201090</a> we respect it only on iPhone and in iPhone-apps run on iPad.
Tests: fast/text-autosizing/ios/ipad/programmatic-text-size-adjust.html
fast/text-autosizing/ios/ipad/text-size-adjust-inline-style.html
fast/text-autosizing/ios/programmatic-text-size-adjust.html
fast/text-autosizing/ios/text-size-adjust-inline-style.html
fast/text-autosizing/text-size-adjust-inline-style.html
* css/parser/CSSParser.cpp:
(WebCore::isValidKeywordPropertyAndValue): Remove unused code to validate -webkit-text-size-adjust.
This code is never used because -webkit-text-size-adjust is a value property (since it accepts a
<percentage> as a value and CSSParserFastPaths::isKeywordPropertyID(CSSPropertyWebkitTextSizeAdjust)
returns false). That is, it is not a keyword property.
(WebCore::CSSParser::parseValue): Always enable the -webkit-text-size-adjust CSS property when
building for iOS regardless of whether Settings:textAutosizingEnabled() is enabled.
LayoutTests:
Add tests to ensure setting the CSS property -webkit-text-size-adjust in a stylesheet or
programmatically is respected on iPhone and iPad. Also added a test to ensure that this
CSS property is ignored on macOS by default.
Note that we have existing tests that ensure that -webkit-text-size-adjust is respected
on macOS when the internal setting Settings::textAutosizingEnabled() is enabled.
* fast/text-autosizing/ios/ipad/programmatic-text-size-adjust-expected.txt: Added.
* fast/text-autosizing/ios/ipad/programmatic-text-size-adjust.html: Added.
* fast/text-autosizing/ios/ipad/text-size-adjust-inline-style-expected.html: Added.
* fast/text-autosizing/ios/ipad/text-size-adjust-inline-style.html: Added.
* fast/text-autosizing/ios/programmatic-text-size-adjust-expected.txt: Added.
* fast/text-autosizing/ios/programmatic-text-size-adjust.html: Added.
* fast/text-autosizing/ios/text-size-adjust-inline-style-expected.html: Added.
* fast/text-autosizing/ios/text-size-adjust-inline-style.html: Added.
* fast/text-autosizing/text-size-adjust-inline-style-expected.html: Added.
* fast/text-autosizing/text-size-adjust-inline-style.html: Added.
* platform/mac/TestExpectations: Skip the iOS and iPad tests on Mac. Otherwise, they will fail
because these tests intentionally do not call window.internal.settings.setTextAutosizingEnabled(true)
so as to test the default port behavior. And on Mac automatic text size adjustment is disabled
by default.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParsercpp">trunk/Source/WebCore/css/parser/CSSParser.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/fast/text-autosizing/ios/ipad/</li>
<li><a href="#trunkLayoutTestsfasttextautosizingiosipadprogrammatictextsizeadjustexpectedtxt">trunk/LayoutTests/fast/text-autosizing/ios/ipad/programmatic-text-size-adjust-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttextautosizingiosipadprogrammatictextsizeadjusthtml">trunk/LayoutTests/fast/text-autosizing/ios/ipad/programmatic-text-size-adjust.html</a></li>
<li><a href="#trunkLayoutTestsfasttextautosizingiosipadtextsizeadjustinlinestyleexpectedhtml">trunk/LayoutTests/fast/text-autosizing/ios/ipad/text-size-adjust-inline-style-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextautosizingiosipadtextsizeadjustinlinestylehtml">trunk/LayoutTests/fast/text-autosizing/ios/ipad/text-size-adjust-inline-style.html</a></li>
<li><a href="#trunkLayoutTestsfasttextautosizingiosprogrammatictextsizeadjustexpectedtxt">trunk/LayoutTests/fast/text-autosizing/ios/programmatic-text-size-adjust-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttextautosizingiosprogrammatictextsizeadjusthtml">trunk/LayoutTests/fast/text-autosizing/ios/programmatic-text-size-adjust.html</a></li>
<li><a href="#trunkLayoutTestsfasttextautosizingiostextsizeadjustinlinestyleexpectedhtml">trunk/LayoutTests/fast/text-autosizing/ios/text-size-adjust-inline-style-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextautosizingiostextsizeadjustinlinestylehtml">trunk/LayoutTests/fast/text-autosizing/ios/text-size-adjust-inline-style.html</a></li>
<li><a href="#trunkLayoutTestsfasttextautosizingtextsizeadjustinlinestyleexpectedhtml">trunk/LayoutTests/fast/text-autosizing/text-size-adjust-inline-style-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextautosizingtextsizeadjustinlinestylehtml">trunk/LayoutTests/fast/text-autosizing/text-size-adjust-inline-style.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (206216 => 206217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-09-21 17:35:54 UTC (rev 206216)
+++ trunk/LayoutTests/ChangeLog 2016-09-21 17:44:43 UTC (rev 206217)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-09-21 Daniel Bates <dabates@apple.com>
+
+ REGRESSION (r201090): Setting style.webkitTextSizeAdjust does not change text change on iPad
+ https://bugs.webkit.org/show_bug.cgi?id=162227
+ <rdar://problem/27201529>
+
+ Reviewed by Simon Fraser.
+
+ Add tests to ensure setting the CSS property -webkit-text-size-adjust in a stylesheet or
+ programmatically is respected on iPhone and iPad. Also added a test to ensure that this
+ CSS property is ignored on macOS by default.
+
+ Note that we have existing tests that ensure that -webkit-text-size-adjust is respected
+ on macOS when the internal setting Settings::textAutosizingEnabled() is enabled.
+
+ * fast/text-autosizing/ios/ipad/programmatic-text-size-adjust-expected.txt: Added.
+ * fast/text-autosizing/ios/ipad/programmatic-text-size-adjust.html: Added.
+ * fast/text-autosizing/ios/ipad/text-size-adjust-inline-style-expected.html: Added.
+ * fast/text-autosizing/ios/ipad/text-size-adjust-inline-style.html: Added.
+ * fast/text-autosizing/ios/programmatic-text-size-adjust-expected.txt: Added.
+ * fast/text-autosizing/ios/programmatic-text-size-adjust.html: Added.
+ * fast/text-autosizing/ios/text-size-adjust-inline-style-expected.html: Added.
+ * fast/text-autosizing/ios/text-size-adjust-inline-style.html: Added.
+ * fast/text-autosizing/text-size-adjust-inline-style-expected.html: Added.
+ * fast/text-autosizing/text-size-adjust-inline-style.html: Added.
+ * platform/mac/TestExpectations: Skip the iOS and iPad tests on Mac. Otherwise, they will fail
+ because these tests intentionally do not call window.internal.settings.setTextAutosizingEnabled(true)
+ so as to test the default port behavior. And on Mac automatic text size adjustment is disabled
+ by default.
+
</ins><span class="cx"> 2016-09-21 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed gardening; after r206208, update url-null.html test to reflect current (specced) behavior.
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextautosizingiosipadprogrammatictextsizeadjustexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text-autosizing/ios/ipad/programmatic-text-size-adjust-expected.txt (0 => 206217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text-autosizing/ios/ipad/programmatic-text-size-adjust-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/text-autosizing/ios/ipad/programmatic-text-size-adjust-expected.txt 2016-09-21 17:44:43 UTC (rev 206217)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+Tests programmatically setting and getting -webkit-text-size-adjust.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Initial value of webkitTextSizeAdjust:
+PASS document.getElementById("test").style.webkitTextSizeAdjust is ""
+
+webkitTextSizeAdjust = "auto":
+PASS document.getElementById("test").style.webkitTextSizeAdjust is "auto"
+
+webkitTextSizeAdjust = "none":
+PASS document.getElementById("test").style.webkitTextSizeAdjust is "none"
+
+webkitTextSizeAdjust = "200%":
+PASS document.getElementById("test").style.webkitTextSizeAdjust is "200%"
+
+webkitTextSizeAdjust = "dummy" (invalid value):
+PASS document.getElementById("test").style.webkitTextSizeAdjust is "200%"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextautosizingiosipadprogrammatictextsizeadjusthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text-autosizing/ios/ipad/programmatic-text-size-adjust.html (0 => 206217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text-autosizing/ios/ipad/programmatic-text-size-adjust.html (rev 0)
+++ trunk/LayoutTests/fast/text-autosizing/ios/ipad/programmatic-text-size-adjust.html 2016-09-21 17:44:43 UTC (rev 206217)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../../../resources/js-test-pre.js"></script>
+<!-- We intentionally do not call window.internal.settings.setTextAutosizingEnabled(true) to test the default port behavior. -->
+</head>
+<body>
+<p id="test">The quick brown fox jumped over the lazy dog.</p>
+<script>
+description("Tests programmatically setting and getting -webkit-text-size-adjust.");
+
+debug("Initial value of webkitTextSizeAdjust:");
+shouldBeEmptyString('document.getElementById("test").style.webkitTextSizeAdjust');
+
+debug("<br>webkitTextSizeAdjust = &quot;auto&quot;:");
+document.getElementById("test").style.webkitTextSizeAdjust = "auto";
+shouldBeEqualToString('document.getElementById("test").style.webkitTextSizeAdjust', "auto");
+
+debug("<br>webkitTextSizeAdjust = &quot;none&quot;:");
+document.getElementById("test").style.webkitTextSizeAdjust = "none";
+shouldBeEqualToString('document.getElementById("test").style.webkitTextSizeAdjust', "none");
+
+debug("<br>webkitTextSizeAdjust = &quot;200%&quot;:");
+document.getElementById("test").style.webkitTextSizeAdjust = "200%";
+shouldBeEqualToString('document.getElementById("test").style.webkitTextSizeAdjust', "200%");
+
+debug("<br>webkitTextSizeAdjust = &quot;dummy&quot; (invalid value):");
+document.getElementById("test").style.webkitTextSizeAdjust = "dummy";
+shouldBeEqualToString('document.getElementById("test").style.webkitTextSizeAdjust', "200%");
+
+document.body.removeChild(document.getElementById("test"));
+</script>
+<script src="../../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextautosizingiosipadtextsizeadjustinlinestyleexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text-autosizing/ios/ipad/text-size-adjust-inline-style-expected.html (0 => 206217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text-autosizing/ios/ipad/text-size-adjust-inline-style-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text-autosizing/ios/ipad/text-size-adjust-inline-style-expected.html 2016-09-21 17:44:43 UTC (rev 206217)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: Ahem;
+ src: url("../../../../resources/Ahem.ttf");
+}
+p {
+ font-family: Ahem;
+ font-size: 20px;
+}
+</style>
+</head>
+<body>
+<p style="font-size: 20px">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="font-size: 20px">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="font-size: 10px">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="font-size: 20px">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="font-size: 30px">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="font-size: 40px">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextautosizingiosipadtextsizeadjustinlinestylehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text-autosizing/ios/ipad/text-size-adjust-inline-style.html (0 => 206217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text-autosizing/ios/ipad/text-size-adjust-inline-style.html (rev 0)
+++ trunk/LayoutTests/fast/text-autosizing/ios/ipad/text-size-adjust-inline-style.html 2016-09-21 17:44:43 UTC (rev 206217)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<!-- We intentionally do not call window.internal.settings.setTextAutosizingEnabled(true) to test the default port behavior. -->
+<style>
+@font-face {
+ font-family: Ahem;
+ src: url("../../../../resources/Ahem.ttf");
+}
+p {
+ font-family: Ahem;
+ font-size: 20px;
+}
+</style>
+</head>
+<body>
+<p style="-webkit-text-size-adjust: auto">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="-webkit-text-size-adjust: none">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="-webkit-text-size-adjust: 50%">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="-webkit-text-size-adjust: 100%">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="-webkit-text-size-adjust: 150%">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="-webkit-text-size-adjust: 200%">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextautosizingiosprogrammatictextsizeadjustexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text-autosizing/ios/programmatic-text-size-adjust-expected.txt (0 => 206217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text-autosizing/ios/programmatic-text-size-adjust-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/text-autosizing/ios/programmatic-text-size-adjust-expected.txt 2016-09-21 17:44:43 UTC (rev 206217)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+Tests programmatically setting and getting -webkit-text-size-adjust.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Initial value of webkitTextSizeAdjust:
+PASS document.getElementById("test").style.webkitTextSizeAdjust is ""
+
+webkitTextSizeAdjust = "auto":
+PASS document.getElementById("test").style.webkitTextSizeAdjust is "auto"
+
+webkitTextSizeAdjust = "none":
+PASS document.getElementById("test").style.webkitTextSizeAdjust is "none"
+
+webkitTextSizeAdjust = "200%":
+PASS document.getElementById("test").style.webkitTextSizeAdjust is "200%"
+
+webkitTextSizeAdjust = "dummy" (invalid value):
+PASS document.getElementById("test").style.webkitTextSizeAdjust is "200%"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextautosizingiosprogrammatictextsizeadjusthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text-autosizing/ios/programmatic-text-size-adjust.html (0 => 206217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text-autosizing/ios/programmatic-text-size-adjust.html (rev 0)
+++ trunk/LayoutTests/fast/text-autosizing/ios/programmatic-text-size-adjust.html 2016-09-21 17:44:43 UTC (rev 206217)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../../resources/js-test-pre.js"></script>
+<!-- We intentionally do not call window.internal.settings.setTextAutosizingEnabled(true) to test the default port behavior. -->
+</head>
+<body>
+<p id="test">The quick brown fox jumped over the lazy dog.</p>
+<script>
+description("Tests programmatically setting and getting -webkit-text-size-adjust.");
+
+debug("Initial value of webkitTextSizeAdjust:");
+shouldBeEmptyString('document.getElementById("test").style.webkitTextSizeAdjust');
+
+debug("<br>webkitTextSizeAdjust = &quot;auto&quot;:");
+document.getElementById("test").style.webkitTextSizeAdjust = "auto";
+shouldBeEqualToString('document.getElementById("test").style.webkitTextSizeAdjust', "auto");
+
+debug("<br>webkitTextSizeAdjust = &quot;none&quot;:");
+document.getElementById("test").style.webkitTextSizeAdjust = "none";
+shouldBeEqualToString('document.getElementById("test").style.webkitTextSizeAdjust', "none");
+
+debug("<br>webkitTextSizeAdjust = &quot;200%&quot;:");
+document.getElementById("test").style.webkitTextSizeAdjust = "200%";
+shouldBeEqualToString('document.getElementById("test").style.webkitTextSizeAdjust', "200%");
+
+debug("<br>webkitTextSizeAdjust = &quot;dummy&quot; (invalid value):");
+document.getElementById("test").style.webkitTextSizeAdjust = "dummy";
+shouldBeEqualToString('document.getElementById("test").style.webkitTextSizeAdjust', "200%");
+
+document.body.removeChild(document.getElementById("test"));
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextautosizingiostextsizeadjustinlinestyleexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text-autosizing/ios/text-size-adjust-inline-style-expected.html (0 => 206217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text-autosizing/ios/text-size-adjust-inline-style-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text-autosizing/ios/text-size-adjust-inline-style-expected.html 2016-09-21 17:44:43 UTC (rev 206217)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: Ahem;
+ src: url("../../../resources/Ahem.ttf");
+}
+p {
+ font-family: Ahem;
+ font-size: 20px;
+}
+</style>
+</head>
+<body>
+<p style="font-size: 20px">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="font-size: 20px">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="font-size: 10px">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="font-size: 20px">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="font-size: 30px">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="font-size: 40px">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextautosizingiostextsizeadjustinlinestylehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text-autosizing/ios/text-size-adjust-inline-style.html (0 => 206217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text-autosizing/ios/text-size-adjust-inline-style.html (rev 0)
+++ trunk/LayoutTests/fast/text-autosizing/ios/text-size-adjust-inline-style.html 2016-09-21 17:44:43 UTC (rev 206217)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<!-- We intentionally do not call window.internal.settings.setTextAutosizingEnabled(true) to test the default port behavior. -->
+<style>
+@font-face {
+ font-family: Ahem;
+ src: url("../../../resources/Ahem.ttf");
+}
+p {
+ font-family: Ahem;
+ font-size: 20px;
+}
+</style>
+</head>
+<body>
+<p style="-webkit-text-size-adjust: auto">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="-webkit-text-size-adjust: none">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="-webkit-text-size-adjust: 50%">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="-webkit-text-size-adjust: 100%">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="-webkit-text-size-adjust: 150%">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="-webkit-text-size-adjust: 200%">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextautosizingtextsizeadjustinlinestyleexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text-autosizing/text-size-adjust-inline-style-expected.html (0 => 206217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text-autosizing/text-size-adjust-inline-style-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text-autosizing/text-size-adjust-inline-style-expected.html 2016-09-21 17:44:43 UTC (rev 206217)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: Ahem;
+ src: url("../../resources/Ahem.ttf");
+}
+p {
+ font-family: Ahem;
+ font-size: 20px;
+}
+</style>
+</head>
+<body>
+<p style="font-size: 20px">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="font-size: 20px">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="font-size: 20px">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="font-size: 20px">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="font-size: 20px">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="font-size: 20px">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextautosizingtextsizeadjustinlinestylehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text-autosizing/text-size-adjust-inline-style.html (0 => 206217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text-autosizing/text-size-adjust-inline-style.html (rev 0)
+++ trunk/LayoutTests/fast/text-autosizing/text-size-adjust-inline-style.html 2016-09-21 17:44:43 UTC (rev 206217)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<!-- We intentionally do not call window.internal.settings.setTextAutosizingEnabled(true) to test the default port behavior. -->
+<style>
+@font-face {
+ font-family: Ahem;
+ src: url("../../resources/Ahem.ttf");
+}
+p {
+ font-family: Ahem;
+ font-size: 20px;
+}
+</style>
+</head>
+<body>
+<p style="-webkit-text-size-adjust: auto">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="-webkit-text-size-adjust: none">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="-webkit-text-size-adjust: 50%">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="-webkit-text-size-adjust: 100%">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="-webkit-text-size-adjust: 150%">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+<p style="-webkit-text-size-adjust: 200%">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (206216 => 206217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2016-09-21 17:35:54 UTC (rev 206216)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-09-21 17:44:43 UTC (rev 206217)
</span><span class="lines">@@ -17,6 +17,10 @@
</span><span class="cx">
</span><span class="cx"> fast/url/user-visible [ Pass ]
</span><span class="cx">
</span><ins>+fast/text-autosizing/ios/ipad/programmatic-text-size-adjust.html [ Skip ]
+fast/text-autosizing/ios/ipad/text-size-adjust-inline-style.html [ Skip ]
+fast/text-autosizing/ios/programmatic-text-size-adjust.html [ Skip ]
+fast/text-autosizing/ios/text-size-adjust-inline-style.html [ Skip ]
</ins><span class="cx"> fast/text-autosizing [ Pass ]
</span><span class="cx">
</span><span class="cx"> fast/attachment/attachment-subtitle-resize.html [ Pass ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206216 => 206217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-21 17:35:54 UTC (rev 206216)
+++ trunk/Source/WebCore/ChangeLog 2016-09-21 17:44:43 UTC (rev 206217)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-09-21 Daniel Bates <dabates@apple.com>
+
+ REGRESSION (r201090): Setting style.webkitTextSizeAdjust does not change text change on iPad
+ https://bugs.webkit.org/show_bug.cgi?id=162227
+ <rdar://problem/27201529>
+
+ Reviewed by Simon Fraser.
+
+ The CSS property -webkit-text-size-adjust should be respected on all iOS devices. Following
+ r201090 we respect it only on iPhone and in iPhone-apps run on iPad.
+
+ Tests: fast/text-autosizing/ios/ipad/programmatic-text-size-adjust.html
+ fast/text-autosizing/ios/ipad/text-size-adjust-inline-style.html
+ fast/text-autosizing/ios/programmatic-text-size-adjust.html
+ fast/text-autosizing/ios/text-size-adjust-inline-style.html
+ fast/text-autosizing/text-size-adjust-inline-style.html
+
+ * css/parser/CSSParser.cpp:
+ (WebCore::isValidKeywordPropertyAndValue): Remove unused code to validate -webkit-text-size-adjust.
+ This code is never used because -webkit-text-size-adjust is a value property (since it accepts a
+ <percentage> as a value and CSSParserFastPaths::isKeywordPropertyID(CSSPropertyWebkitTextSizeAdjust)
+ returns false). That is, it is not a keyword property.
+ (WebCore::CSSParser::parseValue): Always enable the -webkit-text-size-adjust CSS property when
+ building for iOS regardless of whether Settings:textAutosizingEnabled() is enabled.
+
</ins><span class="cx"> 2016-09-21 Miguel Gomez <magomez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Build fails with GSTREAMER_GL enabled
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParser.cpp (206216 => 206217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParser.cpp 2016-09-21 17:35:54 UTC (rev 206216)
+++ trunk/Source/WebCore/css/parser/CSSParser.cpp 2016-09-21 17:44:43 UTC (rev 206217)
</span><span class="lines">@@ -1000,15 +1000,6 @@
</span><span class="cx"> if (valueID == CSSValueNormal || valueID == CSSValueReset)
</span><span class="cx"> return true;
</span><span class="cx"> break;
</span><del>-#if ENABLE(IOS_TEXT_AUTOSIZING)
- case CSSPropertyWebkitTextSizeAdjust:
- if (!parserContext.textAutosizingEnabled)
- return false;
-
- if (valueID == CSSValueAuto || valueID == CSSValueNone)
- return true;
- break;
-#endif
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> // Apple specific property. These will never be standardized and is purely to
</span><span class="cx"> // support custom WebKit-based Apple applications.
</span><span class="lines">@@ -2788,8 +2779,14 @@
</span><span class="cx"> break;
</span><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="cx"> case CSSPropertyWebkitTextSizeAdjust:
</span><ins>+ // FIXME: Support toggling the validation of this property via a runtime setting that is independent of
+ // whether isTextAutosizingEnabled() is true. We want to enable this property on iOS, when simulating
+ // a iOS device in Safari's responsive design mode and when optionally enabled in DRT/WTR. Otherwise,
+ // this property should be disabled by default.
+#if !PLATFORM(IOS)
</ins><span class="cx"> if (!isTextAutosizingEnabled())
</span><span class="cx"> return false;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> if (id == CSSValueAuto || id == CSSValueNone)
</span><span class="cx"> validPrimitive = true;
</span></span></pre>
</div>
</div>
</body>
</html>