зеркало из https://github.com/mozilla/gecko-dev.git
servo: Merge #18923 - clean up cjk for os (from tigercosmos:master); r=jdm
<!-- Please describe your changes on the following line: --> r? @jdm --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #18922 (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: 11413ab013d0d2c894fedf3c55d70d155f7fac87 --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : efe3ae4d93c3dcf01cf37c7afdb9cd9801265706
This commit is contained in:
Родитель
4d7483fee3
Коммит
7eae8ab2bd
|
@ -132,7 +132,6 @@ pub fn system_default_family(generic_name: &str) -> Option<String> {
|
|||
}
|
||||
}
|
||||
|
||||
#[cfg(target_os = "linux")]
|
||||
pub fn last_resort_font_families() -> Vec<String> {
|
||||
vec!(
|
||||
"Fira Sans".to_owned(),
|
||||
|
@ -141,16 +140,4 @@ pub fn last_resort_font_families() -> Vec<String> {
|
|||
)
|
||||
}
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
pub fn last_resort_font_families() -> Vec<String> {
|
||||
vec!(
|
||||
"Arial".to_owned()
|
||||
)
|
||||
}
|
||||
|
||||
#[cfg(target_os = "linux")]
|
||||
pub static SANS_SERIF_FONT_FAMILY: &'static str = "DejaVu Sans";
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
pub static SANS_SERIF_FONT_FAMILY: &'static str = "Arial";
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче