From dfd5f805d89b0a3f977c467dbc1da809e83fdfd9 Mon Sep 17 00:00:00 2001
From: "mark%moxienet.com"
 <mark%moxienet.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 18 Mar 2006 06:11:48 +0000
Subject: [PATCH] Apply firehose to cairo-less cocoa widget builds aka bustage
 fix for Camino

git-svn-id: svn://10.0.0.236/trunk@192577 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/gfx/src/mac/Makefile.in         | 1 +
 mozilla/widget/src/cocoa/nsChildView.mm | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

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
 }