Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 290835 - allow building both canvas and cairo svg, don't

Browse Source 
statically link two copies of cairo code.  r=bsmedberg, a=chofmann


git-svn-id: svn://10.0.0.236/trunk@172612 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
tor%cs.brown.edu
2005-04-22 19:03:41 +00:00
parent 8c450a3ccd
commit 00934ed51d
6 changed files with 21 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/layout/build/nsLayoutModule.cpp
View File

@@ -484,6 +484,9 @@ nsresult NS_NewSVGRendererGDIPlus(nsISVGRenderer** aResult);
#ifdef MOZ_SVG_RENDERER_LIBART
nsresult NS_NewSVGRendererLibart(nsISVGRenderer** aResult);
#endif // MOZ_SVG_RENDERER_LIBART
#ifdef MOZ_SVG_RENDERER_CAIRO
nsresult NS_NewSVGRendererCairo(nsISVGRenderer** aResult);
#endif // MOZ_SVG_RENDERER_CAIRO
#endif
#define MAKE_CTOR(ctor_, iface_, func_) \
@@ -528,6 +531,9 @@ MAKE_CTOR(CreateNewSVGRendererGDIPlus, nsISVGRenderer, NS_NewSVGRendere
#ifdef MOZ_SVG_RENDERER_LIBART
MAKE_CTOR(CreateNewSVGRendererLibart, nsISVGRenderer, NS_NewSVGRendererLibart)
#endif // MOZ_SVG_RENDERER_LIBART
#ifdef MOZ_SVG_RENDERER_CAIRO
MAKE_CTOR(CreateNewSVGRendererCairo, nsISVGRenderer, NS_NewSVGRendererCairo)
#endif // MOZ_SVG_RENDERER_CAIRO
#endif
MAKE_CTOR(CreateCaret, nsICaret, NS_NewCaret)
@@ -829,6 +835,12 @@ static const nsModuleComponentInfo gComponents[] = {
NS_SVG_RENDERER_LIBART_CONTRACTID,
CreateNewSVGRendererLibart },
#endif // MOZ_SVG_RENDERER_LIBART
#ifdef MOZ_SVG_RENDERER_CAIRO
{ "SVG Cairo Renderer",
NS_SVG_RENDERER_CAIRO_CID,
NS_SVG_RENDERER_CAIRO_CONTRACTID,
CreateNewSVGRendererCairo },
#endif // MOZ_SVG_RENDERER_CAIRO
#endif // MOZ_SVG
#ifdef DEBUG