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

Bug 350059 Allow cairo.h usage in nsSVGUtils.h. r+sr=roc

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@209713 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
tor%cs.brown.edu
2006-09-11 15:26:19 +00:00
parent 051c563081
commit 90cb31affc
17 changed files with 53 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/layout/base/nsCSSFrameConstructor.cpp
View File

@@ -173,8 +173,9 @@ NS_NewHTMLCanvasFrame (nsIPresShell* aPresShell, nsStyleContext* aContext);
#include "nsSVGAtoms.h"
#include "nsISVGTextContentMetrics.h"
#include "nsStyleUtil.h"
#include "nsSVGUtils.h"
PRBool
NS_SVGEnabled();
nsIFrame*
NS_NewSVGOuterSVGFrame(nsIPresShell* aPresShell, nsIContent* aContent, nsStyleContext* aContext);
nsIFrame*
@@ -3522,8 +3523,7 @@ IsSpecialContent(nsIContent* aContent,
PR_FALSE;
#ifdef MOZ_SVG
if (aNameSpaceID == kNameSpaceID_SVG &&
nsSVGUtils::SVGEnabled()) {
if (aNameSpaceID == kNameSpaceID_SVG && NS_SVGEnabled()) {
// All SVG content is special...
return PR_TRUE;
}
@@ -4616,8 +4616,7 @@ nsCSSFrameConstructor::ConstructDocElementFrame(nsFrameConstructorState& aState,
else
#endif
#ifdef MOZ_SVG
if (aDocElement->GetNameSpaceID() == kNameSpaceID_SVG &&
nsSVGUtils::SVGEnabled()) {
if (aDocElement->GetNameSpaceID() == kNameSpaceID_SVG && NS_SVGEnabled()) {
contentFrame = NS_NewSVGOuterSVGFrame(mPresShell, aDocElement, styleContext);
}
else
@@ -8138,7 +8137,7 @@ nsCSSFrameConstructor::ConstructFrameInternal( nsFrameConstructorState& aState,
if (NS_SUCCEEDED(rv) &&
(!frameItems->childList || lastChild == frameItems->lastChild) &&
aNameSpaceID == kNameSpaceID_SVG &&
nsSVGUtils::SVGEnabled()) {
NS_SVGEnabled()) {
PRBool haltProcessing;
rv = ConstructSVGFrame(aState, aContent, adjParentFrame, aTag,
aNameSpaceID, styleContext,