Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 840315 - Change default serif and sans serif fonts on gonk, r=jfkthame a=blocking-leo

Browse Source
This commit is contained in:
Michael Wu 2013-04-15 23:00:08 +02:00
parent ab6b29d8ba
commit 78ce230297
4 changed files with 59 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layout/reftests/bugs/reftest.list
View File

@ -594,7 +594,7 @@ skip-if(B2G) == 367247-l-scroll.html 367247-l-auto.html
== 367612-1e.html 367612-1-ref.html
== 367612-1f.html 367612-1-ref.html
!= 367612-1g.html 367612-1-ref.html
random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == 368020-1.html 368020-1-ref.html
skip-if(B2G) random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == 368020-1.html 368020-1-ref.html
== 368020-2.html 368020-2-ref.html
fails == 368020-3.html 368020-3-ref.html # bug 368085
fails == 368020-4.html 368020-4-ref.html # bug 368085
@ -1189,7 +1189,7 @@ test-pref(dom.use_xbl_scopes_for_remote_xul,false) != 449149-1b.html about:blank
== 455171-5.html 455171-5-ref.html
== 455280-1.xhtml 455280-1-ref.xhtml
skip-if(B2G) == 455826-1.html 455826-1-ref.html
fails-if(cocoaWidget) == 456147.xul 456147-ref.html # bug 458047
skip-if(B2G) fails-if(cocoaWidget) == 456147.xul 456147-ref.html # bug 458047
skip-if(B2G) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),1,1) == 456219-1a.html 456219-1-ref.html # bug 853273
skip-if(B2G) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),1,1) == 456219-1b.html 456219-1-ref.html # bug 853273
skip-if(B2G) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),1,1) == 456219-1c.html 456219-1-ref.html # bug 853273

2
layout/reftests/canvas/reftest.list
View File

@ -43,7 +43,7 @@ skip-if(B2G) asserts-if(cocoaWidget,0-2) == size-change-1.html size-change-1-ref
!= text-bidi-ltr-test.html text-bidi-ltr-notref.html # for bug 698185
== text-bidi-rtl-test.html text-bidi-rtl-ref.html
fails-if(B2G) != text-font-lang.html text-font-lang-notref.html
!= text-font-lang.html text-font-lang-notref.html
== text-measure.html text-measure-ref.html

2
layout/reftests/text/reftest.list
View File

@ -50,7 +50,7 @@ skip-if(!(d2d||cocoaWidget)) random-if(d2d) != subpixel-glyphs-x-2a.html subpixe
skip-if(B2G) HTTP(..) == subpixel-glyphs-x-3a.html subpixel-glyphs-x-3b.html
# No platforms do subpixel positioning vertically
== subpixel-glyphs-y-1a.html subpixel-glyphs-y-1b.html
fuzzy-if(Android,231,603) == subpixel-lineheight-1a.html subpixel-lineheight-1b.html
fuzzy-if((Android||B2G),231,603) == subpixel-lineheight-1a.html subpixel-lineheight-1b.html
== swash-1.html swash-1-ref.html
HTTP(..) != synthetic-bold-metrics-01.html synthetic-bold-metrics-01-notref.html
HTTP(..) == synthetic-bold-papyrus-01.html synthetic-bold-papyrus-01-ref.html

116
modules/libpref/src/init/all.js
View File

