separate generate_font_key from add_raw_font/add_native_font to allow…

… for custom font key generation

sample/src/main.rs

@@ -194,8 +194,9 @@ fn main() {
 
 
     if false { // draw text?
+        let font_key = api.generate_font_key();
         let font_bytes = load_file("res/FreeSans.ttf");
-        let font_key = api.add_raw_font(font_bytes);
+        api.add_raw_font(font_key, font_bytes);
 
         let text_bounds = LayoutRect::new(LayoutPoint::new(100.0, 200.0), LayoutSize::new(700.0, 300.0));
 

webrender_traits/src/api.rs

@@ -54,20 +54,19 @@ impl RenderApi {
         RenderApiSender::new(self.api_sender.clone(), self.payload_sender.clone())
     }
 
-    pub fn add_raw_font(&self, bytes: Vec<u8>) -> FontKey {
+    pub fn generate_font_key(&self) -> FontKey {
         let new_id = self.next_unique_id();
-        let key = FontKey::new(new_id.0, new_id.1);
+        FontKey::new(new_id.0, new_id.1)
+    }
+
+    pub fn add_raw_font(&self, key: FontKey, bytes: Vec<u8>) {
         let msg = ApiMsg::AddRawFont(key, bytes);
         self.api_sender.send(msg).unwrap();
-        key
     }
 
-    pub fn add_native_font(&self, native_font_handle: NativeFontHandle) -> FontKey {
-        let new_id = self.next_unique_id();
-        let key = FontKey::new(new_id.0, new_id.1);
+    pub fn add_native_font(&self, key: FontKey, native_font_handle: NativeFontHandle) {
         let msg = ApiMsg::AddNativeFont(key, native_font_handle);
         self.api_sender.send(msg).unwrap();
-        key
     }
 
     /// Gets the dimensions for the supplied glyph keys

wrench/src/wrench.rs

@@ -235,7 +235,9 @@ impl Wrench {
 
     #[cfg(target_os = "windows")]
     pub fn font_key_from_native_handle(&mut self, descriptor: &NativeFontHandle) -> FontKey {
-        self.api.add_native_font(descriptor.clone())
+        let key = self.api.generate_font_key();
+        self.api.add_native_font(key, descriptor.clone());
+        key
     }
 
     #[cfg(target_os = "windows")]
@@ -246,8 +248,7 @@ impl Wrench {
                                                   dwrote::FontStretch::Normal,
                                                   dwrote::FontStyle::Normal);
         let descriptor = font.to_descriptor();
-        let key = self.api.add_native_font(descriptor.clone());
-        (key, Some(descriptor))
+        (self.font_key_from_native_handle(&descriptor), Some(descriptor))
     }
 
     #[cfg(target_os = "windows")]
@@ -281,7 +282,8 @@ impl Wrench {
     }
 
     pub fn font_key_from_bytes(&mut self, bytes: Vec<u8>) -> (FontKey, Option<NativeFontHandle>) {
-        let key = self.api.add_raw_font(bytes);
+        let key = self.api.generate_font_key();
+        self.api.add_raw_font(key, bytes);
         (key, None)
     }