Auto merge of #5 - lsalzman:font-face-simulations, r=glennw

add create_font_face_with_simulations to FontFace

This is needed to be able to support synthetic bold on an arbitrary font face in WebRender, without which we can't properly support bold for many bitmapped Asian fonts.

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.4.0"
+version = "0.4.1"
 authors = ["Vladimir Vukicevic <[email protected]>"]
 
 [lib]

src/font_face.rs

@@ -8,7 +8,7 @@ use std::cell::UnsafeCell;
 use std::mem::zeroed;
 
 use comptr::ComPtr;
-use super::{FontMetrics, FontFile, DefaultDWriteRenderParams};
+use super::{FontMetrics, FontFile, DefaultDWriteRenderParams, DWriteFactory};
 
 use winapi;
 
@@ -35,18 +35,44 @@ impl FontFace {
         (*self.native.get()).as_ptr()
     }
 
+    unsafe fn get_raw_files(&self) -> Vec<*mut winapi::IDWriteFontFile> {
+        let mut number_of_files: u32 = 0;
+        let hr = (*self.native.get()).GetFiles(&mut number_of_files, ptr::null_mut());
+        assert!(hr == 0);
+
+        let mut file_ptrs: Vec<*mut winapi::IDWriteFontFile> =
+            vec![ptr::null_mut(); number_of_files as usize];
+        let hr = (*self.native.get()).GetFiles(&mut number_of_files, file_ptrs.as_mut_ptr());
+        assert!(hr == 0);
+        file_ptrs
+    }
+
     pub fn get_files(&self) -> Vec<FontFile> {
         unsafe {
-            let mut number_of_files: u32 = 0;
-            let hr = (*self.native.get()).GetFiles(&mut number_of_files, ptr::null_mut());
-            assert!(hr == 0);
+            let file_ptrs = self.get_raw_files();
+            file_ptrs.iter().map(|p| FontFile::take(ComPtr::already_addrefed(*p))).collect()
+        }
+    }
 
-            let mut file_ptrs: Vec<*mut winapi::IDWriteFontFile> =
-                vec![ptr::null_mut(); number_of_files as usize];
-            let hr = (*self.native.get()).GetFiles(&mut number_of_files, file_ptrs.as_mut_ptr());
+    pub fn create_font_face_with_simulations(&self, simulations: winapi::DWRITE_FONT_SIMULATIONS) -> FontFace {
+        unsafe {
+            let file_ptrs = self.get_raw_files();
+            let face_type = (*self.native.get()).GetType();
+            let face_index = (*self.native.get()).GetIndex();
+            let mut face: ComPtr<winapi::IDWriteFontFace> = ComPtr::new();
+            let hr = (*DWriteFactory()).CreateFontFace(
+                face_type,
+                file_ptrs.len() as u32,
+                file_ptrs.as_ptr(),
+                face_index,
+                simulations,
+                face.getter_addrefs()
+            );
+            for p in file_ptrs {
+                let _ = ComPtr::<winapi::IDWriteFontFile>::already_addrefed(p);
+            }
             assert!(hr == 0);
-
-            file_ptrs.iter().map(|p| FontFile::take(ComPtr::already_addrefed(*p))).collect()
+            FontFace::take(face)
         }
     }
 

src/lib.rs

@@ -57,6 +57,7 @@ pub use winapi::{DWRITE_FONT_SIMULATIONS_NONE,
                  DWRITE_FONT_SIMULATIONS_BOLD,
                  DWRITE_FONT_SIMULATIONS_OBLIQUE};
 pub use winapi::{DWRITE_TEXTURE_ALIASED_1x1, DWRITE_TEXTURE_CLEARTYPE_3x1};
+pub use winapi::{DWRITE_FONT_SIMULATIONS};
 pub use winapi::{DWRITE_RENDERING_MODE};
 pub use winapi::{DWRITE_MEASURING_MODE};
 pub use winapi::{DWRITE_TEXTURE_TYPE};