diff --git a/mozilla/gfx/src/mac/Makefile.in b/mozilla/gfx/src/mac/Makefile.in
index c2eb8502d3d..d24f49580bb 100644
--- a/mozilla/gfx/src/mac/Makefile.in
+++ b/mozilla/gfx/src/mac/Makefile.in
@@ -88,6 +88,7 @@ EXPORTS		= \
 		nsIDrawingSurfaceMac.h \
 		nsGfxUtils.h \
 		nsCarbonHelpers.h \
+		nsRegionPool.h \
 		$(NULL)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
diff --git a/mozilla/widget/src/cocoa/nsChildView.mm b/mozilla/widget/src/cocoa/nsChildView.mm
index 0271ec8f109..4ddc8bd713a 100644
--- a/mozilla/widget/src/cocoa/nsChildView.mm
+++ b/mozilla/widget/src/cocoa/nsChildView.mm
@@ -771,9 +771,8 @@ NS_IMETHODIMP nsChildView::SetFont(const nsFont &aFont)
 #ifdef MOZ_CAIRO_GFX
   return NS_ERROR_NOT_IMPLEMENTED;
 #else
-  NS_IF_RELEASE(mFontMetrics);
   if (mContext)
-    mContext->GetMetricsFor(aFont, mFontMetrics);
+    mContext->GetMetricsFor(aFont, *getter_AddRefs(mFontMetrics));
   return NS_OK;
 #endif
 }