mirror of
https://github.com/servo/servo.git
synced 2025-10-14 07:20:34 +01:00
6b2fa91357
Now that `FontTemplateData` is more or less the same on all platforms, it can be removed. This is a preparatory change for a full refactor of the font system on Servo. The major changes here are: - Remove `FontTemplateData` and move its members into `FontTemplate` - Make `FontTemplate` have full interior mutability instead of only the `FontTemplateData` member. This is preparation for having these data types `Send` and `Sync` with locking. - Remove the strong/weak reference concept for font data. In practice, all font data references were strong, so this was never fully complete. Instead of using this approach, the new font system will use a central font data cache with references associated to layouts. - The `CTFont` cache is now a global cache, so `CTFont`s can be shared between threads. The cache is cleared when clearing font caches. A benefit of this change (apart from `CTFont` sharing) is that font data loading is platform-independent now.
53 lines
1.4 KiB
Rust
53 lines
1.4 KiB
Rust
/* 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 https://mozilla.org/MPL/2.0/. */
|
|
|
|
#[cfg(any(target_os = "linux", target_os = "android"))]
|
|
pub use crate::platform::freetype::{font, font_list, library_handle};
|
|
#[cfg(target_os = "macos")]
|
|
pub use crate::platform::macos::{font, font_list, font_template};
|
|
#[cfg(target_os = "windows")]
|
|
pub use crate::platform::windows::{font, font_list};
|
|
|
|
#[cfg(any(target_os = "linux", target_os = "android"))]
|
|
mod freetype {
|
|
use std::ffi::CStr;
|
|
use std::str;
|
|
|
|
use libc::c_char;
|
|
|
|
/// Creates a String from the given null-terminated buffer.
|
|
/// Panics if the buffer does not contain UTF-8.
|
|
unsafe fn c_str_to_string(s: *const c_char) -> String {
|
|
str::from_utf8(CStr::from_ptr(s).to_bytes())
|
|
.unwrap()
|
|
.to_owned()
|
|
}
|
|
|
|
pub mod font;
|
|
|
|
#[cfg(target_os = "linux")]
|
|
pub mod font_list;
|
|
#[cfg(target_os = "android")]
|
|
mod android {
|
|
pub mod font_list;
|
|
mod xml;
|
|
}
|
|
#[cfg(target_os = "android")]
|
|
pub use self::android::font_list;
|
|
|
|
pub mod library_handle;
|
|
}
|
|
|
|
#[cfg(target_os = "macos")]
|
|
mod macos {
|
|
pub mod font;
|
|
pub mod font_list;
|
|
pub mod font_template;
|
|
}
|
|
|
|
#[cfg(target_os = "windows")]
|
|
mod windows {
|
|
pub mod font;
|
|
pub mod font_list;
|
|
}
|