diff --git a/mozilla/gfx/cairo/cairo/src/cairo-quartz2-surface.c b/mozilla/gfx/cairo/cairo/src/cairo-quartz2-surface.c
index b5959550b62..e8f4d6b8d1f 100644
--- a/mozilla/gfx/cairo/cairo/src/cairo-quartz2-surface.c
+++ b/mozilla/gfx/cairo/cairo/src/cairo-quartz2-surface.c
@@ -80,7 +80,7 @@ typedef struct cairo_quartzgl_surface {
     AGLContext aglContext;
     CGContextRef cgContext;
 
-    cairo_rectangle_fixed_t extents;
+    cairo_rectangle_int16_t extents;
 
     /* These are stored while drawing operations are in place, set up
      * by quartzgl_setup_source() and quartzgl_finish_source()
@@ -438,7 +438,7 @@ SurfacePatternDrawFunc (void *info, CGContextRef context)
 {
     cairo_surface_pattern_t *spat = (cairo_surface_pattern_t *) info;
     cairo_surface_t *pat_surf = spat->surface;
-    cairo_rectangle_fixed_t extents;
+    cairo_rectangle_int16_t extents;
     cairo_status_t status;
 
     cairo_quartzgl_surface_t *quartz_surf = NULL;
@@ -455,7 +455,7 @@ SurfacePatternDrawFunc (void *info, CGContextRef context)
 
 	cairo_surface_t *dummy = cairo_quartzgl_surface_create (CAIRO_FORMAT_ARGB32, 1, 1, TRUE);
 
-	cairo_rectangle_fixed_t rect;
+	cairo_rectangle_int16_t rect;
 	_cairo_surface_get_extents (pat_surf, &rect);
 
 	cairo_surface_t *new_surf = NULL;
@@ -506,7 +506,7 @@ _cairo_quartzgl_cairo_repeating_surface_pattern_to_quartz (cairo_quartzgl_surfac
 {
     cairo_surface_pattern_t *spat;
     cairo_surface_t *pat_surf;
-    cairo_rectangle_fixed_t extents;
+    cairo_rectangle_int16_t extents;
 
     CGRect pbounds;
     CGAffineTransform ptransform, stransform;
@@ -843,9 +843,9 @@ _cairo_quartzgl_surface_acquire_source_image (void *abstract_surface,
 
 static cairo_status_t
 _cairo_quartzgl_surface_acquire_dest_image (void *abstract_surface,
-					    cairo_rectangle_fixed_t *interest_rect,
+					    cairo_rectangle_int16_t *interest_rect,
 					    cairo_image_surface_t **image_out,
-					    cairo_rectangle_fixed_t *image_rect,
+					    cairo_rectangle_int16_t *image_rect,
 					    void **image_extra)
 {
     cairo_quartzgl_surface_t *surface = (cairo_quartzgl_surface_t *) abstract_surface;
@@ -867,9 +867,9 @@ _cairo_quartzgl_surface_acquire_dest_image (void *abstract_surface,
 
 static void
 _cairo_quartzgl_surface_release_dest_image (void *abstract_surface,
-					    cairo_rectangle_fixed_t *interest_rect,
+					    cairo_rectangle_int16_t *interest_rect,
 					    cairo_image_surface_t *image,
-					    cairo_rectangle_fixed_t *image_rect,
+					    cairo_rectangle_int16_t *image_rect,
 					    void *image_extra)
 {
     cairo_quartzgl_surface_t *surface = (cairo_quartzgl_surface_t *) abstract_surface;
@@ -1041,7 +1041,7 @@ _cairo_quartzgl_surface_clone_similar (void *abstract_surface,
 
 static cairo_int_status_t
 _cairo_quartzgl_surface_get_extents (void *abstract_surface,
-				     cairo_rectangle_fixed_t *extents)
+				     cairo_rectangle_int16_t *extents)
 {
     cairo_quartzgl_surface_t *surface = (cairo_quartzgl_surface_t *) abstract_surface;
 
diff --git a/mozilla/gfx/cairo/cairo/src/cairo.h b/mozilla/gfx/cairo/cairo/src/cairo.h
index 575e58dbf72..0a7ee2c6433 100644
--- a/mozilla/gfx/cairo/cairo/src/cairo.h
+++ b/mozilla/gfx/cairo/cairo/src/cairo.h
@@ -1281,7 +1281,8 @@ typedef enum _cairo_surface_type {
     CAIRO_SURFACE_TYPE_WIN32,
     CAIRO_SURFACE_TYPE_BEOS,
     CAIRO_SURFACE_TYPE_DIRECTFB,
-    CAIRO_SURFACE_TYPE_SVG
+    CAIRO_SURFACE_TYPE_SVG,
+    CAIRO_SURFACE_TYPE_QUARTZ2
 } cairo_surface_type_t;
 
 cairo_public cairo_surface_type_t
diff --git a/mozilla/gfx/src/thebes/nsThebesRenderingContext.cpp b/mozilla/gfx/src/thebes/nsThebesRenderingContext.cpp
index 4375b30c36f..2e040cceda9 100644
--- a/mozilla/gfx/src/thebes/nsThebesRenderingContext.cpp
+++ b/mozilla/gfx/src/thebes/nsThebesRenderingContext.cpp
@@ -1223,7 +1223,7 @@ nsThebesRenderingContext::GetTextDimensionsInternal(const PRUnichar* aString,
   return GetWidth(aString, aLength, aDimensions.width, aFontID);
 }
 
-#if defined(_WIN32) || defined(XP_OS2) || defined(MOZ_X11) || defined(XP_BEOS)
+#if defined(_WIN32) || defined(XP_OS2) || defined(MOZ_X11) || defined(XP_BEOS) || defined(XP_MACOSX)
 NS_IMETHODIMP
 nsThebesRenderingContext::GetTextDimensionsInternal(const char*       aString,
                                                     PRInt32           aLength,