Auto merge of #30 - lsalzman:new-from-path-analysis, r=jrmuizel

make FontFile::new_from_path analyze the font

This is necessary to resolve Firefox bug https://bugzilla.mozilla.org/show_bug.cgi?id=1455848

We need to switch over to using paths instead of descriptors, but FontFile::new_from_path does not call analyze() such that create_face() will always fail. This fixes that.

Author: bors-servo

Cargo.toml

@@ -3,7 +3,7 @@ name = "dwrote"
 description = "Lightweight binding to DirectWrite."
 repository = "https://github.com/servo/dwrote-rs"
 license = "MPL-2.0"
-version = "0.7.0"
+version = "0.8.0"
 authors = ["Vladimir Vukicevic <vladimir@pobox.com>"]
 
 [lib]

src/font_file.rs

@@ -21,6 +21,7 @@ use winapi::um::dwrite::{IDWriteFontFace, IDWriteFontFile, IDWriteFontFileStream
 use winapi::um::dwrite::{IDWriteFontFileLoader, IDWriteLocalFontFileLoader};
 use winapi::um::dwrite::{DWRITE_FONT_SIMULATIONS, DWRITE_FONT_FACE_TYPE_UNKNOWN};
 use winapi::um::dwrite::{DWRITE_FONT_FACE_TYPE, DWRITE_FONT_FILE_TYPE_UNKNOWN};
+use winapi::um::winnt::HRESULT;
 
 use font_file_loader_impl::DataFontHelper;
 use font_face::FontFace;
@@ -47,12 +48,18 @@ impl FontFile {
                 return None
             }
 
-            Some(FontFile {
+            let mut ff = FontFile {
                 native: UnsafeCell::new(font_file),
                 stream: UnsafeCell::new(None),
                 data_key: 0,
                 face_type: DWRITE_FONT_FACE_TYPE_UNKNOWN,
-            })
+            };
+
+            if ff.analyze() == 0 {
+                None
+            } else {
+                Some(ff)
+            }
         }
     }
 
@@ -204,14 +211,20 @@ impl FontFile {
         }
     }
 
-    pub fn create_face(&self, face_index: u32, simulations: DWRITE_FONT_SIMULATIONS) -> FontFace {
+    pub fn create_face(&self,
+                       face_index: u32,
+                       simulations: DWRITE_FONT_SIMULATIONS,
+    ) -> Result<FontFace, HRESULT> {
         unsafe {
             let mut face: ComPtr<IDWriteFontFace> = ComPtr::new();
             let ptr = self.as_com_ptr();
             let hr = (*DWriteFactory()).CreateFontFace(self.face_type, 1, &ptr.as_ptr(),
                                                        face_index, simulations, face.getter_addrefs());
-            assert!(hr == 0);
-            FontFace::take(face)
+            if hr != 0 {
+                Err(hr)
+            } else {
+                Ok(FontFace::take(face))
+            }
         }
     }
 }