Update servo-gfx and submodules for language changes

servo · metajack · May 3, 2013 · May 2, 2013 · May 3, 2013 · May 3, 2013
commit 51be0641ff773e96ea32537bf2f17b27dbe09ae9
diff --git a/src/rust-azure b/src/rust-azure
diff --git a/src/rust-core-foundation b/src/rust-core-foundation
diff --git a/src/rust-core-graphics b/src/rust-core-graphics
diff --git a/src/rust-core-text b/src/rust-core-text
diff --git a/src/rust-io-surface b/src/rust-io-surface
diff --git a/src/rust-opengles b/src/rust-opengles
diff --git a/src/servo-gfx/platform/macos/font.rs b/src/servo-gfx/platform/macos/font.rs
@@ -64,10 +64,10 @@ pub impl FontHandle {
 
     fn get_CGFont(&mut self) -> CGFont {
         match self.cgfont {
-            Some(ref font) => CFWrapper::wrap_shared(*(font.borrow_ref())),
+            Some(ref font) => font.clone(),
             None => {
                 let cgfont = self.ctfont.copy_to_CGFont();
-                self.cgfont = Some(CFWrapper::clone(&cgfont));
+                self.cgfont = Some(cgfont.clone());
                 cgfont
             }
         }

diff --git a/src/servo-gfx/platform/macos/font_list.rs b/src/servo-gfx/platform/macos/font_list.rs
@@ -30,9 +30,9 @@ pub impl FontListHandle {
 
     fn get_available_families(&self) -> FontFamilyMap {
         let family_names: CFArray<CFStringRef> = core_text::font_collection::get_family_names();
-        let mut family_map : FontFamilyMap = HashMap::new();
+        let mut family_map: FontFamilyMap = HashMap::new();
         for family_names.each |&strref: &CFStringRef| {
-            let family_name = CFString::wrap_extern(strref).to_str();
+            let family_name = CFString::wrap_shared(strref).to_str();
             debug!("Creating new FontFamily for family: %s", family_name);
 
             let new_family = @mut FontFamily::new(family_name);
@@ -42,7 +42,7 @@ pub impl FontListHandle {
     }
 
     fn load_variations_for_family(&self, family: @mut FontFamily) {
-        let fam : &mut FontFamily = family; // FIXME: borrow checker workaround
+        let fam: &mut FontFamily = family; // FIXME: borrow checker workaround
         let family_name = &fam.family_name;
         debug!("Looking for faces of family: %s", *family_name);
 

diff --git a/src/sharegl b/src/sharegl