Auto merge of #18923 - tigercosmos:master, r=jdm

clean up cjk for os

<!-- 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. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18923)
<!-- Reviewable:end -->

1 files changed, 0 insertions, 13 deletions

diff --git a/components/gfx/platform/freetype/font_list.rs b/components/gfx/platform/freetype/font_list.rs
index 8f2898ae680..c4f0cfe4fec 100644
--- a/components/gfx/platform/freetype/font_list.rs
+++ b/components/gfx/platform/freetype/font_list.rs
@@ -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";
-