From 51be0641ff773e96ea32537bf2f17b27dbe09ae9 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Thu, 2 May 2013 16:45:23 -0700
Subject: [PATCH] Update servo-gfx and submodules for language changes

---
 src/rust-azure                            | 2 +-
 src/rust-core-foundation                  | 2 +-
 src/rust-core-graphics                    | 2 +-
 src/rust-core-text                        | 2 +-
 src/rust-io-surface                       | 2 +-
 src/rust-opengles                         | 2 +-
 src/servo-gfx/platform/macos/font.rs      | 4 ++--
 src/servo-gfx/platform/macos/font_list.rs | 6 +++---
 src/sharegl                               | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/rust-azure b/src/rust-azure
index 985549a76ee..a42dd146fb2 160000
--- a/src/rust-azure
+++ b/src/rust-azure
@@ -1 +1 @@
-Subproject commit 985549a76eeeb5d10aae40812154424629534811
+Subproject commit a42dd146fb22022db61cfc74efec2c5726ba5751
diff --git a/src/rust-core-foundation b/src/rust-core-foundation
index 4d0a8c1ca4d..79afdda83a6 160000
--- a/src/rust-core-foundation
+++ b/src/rust-core-foundation
@@ -1 +1 @@
-Subproject commit 4d0a8c1ca4d1f8b7036e3154a49f4066a3284697
+Subproject commit 79afdda83a62402ceadd9ad9f33b9de24cd674bb
diff --git a/src/rust-core-graphics b/src/rust-core-graphics
index 8082be782bb..557db505525 160000
--- a/src/rust-core-graphics
+++ b/src/rust-core-graphics
@@ -1 +1 @@
-Subproject commit 8082be782bb64468136a3bc024dc8c813246784f
+Subproject commit 557db505525d759e05d342f87195cccfc9aa4d15
diff --git a/src/rust-core-text b/src/rust-core-text
index 5ec7feec636..0f5746163aa 160000
--- a/src/rust-core-text
+++ b/src/rust-core-text
@@ -1 +1 @@
-Subproject commit 5ec7feec6365946ca7a0caf890531400fd64ba56
+Subproject commit 0f5746163aa7bf3098cbd3f66c316344cc1551e2
diff --git a/src/rust-io-surface b/src/rust-io-surface
index fef34b36829..9caf05ac898 160000
--- a/src/rust-io-surface
+++ b/src/rust-io-surface
@@ -1 +1 @@
-Subproject commit fef34b3682991563cab69953f986b3089fab5b8f
+Subproject commit 9caf05ac898bc4f69bf51a7d5c463b0e071231de
diff --git a/src/rust-opengles b/src/rust-opengles
index 8e36a17c0a5..03a995e0399 160000
--- a/src/rust-opengles
+++ b/src/rust-opengles
@@ -1 +1 @@
-Subproject commit 8e36a17c0a555427019be592d0f7c6ce6f2d5b09
+Subproject commit 03a995e039945c74755f841e7a4d70c7962eb8ae
diff --git a/src/servo-gfx/platform/macos/font.rs b/src/servo-gfx/platform/macos/font.rs
index 7f103fea948..213bea408ac 100644
--- 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
index eaff82155f2..cdd4c7baeea 100644
--- 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
index b9434228ce8..81b203a305b 160000
--- a/src/sharegl
+++ b/src/sharegl
@@ -1 +1 @@
-Subproject commit b9434228ce8cf24fe9686e392c9661fc049b5b64
+Subproject commit 81b203a305b3044ee2d3db7fbb9c804521fc330b