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
This commit is contained in:
parent
6fab61d6b2
commit
dfd5f805d8
@ -88,6 +88,7 @@ EXPORTS = \
|
|||||||
nsIDrawingSurfaceMac.h \
|
nsIDrawingSurfaceMac.h \
|
||||||
nsGfxUtils.h \
|
nsGfxUtils.h \
|
||||||
nsCarbonHelpers.h \
|
nsCarbonHelpers.h \
|
||||||
|
nsRegionPool.h \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
||||||
|
|||||||
@ -771,9 +771,8 @@ NS_IMETHODIMP nsChildView::SetFont(const nsFont &aFont)
|
|||||||
#ifdef MOZ_CAIRO_GFX
|
#ifdef MOZ_CAIRO_GFX
|
||||||
return NS_ERROR_NOT_IMPLEMENTED;
|
return NS_ERROR_NOT_IMPLEMENTED;
|
||||||
#else
|
#else
|
||||||
NS_IF_RELEASE(mFontMetrics);
|
|
||||||
if (mContext)
|
if (mContext)
|
||||||
mContext->GetMetricsFor(aFont, mFontMetrics);
|
mContext->GetMetricsFor(aFont, *getter_AddRefs(mFontMetrics));
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user