diff options
author | Emilio Cobos Álvarez <ecoal95@gmail.com> | 2016-11-16 11:57:39 +0100 |
---|---|---|
committer | Emilio Cobos Álvarez <ecoal95@gmail.com> | 2016-11-17 18:34:23 +0100 |
commit | 913c874cb55fd0fdc9e8f3a4c34624cd015fac8a (patch) | |
tree | 4526ecefafe0cde2f56cb1e2a4ebffd372e1f70a /components/gfx/platform/macos/font_template.rs | |
parent | f14e7339b5ff95fce0127dce4fe87ce082ab7259 (diff) | |
download | servo-913c874cb55fd0fdc9e8f3a4c34624cd015fac8a.tar.gz servo-913c874cb55fd0fdc9e8f3a4c34624cd015fac8a.zip |
Urlmageddon: Use refcounted urls more often.
Diffstat (limited to 'components/gfx/platform/macos/font_template.rs')
-rw-r--r-- | components/gfx/platform/macos/font_template.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/gfx/platform/macos/font_template.rs b/components/gfx/platform/macos/font_template.rs index 955c5b4df2d..a98f60a95b2 100644 --- a/components/gfx/platform/macos/font_template.rs +++ b/components/gfx/platform/macos/font_template.rs @@ -10,13 +10,13 @@ use core_text::font::CTFont; use serde::{Deserialize, Deserializer, Serialize, Serializer}; use serde::de::{Error, Visitor}; use servo_atoms::Atom; +use servo_url::ServoUrl; use std::borrow::ToOwned; use std::collections::HashMap; use std::fs::File; use std::io::{Read, Error as IoError}; use std::ops::Deref; use std::sync::Mutex; -use url::Url; /// Platform specific font representation for mac. /// The identifier is a PostScript font name. The @@ -86,13 +86,13 @@ impl FontTemplateData { None => {} } - let path = Url::parse(&*self.ctfont(0.0) + let path = ServoUrl::parse(&*self.ctfont(0.0) .expect("No Core Text font available!") .url() .expect("No URL for Core Text font!") .get_string() .to_string()).expect("Couldn't parse Core Text font URL!") - .to_file_path() + .as_url().unwrap().to_file_path() .expect("Core Text font didn't name a path!"); let mut bytes = Vec::new(); File::open(path).expect("Couldn't open font file!").read_to_end(&mut bytes).unwrap(); |