From 6d8e6e30316c2feb9f71a0264cf4c20e67748e74 Mon Sep 17 00:00:00 2001 From: Xidorn Quan Date: Thu, 8 Oct 2015 10:19:29 +1100 Subject: [PATCH] Bug 1165538 part 3 - Apply -moz-min-font-size-ratio to rt elements and add test. r=heycam --HG-- extra : source : 9d94998817bfb618e6bd0fe39f3f6924d1c2e266 --- layout/reftests/css-ruby/min-font-size-1-ref.html | 13 +++++++++++++ layout/reftests/css-ruby/min-font-size-1.html | 13 +++++++++++++ layout/reftests/css-ruby/reftest.list | 1 + layout/style/html.css | 2 ++ 4 files changed, 29 insertions(+) create mode 100644 layout/reftests/css-ruby/min-font-size-1-ref.html create mode 100644 layout/reftests/css-ruby/min-font-size-1.html diff --git a/layout/reftests/css-ruby/min-font-size-1-ref.html b/layout/reftests/css-ruby/min-font-size-1-ref.html new file mode 100644 index 000000000000..93b4bba2cd7e --- /dev/null +++ b/layout/reftests/css-ruby/min-font-size-1-ref.html @@ -0,0 +1,13 @@ + + + + + Bug 1165538 - Minimum font size on ruby text + + + + 超電磁砲 + レールガン + + + diff --git a/layout/reftests/css-ruby/min-font-size-1.html b/layout/reftests/css-ruby/min-font-size-1.html new file mode 100644 index 000000000000..150e032216ee --- /dev/null +++ b/layout/reftests/css-ruby/min-font-size-1.html @@ -0,0 +1,13 @@ + + + + + Bug 1165538 - Minimum font size on ruby text + + + + 超電磁砲 + レールガン + + + diff --git a/layout/reftests/css-ruby/reftest.list b/layout/reftests/css-ruby/reftest.list index 32d370210315..3f9e80ad36eb 100644 --- a/layout/reftests/css-ruby/reftest.list +++ b/layout/reftests/css-ruby/reftest.list @@ -38,6 +38,7 @@ fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),3,2) == line-break-suppressi == line-height-2.html line-height-2-ref.html == line-height-3.html line-height-3-ref.html == line-height-4.html line-height-4-ref.html +test-pref(font.minimum-size.ja,16) == min-font-size-1.html min-font-size-1-ref.html load nested-ruby-1.html == no-transform.html no-transform-ref.html == relative-positioning-1.html relative-positioning-1-ref.html diff --git a/layout/style/html.css b/layout/style/html.css index 85e8f83b4eec..5ac7d635d018 100644 --- a/layout/style/html.css +++ b/layout/style/html.css @@ -810,6 +810,7 @@ marquee[direction="up"], marquee[direction="down"] { rtc, rt { white-space: nowrap; font-size: 50%; + -moz-min-font-size-ratio: 50%; line-height: 1; %ifndef XP_WIN /* The widely-used Windows font Meiryo doesn't work fine with this @@ -828,6 +829,7 @@ marquee[direction="up"], marquee[direction="down"] { } rtc:lang(zh-TW), rt:lang(zh-TW) { font-size: 30%; /* bopomofo */ + -moz-min-font-size-ratio: 30%; } rtc > rt { font-size: inherit;