<!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>[201090] 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/201090">201090</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-05-18 12:06:27 -0700 (Wed, 18 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/200534">r200534</a>) Command-+ no longer zooms pages
https://bugs.webkit.org/show_bug.cgi?id=157826
rdar://problem/26334636
Reviewed by Dean Jackson.
Source/WebCore:
When text autosizing was enabled on Mac, we started to parse and respect
-webkit-text-size-adjust. Fix by cutting this off in CSSParser if the feature
is disabled.
Also fix InternalSettings to reset page and text zoom, since WebKit1 aliases
the zoom levels causing DRT to fail to reset them between tests.
Test: fast/text-autosizing/mac/text-size-adjust-text-zoom.html
* css/CSSParser.cpp:
(WebCore::CSSParserContext::CSSParserContext):
(WebCore::isValidKeywordPropertyAndValue):
(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::isTextAutosizingEnabled):
* css/CSSParser.h:
* css/CSSParserMode.h:
* testing/InternalSettings.cpp:
(WebCore::InternalSettings::resetToConsistentState):
Tools:
* DumpRenderTree/mac/DumpRenderTree.mm:
(resetWebPreferencesToConsistentValues): Remove ENABLE() #ifdefs that do nothing (see http://webkit.org/b/157828).
LayoutTests:
Need to call internals.settings.setTextAutosizingEnabled(true) earlier in some tests.
* fast/text-autosizing/ios/line-height-text-autosizing.html:
* fast/text-autosizing/ios/percent-adjust-length-line-height.html:
* fast/text-autosizing/ios/percent-adjust-number-line-height.html:
* fast/text-autosizing/ios/percent-adjust-percent-line-height.html:
* fast/text-autosizing/mac/text-size-adjust-text-zoom-expected.html: Added.
* fast/text-autosizing/mac/text-size-adjust-text-zoom.html: Added.
* platform/mac-wk2/TestExpectations:
* platform/mac/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfasttextautosizingioslineheighttextautosizinghtml">trunk/LayoutTests/fast/text-autosizing/ios/line-height-text-autosizing.html</a></li>
<li><a href="#trunkLayoutTestsfasttextautosizingiospercentadjustlengthlineheighthtml">trunk/LayoutTests/fast/text-autosizing/ios/percent-adjust-length-line-height.html</a></li>
<li><a href="#trunkLayoutTestsfasttextautosizingiospercentadjustnumberlineheighthtml">trunk/LayoutTests/fast/text-autosizing/ios/percent-adjust-number-line-height.html</a></li>
<li><a href="#trunkLayoutTestsfasttextautosizingiospercentadjustpercentlineheighthtml">trunk/LayoutTests/fast/text-autosizing/ios/percent-adjust-percent-line-height.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2TestExpectations">trunk/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParserh">trunk/Source/WebCore/css/CSSParser.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSParserModeh">trunk/Source/WebCore/css/CSSParserMode.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalSettingscpp">trunk/Source/WebCore/testing/InternalSettings.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreemm">trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/fast/text-autosizing/mac/</li>
<li><a href="#trunkLayoutTestsfasttextautosizingmactextsizeadjusttextzoomexpectedhtml">trunk/LayoutTests/fast/text-autosizing/mac/text-size-adjust-text-zoom-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextautosizingmactextsizeadjusttextzoomhtml">trunk/LayoutTests/fast/text-autosizing/mac/text-size-adjust-text-zoom.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201089 => 201090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-18 19:03:38 UTC (rev 201089)
+++ trunk/LayoutTests/ChangeLog 2016-05-18 19:06:27 UTC (rev 201090)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-05-18 Simon Fraser <simon.fraser@apple.com>
+
+ REGRESSION (r200534) Command-+ no longer zooms pages
+ https://bugs.webkit.org/show_bug.cgi?id=157826
+ rdar://problem/26334636
+
+ Reviewed by Dean Jackson.
+
+ Need to call internals.settings.setTextAutosizingEnabled(true) earlier in some tests.
+
+ * fast/text-autosizing/ios/line-height-text-autosizing.html:
+ * fast/text-autosizing/ios/percent-adjust-length-line-height.html:
+ * fast/text-autosizing/ios/percent-adjust-number-line-height.html:
+ * fast/text-autosizing/ios/percent-adjust-percent-line-height.html:
+ * fast/text-autosizing/mac/text-size-adjust-text-zoom-expected.html: Added.
+ * fast/text-autosizing/mac/text-size-adjust-text-zoom.html: Added.
+ * platform/mac-wk2/TestExpectations:
+ * platform/mac/TestExpectations:
+
</ins><span class="cx"> 2016-05-18 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] accessibility/meter-element.html is failing
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextautosizingioslineheighttextautosizinghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text-autosizing/ios/line-height-text-autosizing.html (201089 => 201090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text-autosizing/ios/line-height-text-autosizing.html 2016-05-18 19:03:38 UTC (rev 201089)
+++ trunk/LayoutTests/fast/text-autosizing/ios/line-height-text-autosizing.html 2016-05-18 19:06:27 UTC (rev 201090)
</span><span class="lines">@@ -1,6 +1,12 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><ins>+ <script>
+ if (window.internals) {
+ internals.settings.setTextAutosizingEnabled(true);
+ internals.settings.setTextAutosizingWindowSizeOverride(320, 480);
+ }
+ </script>
</ins><span class="cx"> <script src="../../../resources/js-test-pre.js"></script>
</span><span class="cx"> <style>
</span><span class="cx"> #testDivAdjust {
</span><span class="lines">@@ -11,12 +17,6 @@
</span><span class="cx"> font-size: 20px;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><del>-<script>
-if (window.internals) {
- window.internals.settings.setTextAutosizingEnabled(true);
- window.internals.settings.setTextAutosizingWindowSizeOverride(320, 480);
-}
-</script>
</del><span class="cx"> </head>
</span><span class="cx"> <boby>
</span><span class="cx"> <div id="testDivNoAdjust">Test</div>
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextautosizingiospercentadjustlengthlineheighthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text-autosizing/ios/percent-adjust-length-line-height.html (201089 => 201090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text-autosizing/ios/percent-adjust-length-line-height.html 2016-05-18 19:03:38 UTC (rev 201089)
+++ trunk/LayoutTests/fast/text-autosizing/ios/percent-adjust-length-line-height.html 2016-05-18 19:06:27 UTC (rev 201090)
</span><span class="lines">@@ -2,6 +2,12 @@
</span><span class="cx"> <head>
</span><span class="cx"> <meta name="viewport" content="user-scalable=no, width=320">
</span><span class="cx"> <title>&lt;rdar://problem/6646628&gt; Text Autosizing: Overlapping text in message</title>
</span><ins>+ <script>
+ if (window.internals) {
+ internals.settings.setTextAutosizingEnabled(true);
+ internals.settings.setTextAutosizingWindowSizeOverride(320, 480);
+ }
+ </script>
</ins><span class="cx"> <style>
</span><span class="cx"> body {
</span><span class="cx"> font-size: 14px;
</span><span class="lines">@@ -12,12 +18,6 @@
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../../resources/js-test-pre.js"></script>
</span><del>- <script>
- if (window.internals) {
- window.internals.settings.setTextAutosizingEnabled(true);
- window.internals.settings.setTextAutosizingWindowSizeOverride(320, 480);
- }
- </script>
</del><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <p id="lorem">This text should have a decent spacing between the lines. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras ante orci, posuere at aliquam eget, ornare ut sapien. Praesent commodo volutpat auctor. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Vivamus interdum tincidunt pulvinar. Donec nec libero eros. Morbi facilisis lacus quis mi mattis quis pretium velit fringilla. Integer ipsum metus, pretium et tincidunt eget, commodo vel nibh. Cras feugiat lorem et velit interdum eu luctus dui gravida. Nullam nec gravida orci. Vestibulum quis imperdiet nibh. Vivamus tincidunt erat ac risus egestas mattis.</p>
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextautosizingiospercentadjustnumberlineheighthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text-autosizing/ios/percent-adjust-number-line-height.html (201089 => 201090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text-autosizing/ios/percent-adjust-number-line-height.html 2016-05-18 19:03:38 UTC (rev 201089)
+++ trunk/LayoutTests/fast/text-autosizing/ios/percent-adjust-number-line-height.html 2016-05-18 19:06:27 UTC (rev 201090)
</span><span class="lines">@@ -2,6 +2,12 @@
</span><span class="cx"> <head>
</span><span class="cx"> <meta name="viewport" content="user-scalable=no, width=320">
</span><span class="cx"> <title>&lt;rdar://problem/6646628&gt; Text Autosizing: Overlapping text in message</title>
</span><ins>+ <script>
+ if (window.internals) {
+ internals.settings.setTextAutosizingEnabled(true);
+ internals.settings.setTextAutosizingWindowSizeOverride(320, 480);
+ }
+ </script>
</ins><span class="cx"> <style>
</span><span class="cx"> #expected {
</span><span class="cx"> font-size: 10px;
</span><span class="lines">@@ -15,12 +21,6 @@
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../../resources/js-test-pre.js"></script>
</span><del>- <script>
- if (window.internals) {
- window.internals.settings.setTextAutosizingEnabled(true);
- window.internals.settings.setTextAutosizingWindowSizeOverride(320, 480);
- }
- </script>
</del><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <p id="expected">This text should have a decent spacing between the lines. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras ante orci, posuere at aliquam eget, ornare ut sapien. Praesent commodo volutpat auctor. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Vivamus interdum tincidunt pulvinar. Donec nec libero eros. Morbi facilisis lacus quis mi mattis quis pretium velit fringilla. Integer ipsum metus, pretium et tincidunt eget, commodo vel nibh. Cras feugiat lorem et velit interdum eu luctus dui gravida. Nullam nec gravida orci. Vestibulum quis imperdiet nibh. Vivamus tincidunt erat ac risus egestas mattis.</p>
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextautosizingiospercentadjustpercentlineheighthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text-autosizing/ios/percent-adjust-percent-line-height.html (201089 => 201090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text-autosizing/ios/percent-adjust-percent-line-height.html 2016-05-18 19:03:38 UTC (rev 201089)
+++ trunk/LayoutTests/fast/text-autosizing/ios/percent-adjust-percent-line-height.html 2016-05-18 19:06:27 UTC (rev 201090)
</span><span class="lines">@@ -2,6 +2,12 @@
</span><span class="cx"> <head>
</span><span class="cx"> <meta name="viewport" content="user-scalable=no, width=320">
</span><span class="cx"> <title>&lt;rdar://problem/12607898&gt; incorrect behavior of -webkit-text-size-adjust in UIWebView on iOS6</title>
</span><ins>+ <script>
+ if (window.internals) {
+ internals.settings.setTextAutosizingEnabled(true);
+ internals.settings.setTextAutosizingWindowSizeOverride(320, 480);
+ }
+ </script>
</ins><span class="cx"> <style>
</span><span class="cx"> #expected {
</span><span class="cx"> font-size: 10px;
</span><span class="lines">@@ -15,12 +21,6 @@
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../../resources/js-test-pre.js"></script>
</span><del>- <script>
- if (window.internals) {
- window.internals.settings.setTextAutosizingEnabled(true);
- window.internals.settings.setTextAutosizingWindowSizeOverride(320, 480);
- }
- </script>
</del><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <p id="expected">This text should have a decent spacing between the lines. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras ante orci, posuere at aliquam eget, ornare ut sapien. Praesent commodo volutpat auctor. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Vivamus interdum tincidunt pulvinar. Donec nec libero eros. Morbi facilisis lacus quis mi mattis quis pretium velit fringilla. Integer ipsum metus, pretium et tincidunt eget, commodo vel nibh. Cras feugiat lorem et velit interdum eu luctus dui gravida. Nullam nec gravida orci. Vestibulum quis imperdiet nibh. Vivamus tincidunt erat ac risus egestas mattis.</p>
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextautosizingmactextsizeadjusttextzoomexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text-autosizing/mac/text-size-adjust-text-zoom-expected.html (0 => 201090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text-autosizing/mac/text-size-adjust-text-zoom-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text-autosizing/mac/text-size-adjust-text-zoom-expected.html 2016-05-18 19:06:27 UTC (rev 201090)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <script>
+ if (window.internals)
+ internals.setPageZoomFactor(2);
+ </script>
+</head>
+<body>
+ <p>When text autosizing is disabled, the size of this text should increase when using page zoom</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextautosizingmactextsizeadjusttextzoomhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text-autosizing/mac/text-size-adjust-text-zoom.html (0 => 201090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text-autosizing/mac/text-size-adjust-text-zoom.html (rev 0)
+++ trunk/LayoutTests/fast/text-autosizing/mac/text-size-adjust-text-zoom.html 2016-05-18 19:06:27 UTC (rev 201090)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ body {
+ -webkit-text-size-adjust: none;
+ }
+ </style>
+ <script>
+ if (window.internals) {
+ internals.settings.setTextAutosizingEnabled(false);
+ internals.setPageZoomFactor(2);
+ }
+ </script>
+</head>
+<body>
+ <p>When text autosizing is disabled, the size of this text should increase when using page zoom</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (201089 => 201090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2016-05-18 19:03:38 UTC (rev 201089)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-05-18 19:06:27 UTC (rev 201090)
</span><span class="lines">@@ -17,6 +17,7 @@
</span><span class="cx"> fast/url/user-visible [ Pass ]
</span><span class="cx">
</span><span class="cx"> fast/text-autosizing/ios [ Pass ]
</span><ins>+fast/text-autosizing/mac [ Pass ]
</ins><span class="cx">
</span><span class="cx"> #//////////////////////////////////////////////////////////////////////////////////////////
</span><span class="cx"> # End platform-specific directories.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (201089 => 201090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2016-05-18 19:03:38 UTC (rev 201089)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2016-05-18 19:06:27 UTC (rev 201090)
</span><span class="lines">@@ -9,6 +9,7 @@
</span><span class="cx"> swipe [ Pass ]
</span><span class="cx">
</span><span class="cx"> fast/text-autosizing/ios [ Pass ]
</span><ins>+fast/text-autosizing/mac [ Pass ]
</ins><span class="cx">
</span><span class="cx"> fast/events/cancelled-force-click-link-navigation.html [ Pass ]
</span><span class="cx"> fast/events/force-click-link-selection-behavior.html [ Pass ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201089 => 201090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-18 19:03:38 UTC (rev 201089)
+++ trunk/Source/WebCore/ChangeLog 2016-05-18 19:06:27 UTC (rev 201090)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-05-18 Simon Fraser <simon.fraser@apple.com>
+
+ REGRESSION (r200534) Command-+ no longer zooms pages
+ https://bugs.webkit.org/show_bug.cgi?id=157826
+ rdar://problem/26334636
+
+ Reviewed by Dean Jackson.
+
+ When text autosizing was enabled on Mac, we started to parse and respect
+ -webkit-text-size-adjust. Fix by cutting this off in CSSParser if the feature
+ is disabled.
+
+ Also fix InternalSettings to reset page and text zoom, since WebKit1 aliases
+ the zoom levels causing DRT to fail to reset them between tests.
+
+ Test: fast/text-autosizing/mac/text-size-adjust-text-zoom.html
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParserContext::CSSParserContext):
+ (WebCore::isValidKeywordPropertyAndValue):
+ (WebCore::CSSParser::parseValue):
+ (WebCore::CSSParser::isTextAutosizingEnabled):
+ * css/CSSParser.h:
+ * css/CSSParserMode.h:
+ * testing/InternalSettings.cpp:
+ (WebCore::InternalSettings::resetToConsistentState):
+
</ins><span class="cx"> 2016-05-18 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> markAllDescendantsWithFloatsForLayout should not drill into blocks with
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (201089 => 201090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2016-05-18 19:03:38 UTC (rev 201089)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2016-05-18 19:06:27 UTC (rev 201090)
</span><span class="lines">@@ -245,13 +245,9 @@
</span><span class="cx"> CSSParserContext::CSSParserContext(CSSParserMode mode, const URL& baseURL)
</span><span class="cx"> : baseURL(baseURL)
</span><span class="cx"> , mode(mode)
</span><del>- , isHTMLDocument(false)
</del><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> , cssGridLayoutEnabled(RuntimeEnabledFeatures::sharedFeatures().isCSSGridLayoutEnabled())
</span><span class="cx"> #endif
</span><del>- , needsSiteSpecificQuirks(false)
- , enforcesCSSMIMETypeInNoQuirksMode(true)
- , useLegacyBackgroundSizeShorthandBehavior(false)
</del><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> // FIXME: Force the site specific quirk below to work on iOS. Investigating other site specific quirks
</span><span class="lines">@@ -269,10 +265,17 @@
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> , cssGridLayoutEnabled(document.isCSSGridLayoutEnabled())
</span><span class="cx"> #endif
</span><del>- , needsSiteSpecificQuirks(document.settings() ? document.settings()->needsSiteSpecificQuirks() : false)
- , enforcesCSSMIMETypeInNoQuirksMode(!document.settings() || document.settings()->enforceCSSMIMETypeInNoQuirksMode())
- , useLegacyBackgroundSizeShorthandBehavior(document.settings() ? document.settings()->useLegacyBackgroundSizeShorthandBehavior() : false)
</del><span class="cx"> {
</span><ins>+ if (Settings* settings = document.settings()) {
+ needsSiteSpecificQuirks = settings->needsSiteSpecificQuirks();
+ enforcesCSSMIMETypeInNoQuirksMode = settings->enforceCSSMIMETypeInNoQuirksMode();
+ useLegacyBackgroundSizeShorthandBehavior = settings->useLegacyBackgroundSizeShorthandBehavior();
+#if ENABLE(IOS_TEXT_AUTOSIZING)
+ textAutosizingEnabled = settings->textAutosizingEnabled();
+ WTFLogAlways("CSSParserContext %p CSSParserContext textAutosizingEnabled=%d", this, textAutosizingEnabled);
+#endif
+ }
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> // FIXME: Force the site specific quirk below to work on iOS. Investigating other site specific quirks
</span><span class="cx"> // to see if we can enable the preference all together is to be handled by:
</span><span class="lines">@@ -970,6 +973,9 @@
</span><span class="cx"> break;
</span><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="cx"> case CSSPropertyWebkitTextSizeAdjust:
</span><ins>+ if (!parserContext.textAutosizingEnabled)
+ return false;
+
</ins><span class="cx"> if (valueID == CSSValueAuto || valueID == CSSValueNone)
</span><span class="cx"> return true;
</span><span class="cx"> break;
</span><span class="lines">@@ -2913,6 +2919,9 @@
</span><span class="cx"> break;
</span><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="cx"> case CSSPropertyWebkitTextSizeAdjust:
</span><ins>+ if (!isTextAutosizingEnabled())
+ return false;
+
</ins><span class="cx"> if (id == CSSValueAuto || id == CSSValueNone)
</span><span class="cx"> validPrimitive = true;
</span><span class="cx"> else {
</span><span class="lines">@@ -10245,6 +10254,13 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(IOS_TEXT_AUTOSIZING)
+bool CSSParser::isTextAutosizingEnabled() const
+{
+ return m_context.textAutosizingEnabled;
+}
+#endif
+
</ins><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> bool CSSParser::isCSSGridLayoutEnabled() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.h (201089 => 201090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.h 2016-05-18 19:03:38 UTC (rev 201089)
+++ trunk/Source/WebCore/css/CSSParser.h 2016-05-18 19:06:27 UTC (rev 201090)
</span><span class="lines">@@ -204,6 +204,10 @@
</span><span class="cx"> RefPtr<CSSValue> parseColumnCount();
</span><span class="cx"> bool parseColumnsShorthand(bool important);
</span><span class="cx">
</span><ins>+#if ENABLE(IOS_TEXT_AUTOSIZING)
+ bool isTextAutosizingEnabled() const;
+#endif
+
</ins><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> bool isCSSGridLayoutEnabled() const;
</span><span class="cx"> RefPtr<CSSValue> parseGridPosition();
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParserModeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParserMode.h (201089 => 201090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParserMode.h 2016-05-18 19:03:38 UTC (rev 201089)
+++ trunk/Source/WebCore/css/CSSParserMode.h 2016-05-18 19:06:27 UTC (rev 201090)
</span><span class="lines">@@ -62,14 +62,17 @@
</span><span class="cx">
</span><span class="cx"> URL baseURL;
</span><span class="cx"> String charset;
</span><del>- CSSParserMode mode;
- bool isHTMLDocument;
</del><ins>+ CSSParserMode mode { CSSStrictMode };
+ bool isHTMLDocument { false };
</ins><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><del>- bool cssGridLayoutEnabled;
</del><ins>+ bool cssGridLayoutEnabled { false };
</ins><span class="cx"> #endif
</span><del>- bool needsSiteSpecificQuirks;
- bool enforcesCSSMIMETypeInNoQuirksMode;
- bool useLegacyBackgroundSizeShorthandBehavior;
</del><ins>+#if ENABLE(IOS_TEXT_AUTOSIZING)
+ bool textAutosizingEnabled { false };
+#endif
+ bool needsSiteSpecificQuirks { false };
+ bool enforcesCSSMIMETypeInNoQuirksMode { true };
+ bool useLegacyBackgroundSizeShorthandBehavior { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> bool operator==(const CSSParserContext&, const CSSParserContext&);
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (201089 => 201090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/InternalSettings.cpp 2016-05-18 19:03:38 UTC (rev 201089)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp 2016-05-18 19:06:27 UTC (rev 201090)
</span><span class="lines">@@ -226,11 +226,12 @@
</span><span class="cx">
</span><span class="cx"> void InternalSettings::resetToConsistentState()
</span><span class="cx"> {
</span><del>- page()->setPageScaleFactor(1, IntPoint(0, 0));
</del><ins>+ page()->setPageScaleFactor(1, { 0, 0 });
+ page()->mainFrame().setPageAndTextZoomFactors(1, 1);
</ins><span class="cx"> page()->setCanStartMedia(true);
</span><span class="cx"> page()->settings().setForcePendingWebGLPolicy(false);
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>- m_page->settings().setAllowsAirPlayForMediaPlayback(false);
</del><ins>+ page()->settings().setAllowsAirPlayForMediaPlayback(false);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_backup.restoreTo(*settings());
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (201089 => 201090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-05-18 19:03:38 UTC (rev 201089)
+++ trunk/Tools/ChangeLog 2016-05-18 19:06:27 UTC (rev 201090)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-05-18 Simon Fraser <simon.fraser@apple.com>
+
+ REGRESSION (r200534) Command-+ no longer zooms pages
+ https://bugs.webkit.org/show_bug.cgi?id=157826
+ rdar://problem/26334636
+
+ Reviewed by Dean Jackson.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (resetWebPreferencesToConsistentValues): Remove ENABLE() #ifdefs that do nothing (see http://webkit.org/b/157828).
+
</ins><span class="cx"> 2016-05-18 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] accessibility/meter-element.html is failing
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (201089 => 201090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-05-18 19:03:38 UTC (rev 201089)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-05-18 19:06:27 UTC (rev 201090)
</span><span class="lines">@@ -953,9 +953,7 @@
</span><span class="cx"> [preferences setStorageTrackerEnabled:YES];
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(IOS_TEXT_AUTOSIZING)
</del><span class="cx"> [preferences _setTextAutosizingEnabled:NO];
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // The back/forward cache is causing problems due to layouts during transition from one page to another.
</span><span class="cx"> // So, turn it off for now, but we might want to turn it back on some day.
</span><span class="lines">@@ -971,13 +969,8 @@
</span><span class="cx"> ASSERT([preferences mockScrollbarsEnabled]);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(WEB_AUDIO)
</del><span class="cx"> [preferences setWebAudioEnabled:YES];
</span><del>-#endif
-
-#if ENABLE(MEDIA_SOURCE)
</del><span class="cx"> [preferences setMediaSourceEnabled:YES];
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> [preferences setShadowDOMEnabled:YES];
</span><span class="cx"> [preferences setCustomElementsEnabled:YES];
</span></span></pre>
</div>
</div>
</body>
</html>