Bug 1164279 - Disable font-variant-east-asian: ruby for <rt> on Windows. r=jfkthame
authorXidorn Quan <quanxunzhen@gmail.com>
Mon, 14 Sep 2015 17:35:13 +0800
changeset 294899 cd4f5bb41dd73ba0eebb6b597364b77358441d0f
parent 294898 827a12863a6cde252e0fc47199562b78c0eed55e
child 294900 53096799445004f8b1c47cc797be5f38b5e1876b
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjfkthame
bugs1164279
milestone43.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1164279 - Disable font-variant-east-asian: ruby for <rt> on Windows. r=jfkthame
layout/style/html.css
layout/style/jar.mn
--- a/layout/style/html.css
+++ b/layout/style/html.css
@@ -806,17 +806,22 @@ marquee[direction="up"], marquee[directi
   }
   rtc {
     display: ruby-text-container;
   }
   rtc, rt {
     white-space: nowrap;
     font-size: 50%;
     line-height: 1;
+%ifndef XP_WIN
+    /* The widely-used Windows font Meiryo doesn't work fine with this
+     * setting, so disable this on Windows. We should re-enable it once
+     * Microsoft fixes this issue. See bug 1164279. */
     font-variant-east-asian: ruby;
+%endif
   }
   @supports (text-emphasis: none) {
     rtc, rt {
       text-emphasis: none;
     }
   }
   rtc:lang(zh), rt:lang(zh) {
     ruby-align: center;
--- a/layout/style/jar.mn
+++ b/layout/style/jar.mn
@@ -1,15 +1,15 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 toolkit.jar:
 *  res/ua.css    (ua.css)
-   res/html.css    (html.css)
+*  res/html.css    (html.css)
    res/quirk.css    (quirk.css)
    res/full-screen-override.css    (full-screen-override.css)
    res/plaintext.css     (plaintext.css)
    res/viewsource.css    (viewsource.css)
    res/counterstyles.css (counterstyles.css)
    res/noscript.css (noscript.css)
    res/noframes.css (noframes.css)
 *  res/forms.css    (forms.css)