@ -3170,89 +3170,83 @@ pref("print.print_extra_margin", 0); // twips
pref("font.alias-list", "sans,sans-serif,serif,monospace");
// As we ship bundled Open Sans and Charis SIL Compact fonts on Android,
// but not on B2G/Gonk, we give them separate default font preferences.
// Gonk and Android ship different sets of fonts
#ifdef MOZ_WIDGET_GONK
// TODO: this block is initially a copy of the ANDROID prefs as they were
// prior to the switch to Open Sans and Charis SIL Compact (bug 831354).
// We should review these in the light of what's actually present on the Gonk platform;
// some entries could probably be cleaned up.
// TODO: some entries could probably be cleaned up.
// ar
pref("font.name.serif.el", "Droid Serif");
pref("font.name.sans-serif.el", "Droid Sans");
pref("font.name.monospace.el", "Droid Sans Mono");
pref("font.name-list.sans-serif.el", "Roboto, Droid Sans");
pref("font.name.sans-serif.el", "Roboto");
pref("font.name.monospace.el", "Source Code Pro");
pref("font.name.serif.he", "Droid Serif");
pref("font.name.sans-serif.he", "Droid Sans");
pref("font.name.monospace.he", "Droid Sans Mono");
pref("font.name-list.sans-serif.he", "Droid Sans Hebrew, Droid Sans");
pref("font.name.serif.he", "Charis SIL Compact");
pref("font.name.sans-serif.he", "Feura Sans");
pref("font.name.monospace.he", "Source Code Pro");
pref("font.name-list.sans-serif.he", "Droid Sans Hebrew, Feura Sans");
pref("font.name.serif.ja", "Droid Serif");
pref("font.name.sans-serif.ja", "Droid Sans");
pref("font.name.serif.ja", "Charis SIL Compact");
pref("font.name.sans-serif.ja", "Feura Sans");
pref("font.name.monospace.ja", "MotoyaLMaru");
pref("font.name-list.sans-serif.ja", "Roboto, Droid Sans, MotoyaLMaru, MotoyaLCedar, Droid Sans Japanese");
pref("font.name-list.monospace.ja", "MotoyaLMaru, MotoyaLCedar, Droid Sans Mono");
pref("font.name-list.sans-serif.ja", "Feura Sans, Roboto, MotoyaLMaru, MotoyaLCedar, Droid Sans Japanese");
pref("font.name-list.monospace.ja", "MotoyaLMaru, MotoyaLCedar, Source Code Pro");
pref("font.name.serif.ko", "Droid Serif");
pref("font.name.sans-serif.ko", "Droid Sans");
pref("font.name.monospace.ko", "Droid Sans Mono");
pref("font.name.serif.ko", "Charis SIL Compact");
pref("font.name.sans-serif.ko", "Feura Sans");
pref("font.name.monospace.ko", "Source Code Pro");
pref("font.name.serif.th", "Droid Serif");
pref("font.name.sans-serif.th", "Droid Sans");
pref("font.name.monospace.th", "Droid Sans Mono");
pref("font.name-list.sans-serif.th", "Droid Sans Thai, Droid Sans");
pref("font.name.serif.th", "Charis SIL Compact");
pref("font.name.sans-serif.th", "Feura Sans");
pref("font.name.monospace.th", "Source Code Pro");
pref("font.name-list.sans-serif.th", "Feura Sans, Droid Sans Thai");
pref("font.name.serif.tr", "Droid Serif");
pref("font.name.sans-serif.tr", "Droid Sans");
pref("font.name.monospace.tr", "Droid Sans Mono");
pref("font.name-list.sans-serif.tr", "Roboto, Droid Sans");
pref("font.name.serif.tr", "Charis SIL Compact");
pref("font.name.sans-serif.tr", "Feura Sans");
pref("font.name.monospace.tr", "Source Code Pro");
pref("font.name-list.sans-serif.tr", "Feura Sans, Roboto");
pref("font.name.serif.x-baltic", "Droid Serif");
pref("font.name.sans-serif.x-baltic", "Droid Sans");
pref("font.name.monospace.x-baltic", "Droid Sans Mono");
pref("font.name-list.sans-serif.x-baltic", "Roboto, Droid Sans");
pref("font.name.serif.x-baltic", "Charis SIL Compact");
pref("font.name.sans-serif.x-baltic", "Feura Sans");
pref("font.name.monospace.x-baltic", "Source Code Pro");
pref("font.name-list.sans-serif.x-baltic", "Feura Sans, Roboto");
pref("font.name.serif.x-central-euro", "Droid Serif");
pref("font.name.sans-serif.x-central-euro", "Droid Sans");
pref("font.name.monospace.x-central-euro", "Droid Sans Mono");
pref("font.name-list.sans-serif.x-central-euro", "Roboto, Droid Sans");
pref("font.name.serif.x-central-euro", "Charis SIL Compact");
pref("font.name.sans-serif.x-central-euro", "Feura Sans");
pref("font.name.monospace.x-central-euro", "Source Code Pro");
pref("font.name-list.sans-serif.x-central-euro", "Feura Sans, Roboto");
pref("font.name.serif.x-cyrillic", "Droid Serif");
pref("font.name.sans-serif.x-cyrillic", "Droid Sans");
pref("font.name.monospace.x-cyrillic", "Droid Sans Mono");
pref("font.name-list.sans-serif.x-cyrillic", "Roboto, Droid Sans");
pref("font.name.serif.x-cyrillic", "Charis SIL Compact");
pref("font.name.sans-serif.x-cyrillic", "Roboto");
pref("font.name.monospace.x-cyrillic", "Source Code Pro");
pref("font.name.serif.x-unicode", "Droid Serif");
pref("font.name.sans-serif.x-unicode", "Droid Sans");
pref("font.name.monospace.x-unicode", "Droid Sans Mono");
pref("font.name-list.sans-serif.x-unicode", "Roboto, Droid Sans");
pref("font.name.serif.x-unicode", "Charis SIL Compact");
pref("font.name.sans-serif.x-unicode", "Feura Sans");
pref("font.name.monospace.x-unicode", "Source Code Pro");
pref("font.name-list.sans-serif.x-unicode", "Feura Sans, Roboto");
pref("font.name.serif.x-user-def", "Droid Serif");
pref("font.name.sans-serif.x-user-def", "Droid Sans");
pref("font.name.monospace.x-user-def", "Droid Sans Mono");
pref("font.name-list.sans-serif.x-user-def", "Roboto, Droid Sans");
pref("font.name.serif.x-user-def", "Charis SIL Compact");
pref("font.name.sans-serif.x-user-def", "Feura Sans");
pref("font.name.monospace.x-user-def", "Source Code Pro");
pref("font.name-list.sans-serif.x-user-def", "Feura Sans, Roboto");
pref("font.name.serif.x-western", "Droid Serif");
pref("font.name.sans-serif.x-western", "Droid Sans");
pref("font.name.monospace.x-western", "Droid Sans Mono");
pref("font.name-list.sans-serif.x-western", "Roboto, Droid Sans");
pref("font.name.serif.x-western", "Charis SIL Compact");
pref("font.name.sans-serif.x-western", "Feura Sans");
pref("font.name.monospace.x-western", "Source Code Pro");
pref("font.name-list.sans-serif.x-western", "Feura Sans, Roboto");
pref("font.name.serif.zh-CN", "Droid Serif");
pref("font.name.sans-serif.zh-CN", "Droid Sans");
pref("font.name.monospace.zh-CN", "Droid Sans Mono");
pref("font.name.serif.zh-CN", "Charis SIL Compact");
pref("font.name.sans-serif.zh-CN", "Feura Sans");
pref("font.name.monospace.zh-CN", "Source Code Pro");
pref("font.name.serif.zh-HK", "Droid Serif");
pref("font.name.sans-serif.zh-HK", "Droid Sans");
pref("font.name.monospace.zh-HK", "Droid Sans Mono");
pref("font.name.serif.zh-HK", "Charis SIL Compact");
pref("font.name.sans-serif.zh-HK", "Feura Sans");
pref("font.name.monospace.zh-HK", "Source Code Pro");
pref("font.name.serif.zh-TW", "Droid Serif");
pref("font.name.sans-serif.zh-TW", "Droid Sans");
pref("font.name.monospace.zh-TW", "Droid Sans Mono");
pref("font.name.serif.zh-TW", "Charis SIL Compact");
pref("font.name.sans-serif.zh-TW", "Feura Sans");
pref("font.name.monospace.zh-TW", "Source Code Pro");
#else