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

@@ -88,6 +88,7 @@ EXPORTS		= \
 		nsIDrawingSurfaceMac.h \
 		nsGfxUtils.h \
 		nsCarbonHelpers.h \
+		nsRegionPool.h \
 		$(NULL)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))

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
 }