mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Remove some trailing whitespace
This commit is contained in:
parent
5372212161
commit
447cc64a40
4 changed files with 16 additions and 16 deletions
|
@ -198,7 +198,7 @@ impl RunMetrics {
|
||||||
// ascent+descent and advance is sometimes too generous and
|
// ascent+descent and advance is sometimes too generous and
|
||||||
// looking at actual glyph extents can yield a tighter box.
|
// looking at actual glyph extents can yield a tighter box.
|
||||||
|
|
||||||
RunMetrics {
|
RunMetrics {
|
||||||
advance_width: advance,
|
advance_width: advance,
|
||||||
bounding_box: bounds,
|
bounding_box: bounds,
|
||||||
ascent: ascent,
|
ascent: ascent,
|
||||||
|
@ -287,9 +287,9 @@ impl<'self> Font {
|
||||||
fn make_shaper(&'self mut self) -> &'self Shaper {
|
fn make_shaper(&'self mut self) -> &'self Shaper {
|
||||||
// fast path: already created a shaper
|
// fast path: already created a shaper
|
||||||
match self.shaper {
|
match self.shaper {
|
||||||
Some(ref shaper) => {
|
Some(ref shaper) => {
|
||||||
let s: &'self Shaper = shaper;
|
let s: &'self Shaper = shaper;
|
||||||
return s;
|
return s;
|
||||||
},
|
},
|
||||||
None => {}
|
None => {}
|
||||||
}
|
}
|
||||||
|
@ -400,7 +400,7 @@ impl Font {
|
||||||
|
|
||||||
let glyphbuf = struct__AzGlyphBuffer {
|
let glyphbuf = struct__AzGlyphBuffer {
|
||||||
mGlyphs: vec::raw::to_ptr(azglyphs),
|
mGlyphs: vec::raw::to_ptr(azglyphs),
|
||||||
mNumGlyphs: azglyph_buf_len as uint32_t
|
mNumGlyphs: azglyph_buf_len as uint32_t
|
||||||
};
|
};
|
||||||
|
|
||||||
unsafe {
|
unsafe {
|
||||||
|
|
|
@ -38,7 +38,7 @@ impl<'self> FontContext {
|
||||||
profiler_chan: ProfilerChan)
|
profiler_chan: ProfilerChan)
|
||||||
-> FontContext {
|
-> FontContext {
|
||||||
let handle = FontContextHandle::new();
|
let handle = FontContextHandle::new();
|
||||||
let font_list = if needs_font_list {
|
let font_list = if needs_font_list {
|
||||||
Some(FontList::new(&handle, profiler_chan.clone())) }
|
Some(FontList::new(&handle, profiler_chan.clone())) }
|
||||||
else { None };
|
else { None };
|
||||||
|
|
||||||
|
@ -50,7 +50,7 @@ impl<'self> FontContext {
|
||||||
generic_fonts.insert(~"fantasy", ~"Papyrus");
|
generic_fonts.insert(~"fantasy", ~"Papyrus");
|
||||||
generic_fonts.insert(~"monospace", ~"Menlo");
|
generic_fonts.insert(~"monospace", ~"Menlo");
|
||||||
|
|
||||||
FontContext {
|
FontContext {
|
||||||
instance_cache: LRUCache::new(10),
|
instance_cache: LRUCache::new(10),
|
||||||
font_list: font_list,
|
font_list: font_list,
|
||||||
group_cache: LRUCache::new(10),
|
group_cache: LRUCache::new(10),
|
||||||
|
@ -86,7 +86,7 @@ impl<'self> FontContext {
|
||||||
debug!("font cache hit");
|
debug!("font cache hit");
|
||||||
Ok(f)
|
Ok(f)
|
||||||
},
|
},
|
||||||
None => {
|
None => {
|
||||||
debug!("font cache miss");
|
debug!("font cache miss");
|
||||||
let result = self.create_font_instance(desc);
|
let result = self.create_font_instance(desc);
|
||||||
match result.clone() {
|
match result.clone() {
|
||||||
|
@ -142,7 +142,7 @@ impl<'self> FontContext {
|
||||||
let instance = self.get_font_by_descriptor(result);
|
let instance = self.get_font_by_descriptor(result);
|
||||||
|
|
||||||
for font in instance.iter() { fonts.push(font.clone()); }
|
for font in instance.iter() { fonts.push(font.clone()); }
|
||||||
},
|
},
|
||||||
_ => {}
|
_ => {}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -200,7 +200,7 @@ impl<'self> FontContext {
|
||||||
fn create_font_instance(&self, desc: &FontDescriptor) -> Result<RcMut<Font>, ()> {
|
fn create_font_instance(&self, desc: &FontDescriptor) -> Result<RcMut<Font>, ()> {
|
||||||
return match &desc.selector {
|
return match &desc.selector {
|
||||||
// TODO(Issue #174): implement by-platform-name font selectors.
|
// TODO(Issue #174): implement by-platform-name font selectors.
|
||||||
&SelectorPlatformIdentifier(ref identifier) => {
|
&SelectorPlatformIdentifier(ref identifier) => {
|
||||||
let result_handle = self.handle.create_font_from_identifier((*identifier).clone(),
|
let result_handle = self.handle.create_font_from_identifier((*identifier).clone(),
|
||||||
desc.style.clone());
|
desc.style.clone());
|
||||||
do result_handle.and_then |handle| {
|
do result_handle.and_then |handle| {
|
||||||
|
|
|
@ -54,7 +54,7 @@ impl<'self> FontList {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn find_font_in_family(&'self mut self,
|
pub fn find_font_in_family(&'self mut self,
|
||||||
family_name: &~str,
|
family_name: &~str,
|
||||||
style: &SpecifiedFontStyle) -> Option<&'self FontEntry> {
|
style: &SpecifiedFontStyle) -> Option<&'self FontEntry> {
|
||||||
// TODO(Issue #188): look up localized font family names if canonical name not found
|
// TODO(Issue #188): look up localized font family names if canonical name not found
|
||||||
// look up canonical name
|
// look up canonical name
|
||||||
|
@ -82,7 +82,7 @@ impl<'self> FontList {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Holds a specific font family, and the various
|
// Holds a specific font family, and the various
|
||||||
pub struct FontFamily<'self> {
|
pub struct FontFamily<'self> {
|
||||||
family_name: ~str,
|
family_name: ~str,
|
||||||
entries: ~[FontEntry],
|
entries: ~[FontEntry],
|
||||||
|
|
|
@ -191,7 +191,7 @@ pub mod longhands {
|
||||||
match component_value {
|
match component_value {
|
||||||
&Ident(ref value) => {
|
&Ident(ref value) => {
|
||||||
// FIXME: Workaround for https://github.com/mozilla/rust/issues/10683
|
// FIXME: Workaround for https://github.com/mozilla/rust/issues/10683
|
||||||
let value_lower = value.to_ascii_lower();
|
let value_lower = value.to_ascii_lower();
|
||||||
match value_lower.as_slice() {
|
match value_lower.as_slice() {
|
||||||
"thin" => Some(specified::Length::from_px(1.)),
|
"thin" => Some(specified::Length::from_px(1.)),
|
||||||
"medium" => Some(specified::Length::from_px(3.)),
|
"medium" => Some(specified::Length::from_px(3.)),
|
||||||
|
@ -236,7 +236,7 @@ pub mod longhands {
|
||||||
|
|
||||||
// TODO: don't parse values we don't support
|
// TODO: don't parse values we don't support
|
||||||
<%self:single_keyword_computed name="display"
|
<%self:single_keyword_computed name="display"
|
||||||
values="inline block inline-block
|
values="inline block inline-block
|
||||||
table inline-table table-row-group table-header-group table-footer-group
|
table inline-table table-row-group table-header-group table-footer-group
|
||||||
table-row table-column-group table-column table-cell table-caption
|
table-row table-column-group table-column table-cell table-caption
|
||||||
list-item
|
list-item
|
||||||
|
@ -346,7 +346,7 @@ pub mod longhands {
|
||||||
match input {
|
match input {
|
||||||
&Ident(ref value) => {
|
&Ident(ref value) => {
|
||||||
// FIXME: Workaround for https://github.com/mozilla/rust/issues/10683
|
// FIXME: Workaround for https://github.com/mozilla/rust/issues/10683
|
||||||
let value_lower = value.to_ascii_lower();
|
let value_lower = value.to_ascii_lower();
|
||||||
match value_lower.as_slice() {
|
match value_lower.as_slice() {
|
||||||
% for keyword in vertical_align_keywords:
|
% for keyword in vertical_align_keywords:
|
||||||
"${keyword}" => Some(Specified_${to_rust_ident(keyword)}),
|
"${keyword}" => Some(Specified_${to_rust_ident(keyword)}),
|
||||||
|
@ -472,7 +472,7 @@ pub mod longhands {
|
||||||
Some(&Ident(ref value)) => {
|
Some(&Ident(ref value)) => {
|
||||||
// FIXME: Workaround for https://github.com/mozilla/rust/issues/10683
|
// FIXME: Workaround for https://github.com/mozilla/rust/issues/10683
|
||||||
let value = value.as_slice();
|
let value = value.as_slice();
|
||||||
let value_lower = value.to_ascii_lower();
|
let value_lower = value.to_ascii_lower();
|
||||||
match value_lower.as_slice() {
|
match value_lower.as_slice() {
|
||||||
// "serif" => add!(Serif),
|
// "serif" => add!(Serif),
|
||||||
// "sans-serif" => add!(SansSerif),
|
// "sans-serif" => add!(SansSerif),
|
||||||
|
@ -523,7 +523,7 @@ pub mod longhands {
|
||||||
match input {
|
match input {
|
||||||
&Ident(ref value) => {
|
&Ident(ref value) => {
|
||||||
// FIXME: Workaround for https://github.com/mozilla/rust/issues/10683
|
// FIXME: Workaround for https://github.com/mozilla/rust/issues/10683
|
||||||
let value_lower = value.to_ascii_lower();
|
let value_lower = value.to_ascii_lower();
|
||||||
match value_lower.as_slice() {
|
match value_lower.as_slice() {
|
||||||
"bold" => Some(SpecifiedWeight700),
|
"bold" => Some(SpecifiedWeight700),
|
||||||
"normal" => Some(SpecifiedWeight400),
|
"normal" => Some(SpecifiedWeight400),
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue