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

Fix parsing invalid url, clean up font template matching.

Browse source
This commit is contained in:
Glenn Watson 2014-07-28 11:41:16 +10:00
parent a500099df6
commit a37b5cb326
2 changed files with 22 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/components/gfx/font_template.rs
View file

@ -97,34 +97,31 @@ impl FontTemplate {
}
},
None => {
match self.is_valid {
true => {
let data = self.get_data();
let handle: Result<FontHandle, ()> = FontHandleMethods::new_from_template(fctx, data.clone(), None);
match handle {
Ok(handle) => {
let actual_desc = FontTemplateDescriptor::new(handle.boldness(),
handle.is_italic());
let desc_match = actual_desc == *requested_desc;
if self.is_valid {
let data = self.get_data();
let handle: Result<FontHandle, ()> = FontHandleMethods::new_from_template(fctx, data.clone(), None);
match handle {
Ok(handle) => {
let actual_desc = FontTemplateDescriptor::new(handle.boldness(),
handle.is_italic());
let desc_match = actual_desc == *requested_desc;
self.descriptor = Some(actual_desc);
self.is_valid = true;
if desc_match {
Some(data)
} else {
None
}
}
Err(()) => {
self.is_valid = false;
debug!("Unable to create a font from template {}", self.identifier);
self.descriptor = Some(actual_desc);
self.is_valid = true;
if desc_match {
Some(data)
} else {
None
}
}
},
false => {
None
Err(()) => {
self.is_valid = false;
debug!("Unable to create a font from template {}", self.identifier);
None
}
}
} else {
None
}
}
}

4
src/components/style/font_face.rs
View file

@ -79,8 +79,8 @@ pub fn parse_font_face_rule(rule: AtRule, parent_rules: &mut Vec<CSSRule>, base_
// url() or local() should be next
let maybe_url = match iter.next() {
Some(&URL(ref string_value)) => {
// FIXME: handle URL parse errors more gracefully.
let url = UrlParser::new().base_url(base_url).parse(string_value.as_slice()).unwrap();
let maybe_url = UrlParser::new().base_url(base_url).parse(string_value.as_slice());
let url = maybe_url.unwrap_or_else(|_| Url::parse("about:invalid").unwrap());
Some(url)
},
Some(&Function(ref string_value, ref _values)) => {