From 1c2ae9ef32bb39d38026b4a8b5c662e5d9fb67a8 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Mon, 16 Apr 2012 17:39:40 -0700
Subject: [PATCH] Update to latest rust-azure

---
 src/rust-azure     |  2 +-
 src/servo/servo.rs | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/rust-azure b/src/rust-azure
index e253fe32724..946a5b87359 160000
--- a/src/rust-azure
+++ b/src/rust-azure
@@ -1 +1 @@
-Subproject commit e253fe32724e53ff2b0b0551d8a5e95fdf304e85
+Subproject commit 946a5b87359a934da8a6c2053494c8c10beddef6
diff --git a/src/servo/servo.rs b/src/servo/servo.rs
index 9f218e5be54..bc504a5530e 100644
--- a/src/servo/servo.rs
+++ b/src/servo/servo.rs
@@ -46,28 +46,28 @@ fn main() {
             )
         };
         assert !cairo_surf.is_null();
-        let azure_target = CreateDrawTargetForCairoSurface(cairo_surf);
+        let azure_target = AzCreateDrawTargetForCairoSurface(cairo_surf);
         assert !azure_target.is_null();
 
         loop {
             let color = {
-                r: 1f as azure::Float,
-                g: 1f as azure::Float,
-                b: 1f as azure::Float,
-                a: 0.5f as azure::Float
+                r: 1f as azure::AzFloat,
+                g: 1f as azure::AzFloat,
+                b: 1f as azure::AzFloat,
+                a: 0.5f as azure::AzFloat
             };
-            let pattern = CreateColorPattern(ptr::addr_of(color));
+            let pattern = AzCreateColorPattern(ptr::addr_of(color));
             let rect = {
-                x: 100f as azure::Float,
-                y: 100f as azure::Float,
-                width: 100f as azure::Float,
-                height: 100f as azure::Float
+                x: 100f as azure::AzFloat,
+                y: 100f as azure::AzFloat,
+                width: 100f as azure::AzFloat,
+                height: 100f as azure::AzFloat
             };
-            DrawTargetFillRect(
+            AzDrawTargetFillRect(
                 azure_target,
                 ptr::addr_of(rect),
                 unsafe { unsafe::reinterpret_cast(pattern) });
-            ReleaseColorPattern(pattern);
+            AzReleaseColorPattern(pattern);
 
             sdl::video::unlock_surface(sdl_surf);
             sdl::video::blit_surface(sdl_surf, ptr::null(),
@@ -83,7 +83,7 @@ fn main() {
             }
             if mustbreak { break }
         }
-        ReleaseDrawTarget(azure_target);
+        AzReleaseDrawTarget(azure_target);
         cairo_surface_destroy(cairo_surf);
         sdl::video::unlock_surface(sdl_surf);
         sdl::quit();