Diff
Modified: branches/safari-602-branch/LayoutTests/ChangeLog (207612 => 207613)
--- branches/safari-602-branch/LayoutTests/ChangeLog 2016-10-20 11:12:25 UTC (rev 207612)
+++ branches/safari-602-branch/LayoutTests/ChangeLog 2016-10-20 11:12:31 UTC (rev 207613)
@@ -1,3 +1,37 @@
+2016-10-20 Matthew Hanson <matthew_hanson>
+
+ Merge r206217. rdar://problem/28811877
+
+ 2016-09-21 Daniel Bates <daba...@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.
+
2016-10-20 Matthew Hanson <matthew_han...@apple.com>
Merge r207155. rdar://problem/28857500
Added: branches/safari-602-branch/LayoutTests/fast/text-autosizing/ios/ipad/programmatic-text-size-adjust-expected.txt (0 => 207613)
--- branches/safari-602-branch/LayoutTests/fast/text-autosizing/ios/ipad/programmatic-text-size-adjust-expected.txt (rev 0)
+++ branches/safari-602-branch/LayoutTests/fast/text-autosizing/ios/ipad/programmatic-text-size-adjust-expected.txt 2016-10-20 11:12:31 UTC (rev 207613)
@@ -0,0 +1,23 @@
+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
+
Added: branches/safari-602-branch/LayoutTests/fast/text-autosizing/ios/ipad/programmatic-text-size-adjust.html (0 => 207613)
--- branches/safari-602-branch/LayoutTests/fast/text-autosizing/ios/ipad/programmatic-text-size-adjust.html (rev 0)
+++ branches/safari-602-branch/LayoutTests/fast/text-autosizing/ios/ipad/programmatic-text-size-adjust.html 2016-10-20 11:12:31 UTC (rev 207613)
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script src=""
+<!-- 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 = "auto":");
+document.getElementById("test").style.webkitTextSizeAdjust = "auto";
+shouldBeEqualToString('document.getElementById("test").style.webkitTextSizeAdjust', "auto");
+
+debug("<br>webkitTextSizeAdjust = "none":");
+document.getElementById("test").style.webkitTextSizeAdjust = "none";
+shouldBeEqualToString('document.getElementById("test").style.webkitTextSizeAdjust', "none");
+
+debug("<br>webkitTextSizeAdjust = "200%":");
+document.getElementById("test").style.webkitTextSizeAdjust = "200%";
+shouldBeEqualToString('document.getElementById("test").style.webkitTextSizeAdjust', "200%");
+
+debug("<br>webkitTextSizeAdjust = "dummy" (invalid value):");
+document.getElementById("test").style.webkitTextSizeAdjust = "dummy";
+shouldBeEqualToString('document.getElementById("test").style.webkitTextSizeAdjust', "200%");
+
+document.body.removeChild(document.getElementById("test"));
+</script>
+<script src=""
+</body>
+</html>
Added: branches/safari-602-branch/LayoutTests/fast/text-autosizing/ios/ipad/text-size-adjust-inline-style-expected.html (0 => 207613)
--- branches/safari-602-branch/LayoutTests/fast/text-autosizing/ios/ipad/text-size-adjust-inline-style-expected.html (rev 0)
+++ branches/safari-602-branch/LayoutTests/fast/text-autosizing/ios/ipad/text-size-adjust-inline-style-expected.html 2016-10-20 11:12:31 UTC (rev 207613)
@@ -0,0 +1,23 @@
+<!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>
Added: branches/safari-602-branch/LayoutTests/fast/text-autosizing/ios/ipad/text-size-adjust-inline-style.html (0 => 207613)
--- branches/safari-602-branch/LayoutTests/fast/text-autosizing/ios/ipad/text-size-adjust-inline-style.html (rev 0)
+++ branches/safari-602-branch/LayoutTests/fast/text-autosizing/ios/ipad/text-size-adjust-inline-style.html 2016-10-20 11:12:31 UTC (rev 207613)
@@ -0,0 +1,24 @@
+<!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>
Added: branches/safari-602-branch/LayoutTests/fast/text-autosizing/ios/programmatic-text-size-adjust-expected.txt (0 => 207613)
--- branches/safari-602-branch/LayoutTests/fast/text-autosizing/ios/programmatic-text-size-adjust-expected.txt (rev 0)
+++ branches/safari-602-branch/LayoutTests/fast/text-autosizing/ios/programmatic-text-size-adjust-expected.txt 2016-10-20 11:12:31 UTC (rev 207613)
@@ -0,0 +1,23 @@
+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
+
Added: branches/safari-602-branch/LayoutTests/fast/text-autosizing/ios/programmatic-text-size-adjust.html (0 => 207613)
--- branches/safari-602-branch/LayoutTests/fast/text-autosizing/ios/programmatic-text-size-adjust.html (rev 0)
+++ branches/safari-602-branch/LayoutTests/fast/text-autosizing/ios/programmatic-text-size-adjust.html 2016-10-20 11:12:31 UTC (rev 207613)
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script src=""
+<!-- 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 = "auto":");
+document.getElementById("test").style.webkitTextSizeAdjust = "auto";
+shouldBeEqualToString('document.getElementById("test").style.webkitTextSizeAdjust', "auto");
+
+debug("<br>webkitTextSizeAdjust = "none":");
+document.getElementById("test").style.webkitTextSizeAdjust = "none";
+shouldBeEqualToString('document.getElementById("test").style.webkitTextSizeAdjust', "none");
+
+debug("<br>webkitTextSizeAdjust = "200%":");
+document.getElementById("test").style.webkitTextSizeAdjust = "200%";
+shouldBeEqualToString('document.getElementById("test").style.webkitTextSizeAdjust', "200%");
+
+debug("<br>webkitTextSizeAdjust = "dummy" (invalid value):");
+document.getElementById("test").style.webkitTextSizeAdjust = "dummy";
+shouldBeEqualToString('document.getElementById("test").style.webkitTextSizeAdjust', "200%");
+
+document.body.removeChild(document.getElementById("test"));
+</script>
+<script src=""
+</body>
+</html>
Added: branches/safari-602-branch/LayoutTests/fast/text-autosizing/ios/text-size-adjust-inline-style-expected.html (0 => 207613)
--- branches/safari-602-branch/LayoutTests/fast/text-autosizing/ios/text-size-adjust-inline-style-expected.html (rev 0)
+++ branches/safari-602-branch/LayoutTests/fast/text-autosizing/ios/text-size-adjust-inline-style-expected.html 2016-10-20 11:12:31 UTC (rev 207613)
@@ -0,0 +1,23 @@
+<!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>
Added: branches/safari-602-branch/LayoutTests/fast/text-autosizing/ios/text-size-adjust-inline-style.html (0 => 207613)
--- branches/safari-602-branch/LayoutTests/fast/text-autosizing/ios/text-size-adjust-inline-style.html (rev 0)
+++ branches/safari-602-branch/LayoutTests/fast/text-autosizing/ios/text-size-adjust-inline-style.html 2016-10-20 11:12:31 UTC (rev 207613)
@@ -0,0 +1,24 @@
+<!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>
Added: branches/safari-602-branch/LayoutTests/fast/text-autosizing/text-size-adjust-inline-style-expected.html (0 => 207613)
--- branches/safari-602-branch/LayoutTests/fast/text-autosizing/text-size-adjust-inline-style-expected.html (rev 0)
+++ branches/safari-602-branch/LayoutTests/fast/text-autosizing/text-size-adjust-inline-style-expected.html 2016-10-20 11:12:31 UTC (rev 207613)
@@ -0,0 +1,23 @@
+<!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>
Added: branches/safari-602-branch/LayoutTests/fast/text-autosizing/text-size-adjust-inline-style.html (0 => 207613)
--- branches/safari-602-branch/LayoutTests/fast/text-autosizing/text-size-adjust-inline-style.html (rev 0)
+++ branches/safari-602-branch/LayoutTests/fast/text-autosizing/text-size-adjust-inline-style.html 2016-10-20 11:12:31 UTC (rev 207613)
@@ -0,0 +1,24 @@
+<!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>
Modified: branches/safari-602-branch/LayoutTests/platform/mac/TestExpectations (207612 => 207613)
--- branches/safari-602-branch/LayoutTests/platform/mac/TestExpectations 2016-10-20 11:12:25 UTC (rev 207612)
+++ branches/safari-602-branch/LayoutTests/platform/mac/TestExpectations 2016-10-20 11:12:31 UTC (rev 207613)
@@ -19,6 +19,11 @@
fast/text-autosizing/ios [ Pass ]
fast/text-autosizing/mac [ Pass ]
+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 ]
+fast/text-autosizing [ Pass ]
fast/attachment/attachment-subtitle-resize.html [ Pass ]
Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (207612 => 207613)
--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-20 11:12:25 UTC (rev 207612)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-20 11:12:31 UTC (rev 207613)
@@ -1,5 +1,34 @@
2016-10-20 Matthew Hanson <matthew_hanson>
+ Merge r206217. rdar://problem/28811877
+
+ 2016-09-21 Daniel Bates <daba...@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.
+
+2016-10-20 Matthew Hanson <matthew_hanson>
+
Merge r206881. rdar://problem/28721519
2016-10-06 Anders Carlsson <ander...@apple.com>
Modified: branches/safari-602-branch/Source/WebCore/css/CSSParser.cpp (207612 => 207613)
--- branches/safari-602-branch/Source/WebCore/css/CSSParser.cpp 2016-10-20 11:12:25 UTC (rev 207612)
+++ branches/safari-602-branch/Source/WebCore/css/CSSParser.cpp 2016-10-20 11:12:31 UTC (rev 207613)
@@ -595,6 +595,8 @@
static inline bool isValidKeywordPropertyAndValue(CSSPropertyID propertyId, int valueID, const CSSParserContext& parserContext, StyleSheetContents* styleSheetContents)
{
+ UNUSED_PARAM(parserContext); // Make sure parserContext is used.
+
if (!valueID)
return false;
@@ -932,15 +934,6 @@
if (valueID == CSSValueDisc || valueID == CSSValueCircle || valueID == CSSValueSquare || valueID == CSSValueNone)
return true;
break;
-#if ENABLE(IOS_TEXT_AUTOSIZING)
- case CSSPropertyWebkitTextSizeAdjust:
- if (!parserContext.textAutosizingEnabled)
- return false;
-
- if (valueID == CSSValueAuto || valueID == CSSValueNone)
- return true;
- break;
-#endif
case CSSPropertyTransformStyle:
case CSSPropertyWebkitTransformStyle:
if (valueID == CSSValueFlat || valueID == CSSValuePreserve3d)
@@ -2918,8 +2911,14 @@
break;
#if ENABLE(IOS_TEXT_AUTOSIZING)
case CSSPropertyWebkitTextSizeAdjust:
+ // 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)
if (!isTextAutosizingEnabled())
return false;
+#endif
if (id == CSSValueAuto || id == CSSValueNone)
validPrimitive = true;
