summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-05-25 15:44:55 -0700
committerJohn Reck <jreck@google.com>2011-06-13 10:05:00 -0700
commitaaf00b3dd10c64d47611a17592267b3aad69eee8 (patch)
tree3a3ef15ef39d88216e26c0993e0b91ff380dd41d
parent31afed8bf83b9f656fb76216c2f41e3971ae390d (diff)
downloadexternal_webkit-aaf00b3dd10c64d47611a17592267b3aad69eee8.zip
external_webkit-aaf00b3dd10c64d47611a17592267b3aad69eee8.tar.gz
external_webkit-aaf00b3dd10c64d47611a17592267b3aad69eee8.tar.bz2
Ignore webkit-text-size-adjust: none
Bug: 4486008 Change-Id: Iaf810878c6ed216e2431a7718de899a9e8e0d6f8
-rw-r--r--Source/WebCore/css/CSSStyleSelector.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/Source/WebCore/css/CSSStyleSelector.cpp b/Source/WebCore/css/CSSStyleSelector.cpp
index 02cf8d3..5ff5066 100644
--- a/Source/WebCore/css/CSSStyleSelector.cpp
+++ b/Source/WebCore/css/CSSStyleSelector.cpp
@@ -6852,6 +6852,19 @@ void CSSStyleSelector::checkForTextSizeAdjust()
{
if (m_style->textSizeAdjust())
return;
+
+ /* TODO: Remove this when a fix for webkit bug 56543 is submitted and can
+ * be cherry picked.
+ * This is a quick fix for Android to prevent sites from using
+ * -webkit-text-size-adjust: none; which breaks font size accessibility
+ * options on all platforms. The purpose of the property is to prevent
+ * the automatic font size changes done by platforms like iOS when the
+ * rotation changes. Since Android doesn't do this, we can safely ignore
+ * the 'none' option.
+ */
+#if PLATFORM(ANDROID)
+ return;
+#endif
FontDescription newFontDescription(m_style->fontDescription());
newFontDescription.setComputedSize(newFontDescription.specifiedSize());