Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename FontTemplateInfo to FontTemplateAndWebRenderFontKey (#32100)

Browse source 
This clarifies what this type does a bit. Based on a suggestion by
@mukilan.
This commit is contained in:
Martin Robinson 2024-04-17 09:26:39 +02:00 • committed by GitHub
parent ab2b001265
commit 83dec920dd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/gfx/font_cache_thread.rs
View file

@ -42,13 +42,13 @@ pub struct FontTemplates {
}
#[derive(Clone, Debug)]
pub struct FontTemplateInfo {
pub struct FontTemplateAndWebRenderFontKey {
pub font_template: FontTemplateRef,
pub font_key: FontKey,
}
#[derive(Debug, Deserialize, Serialize)]
pub struct SerializedFontTemplateInfo {
pub struct SerializedFontTemplateAndWebRenderFontKey {
pub serialized_font_template: SerializedFontTemplate,
pub font_key: FontKey,
}
@ -151,7 +151,7 @@ pub enum Command {
/// Reply messages sent from the font cache thread to the FontContext caller.
#[derive(Debug, Deserialize, Serialize)]
pub enum Reply {
GetFontTemplateReply(Option<SerializedFontTemplateInfo>),
GetFontTemplateReply(Option<SerializedFontTemplateAndWebRenderFontKey>),
}
/// The font cache thread itself. It maintains a list of reference counted
@ -218,7 +218,7 @@ impl FontCache {
};
let _ = result.send(Reply::GetFontTemplateReply(Some(
SerializedFontTemplateInfo {
SerializedFontTemplateAndWebRenderFontKey {
serialized_font_template,
font_key: font_template_info.font_key,
},
@ -452,7 +452,7 @@ impl FontCache {
&mut self,
template_descriptor: &FontTemplateDescriptor,
family_descriptor: &FontFamilyDescriptor,
) -> Option<FontTemplateInfo> {
) -> Option<FontTemplateAndWebRenderFontKey> {
match family_descriptor.scope {
FontSearchScope::Any => self
.find_font_in_web_family(template_descriptor, &family_descriptor.name)
@ -464,7 +464,7 @@ impl FontCache {
self.find_font_in_local_family(template_descriptor, &family_descriptor.name)
},
}
.map(|font_template| FontTemplateInfo {
.map(|font_template| FontTemplateAndWebRenderFontKey {
font_key: self.get_font_key_for_template(&font_template),
font_template,
})
@ -600,7 +600,7 @@ impl FontSource for FontCacheThread {
&mut self,
template_descriptor: FontTemplateDescriptor,
family_descriptor: FontFamilyDescriptor,
) -> Option<FontTemplateInfo> {
) -> Option<FontTemplateAndWebRenderFontKey> {
let (response_chan, response_port) = ipc::channel().expect("failed to create IPC channel");
self.chan
.send(Command::GetFontTemplate(
@ -629,7 +629,7 @@ impl FontSource for FontCacheThread {
.serialized_font_template
.to_font_template(),
));
FontTemplateInfo {
FontTemplateAndWebRenderFontKey {
font_template,
font_key: serialized_font_template_info.font_key,
}