diff options
| author | John Reck <jreck@google.com> | 2011-06-13 10:41:35 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-13 10:41:35 -0700 |
| commit | 150c94129c340b7cce44e62b98ee057e6d7612cd (patch) | |
| tree | 7ee265d5c291841e9d8fb14d65ff8ca7f16c3d77 /Source/WebCore/css | |
| parent | f39c311e7f4b205e38b987fd23552e7ee8ecb620 (diff) | |
| parent | aaf00b3dd10c64d47611a17592267b3aad69eee8 (diff) | |
| download | external_webkit-150c94129c340b7cce44e62b98ee057e6d7612cd.zip external_webkit-150c94129c340b7cce44e62b98ee057e6d7612cd.tar.gz external_webkit-150c94129c340b7cce44e62b98ee057e6d7612cd.tar.bz2 | |
Merge "Ignore webkit-text-size-adjust: none"
Diffstat (limited to 'Source/WebCore/css')
| -rw-r--r-- | Source/WebCore/css/CSSStyleSelector.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Source/WebCore/css/CSSStyleSelector.cpp b/Source/WebCore/css/CSSStyleSelector.cpp index 309954b..b79f2dc 100644 --- a/Source/WebCore/css/CSSStyleSelector.cpp +++ b/Source/WebCore/css/CSSStyleSelector.cpp @@ -6848,6 +6848,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()); |