Merge pull request servo#11 from pcwalton/webrender

Support native fonts again post-e10s.

components/gfx/Cargo.toml

@@ -72,7 +72,7 @@ git = "https://github.com/servo/ipc-channel"
 git = "https://github.com/glennw/webrender_traits"
 
 [target.x86_64-apple-darwin.dependencies]
-core-foundation = "0.1"
+core-foundation = "0.2"
 core-graphics = "0.1"
 
 [target.i686-unknown-linux-gnu.dependencies.fontconfig]

components/gfx/font_cache_task.rs

@@ -264,8 +264,11 @@ impl FontCache {
  occupied.into_mut()
  }
  Entry::Vacant(vacant) => {
- let bytes = template.bytes();
- let font_key = webrender_api.add_raw_font(bytes);
+ let font_key = match (template.bytes_if_in_memory(), template.native_font()) {
+ (Some(bytes), _) => webrender_api.add_raw_font(bytes),
+ (None, Some(native_font)) => webrender_api.add_native_font(native_font),
+ (None, None) => webrender_api.add_raw_font(template.bytes().clone()),
+ };
  vacant.insert(font_key)
  }
  };

components/gfx/platform/freetype/font_template.rs

@@ -5,6 +5,7 @@
 use std::fs::File;
 use std::io::Read;
 use string_cache::Atom;
+use webrender_traits::NativeFontHandle;
 
 /// Platform specific font representation for Linux.
 /// The identifier is an absolute path, and the bytes
@@ -42,4 +43,15 @@ impl FontTemplateData {
  pub fn bytes(&self) -> Vec<u8> {
  self.bytes.clone()
  }
+
+ /// Returns a clone of the bytes in this font if they are in memory. This function never
+ /// performs disk I/O.
+ pub fn bytes_if_in_memory(&self) -> Option<Vec<u8>> {
+ Some(self.bytes())
+ }
+
+ /// Returns the native font that underlies this font template, if applicable.
+ pub fn native_font(&self) -> Option<NativeFontHandle> {
+ None
+ }
 }

components/gfx/platform/macos/font_template.rs

@@ -69,23 +69,33 @@ impl FontTemplateData {
  /// Returns a clone of the data in this font. This is a hugely expensive operation which
  /// performs synchronous disk I/O and should never be done lightly.
  pub fn bytes(&self) -> Vec<u8> {
- match self.font_data {
- Some(ref font_data) => font_data.clone(),
- None => {
- let path =
- Url::parse(&*self.ctfont()
- .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()
- .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();
- bytes
- }
+ match self.bytes_if_in_memory() {
+ Some(font_data) => return font_data,
+ None => {}
  }
+
+ let path = Url::parse(&*self.ctfont()
+ .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()
+ .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();
+ bytes
+ }
+
+ /// Returns a clone of the bytes in this font if they are in memory. This function never
+ /// performs disk I/O.
+ pub fn bytes_if_in_memory(&self) -> Option<Vec<u8>> {
+ self.font_data.clone()
+ }
+
+ /// Returns the native font that underlies this font template, if applicable.
+ pub fn native_font(&self) -> Option<CGFont> {
+ self.ctfont().map(|ctfont| ctfont.copy_to_CGFont())
  }
 }
 

components/msg/Cargo.toml

@@ -48,7 +48,7 @@ serde_macros = "0.6"
 url = "0.5"
 
 [target.x86_64-apple-darwin.dependencies]
-core-foundation = "0.1"
+core-foundation = "0.2"
 
 [target.x86_64-apple-darwin.dependencies.io-surface]
 git = "https://github.com/servo/io-surface-rs"

ports/cef/Cargo.toml

@@ -68,7 +68,7 @@ git = "https://github.com/servo/rust-stb-image"
 [target.x86_64-apple-darwin.dependencies]
 objc = "0.1"
 cocoa = "0.1"
-core-foundation = "0.1"
+core-foundation = "0.2"
 core-graphics = "0.1"
 cgl = "0.1"
 

ports/glutin/window.rs

@@ -18,7 +18,6 @@ use glutin;
 use glutin::{Api, ElementState, Event, GlRequest, MouseButton, VirtualKeyCode, MouseScrollDelta};
 use layers::geometry::DevicePixel;
 use layers::platform::surface::NativeDisplay;
-use libc::c_void;
 #[cfg(feature = "window")]
 use msg::constellation_msg::{KeyState, NONE, CONTROL, SHIFT, ALT, SUPER};
 use msg::constellation_msg::{self, Key};
@@ -158,7 +157,7 @@ impl Window {
 
  #[cfg(not(target_os = "android"))]
  fn load_gl_functions(window: &glutin::Window) {
- gl::load_with(|s| window.get_proc_address(s) as *const c_void);
+ gl::load_with(|s| window.get_proc_address(s) as *const _);
  }
 
  #[cfg(target_os = "android")]