Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 06:25:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Derive Debug for more font-related types

Browse source
This commit is contained in:
Olaf Buddenhagen 2015-12-25 22:30:08 +01:00
parent 7197e7f311
commit 3c5a3ca4ff
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/gfx/font_cache_task.rs
View file

@ -77,7 +77,7 @@ impl FontFamily {
} }
/// Commands that the FontContext sends to the font cache task. /// Commands that the FontContext sends to the font cache task.
#[derive(Deserialize, Serialize)] #[derive(Deserialize, Serialize, Debug)]
pub enum Command { pub enum Command {
GetFontTemplate(String, FontTemplateDescriptor, IpcSender<Reply>), GetFontTemplate(String, FontTemplateDescriptor, IpcSender<Reply>),
GetLastResortFontTemplate(FontTemplateDescriptor, IpcSender<Reply>), GetLastResortFontTemplate(FontTemplateDescriptor, IpcSender<Reply>),
@ -87,7 +87,7 @@ pub enum Command {
} }
/// Reply messages sent from the font cache task to the FontContext caller. /// Reply messages sent from the font cache task to the FontContext caller.
#[derive(Deserialize, Serialize)] #[derive(Deserialize, Serialize, Debug)]
pub enum Reply { pub enum Reply {
GetFontTemplateReply(Option<Arc<FontTemplateData>>), GetFontTemplateReply(Option<Arc<FontTemplateData>>),
} }
@ -271,7 +271,7 @@ impl FontCache {
/// The public interface to the font cache task, used exclusively by /// The public interface to the font cache task, used exclusively by
/// the per-thread/task FontContext structures. /// the per-thread/task FontContext structures.
#[derive(Clone, Deserialize, Serialize)] #[derive(Clone, Deserialize, Serialize, Debug)]
pub struct FontCacheTask { pub struct FontCacheTask {
chan: IpcSender<Command>, chan: IpcSender<Command>,
} }

5
components/gfx/font_context.rs
View file

@ -44,17 +44,20 @@ fn create_scaled_font(template: &Arc<FontTemplateData>, pt_size: Au) -> ScaledFo
static SMALL_CAPS_SCALE_FACTOR: f32 = 0.8; // Matches FireFox (see gfxFont.h) static SMALL_CAPS_SCALE_FACTOR: f32 = 0.8; // Matches FireFox (see gfxFont.h)
#[derive(Debug)]
struct LayoutFontCacheEntry { struct LayoutFontCacheEntry {
family: String, family: String,
font: Option<Rc<RefCell<Font>>>, font: Option<Rc<RefCell<Font>>>,
} }
#[derive(Debug)]
struct FallbackFontCacheEntry { struct FallbackFontCacheEntry {
font: Rc<RefCell<Font>>, font: Rc<RefCell<Font>>,
} }
/// A cached azure font (per paint task) that /// A cached azure font (per paint task) that
/// can be shared by multiple text runs. /// can be shared by multiple text runs.
#[derive(Debug)]
struct PaintFontCacheEntry { struct PaintFontCacheEntry {
pt_size: Au, pt_size: Au,
identifier: Atom, identifier: Atom,
@ -69,6 +72,7 @@ static FONT_CACHE_EPOCH: AtomicUsize = ATOMIC_USIZE_INIT;
/// working with fonts. It is the public API used by the layout and /// working with fonts. It is the public API used by the layout and
/// paint code. It talks directly to the font cache task where /// paint code. It talks directly to the font cache task where
/// required. /// required.
#[derive(Debug)]
pub struct FontContext { pub struct FontContext {
platform_handle: FontContextHandle, platform_handle: FontContextHandle,
font_cache_task: FontCacheTask, font_cache_task: FontCacheTask,
@ -317,6 +321,7 @@ impl HeapSizeOf for FontContext {
} }
} }
#[derive(Debug)]
struct LayoutFontGroupCacheKey { struct LayoutFontGroupCacheKey {
pointer: Arc<SpecifiedFontStyle>, pointer: Arc<SpecifiedFontStyle>,
size: Au, size: Au,

2
components/style/properties.mako.rs
View file

@ -6115,7 +6115,7 @@ pub mod style_structs {
% for style_struct in STYLE_STRUCTS: % for style_struct in STYLE_STRUCTS:
% if style_struct.name == "Font": % if style_struct.name == "Font":
#[derive(Clone, HeapSizeOf)] #[derive(Clone, HeapSizeOf, Debug)]
% else: % else:
#[derive(PartialEq, Clone, HeapSizeOf)] #[derive(PartialEq, Clone, HeapSizeOf)]
% endif % endif