From 2b7fba373ee9d3298fb3c0874688d03c6f9ba6aa Mon Sep 17 00:00:00 2001 From: Olaf Buddenhagen Date: Sun, 3 Jan 2016 07:42:57 +0501 Subject: [PATCH] servo: Merge #9070 - Derive Debug for more font-related types (from antrik:debug-fonts); r=nox Needs to pull in newer ipc-channel and azure. Source-Repo: https://github.com/servo/servo Source-Revision: ebf4ce8288987af1a65390cbf7e56d1e564fa335 --- servo/components/gfx/font_cache_task.rs | 6 +++--- servo/components/gfx/font_context.rs | 5 +++++ servo/components/servo/Cargo.lock | 4 ++-- servo/components/style/properties.mako.rs | 2 +- servo/ports/cef/Cargo.lock | 6 +++--- servo/ports/gonk/Cargo.lock | 6 +++--- 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/servo/components/gfx/font_cache_task.rs b/servo/components/gfx/font_cache_task.rs index aba00250ba1a..afb9b5724d7e 100644 --- a/servo/components/gfx/font_cache_task.rs +++ b/servo/components/gfx/font_cache_task.rs @@ -80,7 +80,7 @@ impl FontTemplates { } /// Commands that the FontContext sends to the font cache task. -#[derive(Deserialize, Serialize)] +#[derive(Deserialize, Serialize, Debug)] pub enum Command { GetFontTemplate(FontFamily, FontTemplateDescriptor, IpcSender), GetLastResortFontTemplate(FontTemplateDescriptor, IpcSender), @@ -90,7 +90,7 @@ pub enum Command { } /// Reply messages sent from the font cache task to the FontContext caller. -#[derive(Deserialize, Serialize)] +#[derive(Deserialize, Serialize, Debug)] pub enum Reply { GetFontTemplateReply(Option>), } @@ -315,7 +315,7 @@ impl FontCache { /// The public interface to the font cache task, used exclusively by /// the per-thread/task FontContext structures. -#[derive(Clone, Deserialize, Serialize)] +#[derive(Clone, Deserialize, Serialize, Debug)] pub struct FontCacheTask { chan: IpcSender, } diff --git a/servo/components/gfx/font_context.rs b/servo/components/gfx/font_context.rs index f58a501aca1e..bbf86055cde5 100644 --- a/servo/components/gfx/font_context.rs +++ b/servo/components/gfx/font_context.rs @@ -44,17 +44,20 @@ fn create_scaled_font(template: &Arc, pt_size: Au) -> ScaledFo static SMALL_CAPS_SCALE_FACTOR: f32 = 0.8; // Matches FireFox (see gfxFont.h) +#[derive(Debug)] struct LayoutFontCacheEntry { family: String, font: Option>>, } +#[derive(Debug)] struct FallbackFontCacheEntry { font: Rc>, } /// A cached azure font (per paint task) that /// can be shared by multiple text runs. +#[derive(Debug)] struct PaintFontCacheEntry { pt_size: Au, 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 /// paint code. It talks directly to the font cache task where /// required. +#[derive(Debug)] pub struct FontContext { platform_handle: FontContextHandle, font_cache_task: FontCacheTask, @@ -316,6 +320,7 @@ impl HeapSizeOf for FontContext { } } +#[derive(Debug)] struct LayoutFontGroupCacheKey { pointer: Arc, size: Au, diff --git a/servo/components/servo/Cargo.lock b/servo/components/servo/Cargo.lock index 39b572d34be2..3d6d7e60012a 100644 --- a/servo/components/servo/Cargo.lock +++ b/servo/components/servo/Cargo.lock @@ -92,7 +92,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "azure" version = "0.2.1" -source = "git+https://github.com/servo/rust-azure#b05ba4bb70aefb319c7f168fc83a9fd04a1aa1ef" +source = "git+https://github.com/servo/rust-azure#7662f94f0b8c368134a04edac936328d603c7ad8" dependencies = [ "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -872,7 +872,7 @@ dependencies = [ [[package]] name = "ipc-channel" version = "0.1.0" -source = "git+https://github.com/servo/ipc-channel#6900611d5f00c7405ae886d75841fe37df6bfc38" +source = "git+https://github.com/servo/ipc-channel#1b95d5490d7b7f49576577315bdb5b4c834d08d0" dependencies = [ "bincode 0.4.0 (git+https://github.com/TyOverby/bincode)", "byteorder 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/servo/components/style/properties.mako.rs b/servo/components/style/properties.mako.rs index a5c9e1eee82e..2b4191804768 100644 --- a/servo/components/style/properties.mako.rs +++ b/servo/components/style/properties.mako.rs @@ -6141,7 +6141,7 @@ pub mod style_structs { % for style_struct in STYLE_STRUCTS: % if style_struct.name == "Font": - #[derive(Clone, HeapSizeOf)] + #[derive(Clone, HeapSizeOf, Debug)] % else: #[derive(PartialEq, Clone, HeapSizeOf)] % endif diff --git a/servo/ports/cef/Cargo.lock b/servo/ports/cef/Cargo.lock index d62d8341e92e..2289d09cbc46 100644 --- a/servo/ports/cef/Cargo.lock +++ b/servo/ports/cef/Cargo.lock @@ -81,7 +81,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "azure" version = "0.2.1" -source = "git+https://github.com/servo/rust-azure#b05ba4bb70aefb319c7f168fc83a9fd04a1aa1ef" +source = "git+https://github.com/servo/rust-azure#7662f94f0b8c368134a04edac936328d603c7ad8" dependencies = [ "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -832,12 +832,12 @@ dependencies = [ [[package]] name = "ipc-channel" version = "0.1.0" -source = "git+https://github.com/servo/ipc-channel#6900611d5f00c7405ae886d75841fe37df6bfc38" +source = "git+https://github.com/servo/ipc-channel#1b95d5490d7b7f49576577315bdb5b4c834d08d0" dependencies = [ "bincode 0.4.0 (git+https://github.com/TyOverby/bincode)", "byteorder 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/servo/ports/gonk/Cargo.lock b/servo/ports/gonk/Cargo.lock index 4a430afd689c..2a8ae352aa6b 100644 --- a/servo/ports/gonk/Cargo.lock +++ b/servo/ports/gonk/Cargo.lock @@ -72,7 +72,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "azure" version = "0.2.1" -source = "git+https://github.com/servo/rust-azure#b05ba4bb70aefb319c7f168fc83a9fd04a1aa1ef" +source = "git+https://github.com/servo/rust-azure#7662f94f0b8c368134a04edac936328d603c7ad8" dependencies = [ "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -800,12 +800,12 @@ dependencies = [ [[package]] name = "ipc-channel" version = "0.1.0" -source = "git+https://github.com/servo/ipc-channel#6900611d5f00c7405ae886d75841fe37df6bfc38" +source = "git+https://github.com/servo/ipc-channel#1b95d5490d7b7f49576577315bdb5b4c834d08d0" dependencies = [ "bincode 0.4.0 (git+https://github.com/TyOverby/bincode)", "byteorder 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",