From 9971c4d6e008d694f27f46db441b5b41662fe6d4 Mon Sep 17 00:00:00 2001
From: "Brian J. Burg" <burg@cs.washington.edu>
Date: Fri, 19 Oct 2012 12:50:49 -0700
Subject: [PATCH] Add rust-core-graphics submodule; Import CoreGraphics
 bindings from that module, not rust-cocoa.

---
 .gitmodules                                      |  4 +++-
 configure                                        |  2 +-
 mk/sub.mk                                        | 12 ++++++------
 src/rust-azure                                   |  2 +-
 src/rust-cocoa                                   |  2 +-
 src/rust-core-graphics                           |  1 +
 src/rust-layers                                  |  2 +-
 src/servo/text/native_font/quartz_native_font.rs | 13 +++++++------
 8 files changed, 21 insertions(+), 17 deletions(-)
 create mode 160000 src/rust-core-graphics

diff --git a/.gitmodules b/.gitmodules
index 4354efafad7..77447fe4b55 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -58,10 +58,12 @@
 [submodule "src/libcss"]
     path = src/libcss
     url = git://github.com/pcwalton/libcss.git
-
 [submodule "src/rust-netsurfcss"]
 	path = src/rust-netsurfcss
 	url = git://github.com/mozilla-servo/rust-netsurfcss.git
 [submodule "src/rust-wapcaplet"]
 	path = src/rust-wapcaplet
 	url = git://github.com/mozilla-servo/rust-wapcaplet.git
+[submodule "src/rust-core-graphics"]
+	path = src/rust-core-graphics
+	url = git://github.com/mozilla-servo/rust-core-graphics.git
diff --git a/configure b/configure
index 58e9f3794b7..16a54116295 100755
--- a/configure
+++ b/configure
@@ -348,7 +348,7 @@ CFG_SUBMODULES="libwapcaplet rust-wapcaplet rust-harfbuzz rust-opengles rust-azu
 
 if [ $CFG_OSTYPE = "darwin" ]
 then
-CFG_SUBMODULES="rust-cocoa rust-io-surface rust-core-foundation ${CFG_SUBMODULES}"
+CFG_SUBMODULES="rust-cocoa rust-io-surface rust-core-foundation rust-core-graphics ${CFG_SUBMODULES}"
 fi
 
 # needed because Spidermonkey configure is in non-standard location
diff --git a/mk/sub.mk b/mk/sub.mk
index 9bca964952d..447e07defd0 100644
--- a/mk/sub.mk
+++ b/mk/sub.mk
@@ -5,14 +5,14 @@ DEPS_rust-glut += \
 	rust-opengles
 
 DEPS_rust-layers += \
+	rust-azure \
 	rust-geom \
-	rust-opengles \
 	rust-glut \
-	rust-azure
+	rust-opengles
 
 DEPS_sharegl += \
-	rust-opengles \
-	rust-geom
+	rust-geom \
+	rust-opengles
 
 DEPS_servo-sandbox += \
 	libhubbub \
@@ -44,11 +44,11 @@ DEPS_libcss += \
 # Platform-specific dependencies
 ifeq ($(CFG_OSTYPE),darwin)
 DEPS_rust-azure += \
-	rust-cocoa \
+	rust-core-graphics \
 	rust-core-foundation
 
 DEPS_rust-layers += \
-	rust-cocoa
+	rust-core-graphics
 
 DEPS_rust-io-surface += \
 	rust-core-foundation
diff --git a/src/rust-azure b/src/rust-azure
index 008961b96fb..702a173e7b2 160000
--- a/src/rust-azure
+++ b/src/rust-azure
@@ -1 +1 @@
-Subproject commit 008961b96fb3ee009fcbfba43feaefe5f9f8cbf2
+Subproject commit 702a173e7b2f0fa61a47205bd79da30d5522bfa8
diff --git a/src/rust-cocoa b/src/rust-cocoa
index 7dff0d5d6dc..0503ea12c3b 160000
--- a/src/rust-cocoa
+++ b/src/rust-cocoa
@@ -1 +1 @@
-Subproject commit 7dff0d5d6dc40e53989f0db94df74be79bda91c9
+Subproject commit 0503ea12c3bfa33a829b9c9c309fac471663e185
diff --git a/src/rust-core-graphics b/src/rust-core-graphics
new file mode 160000
index 00000000000..6291af5e127
--- /dev/null
+++ b/src/rust-core-graphics
@@ -0,0 +1 @@
+Subproject commit 6291af5e127bcaf527d689e8a93183c3288e1efe
diff --git a/src/rust-layers b/src/rust-layers
index 90a617d9139..b178de413ad 160000
--- a/src/rust-layers
+++ b/src/rust-layers
@@ -1 +1 @@
-Subproject commit 90a617d9139b505b0fb03838a62a41887d658904
+Subproject commit b178de413ad288ba47160a4691cd8a32eddd359c
diff --git a/src/servo/text/native_font/quartz_native_font.rs b/src/servo/text/native_font/quartz_native_font.rs
index 8d9d9773b50..5326d0831d8 100644
--- a/src/servo/text/native_font/quartz_native_font.rs
+++ b/src/servo/text/native_font/quartz_native_font.rs
@@ -1,4 +1,4 @@
-extern mod cocoa;
+extern mod core_graphics;
 
 export QuartzNativeFont, with_test_native_font, create;
 
@@ -8,15 +8,16 @@ use au = gfx::geometry;
 use libc::size_t;
 use ptr::null;
 use glyph::GlyphIndex;
-use cocoa::cg::{
+use cg = core_graphics;
+use cg::data_provider::{
     CGDataProviderRef,
-    CGFontRef
-};
-use cocoa::cg::cg::{
     CGDataProviderCreateWithData,
     CGDataProviderRelease,
+};
+use cg::font::{
+    CGFontRef,
     CGFontCreateWithDataProvider,
-    CGFontRelease
+    CGFontRelease,
 };
 use cast::transmute;
 use coretext::CTFontRef;