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

Fixing bug 328571. Change the type of PRBool SVG classes members to PRPackedBool. r+sr=roc@ocallahan.org

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@191478 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jwatt%jwatt.org
2006-03-01 10:59:36 +00:00
parent 320aaecbd8
commit 4624a80f67
15 changed files with 46 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/content/svg/content/src/nsSVGPathSeg.cpp
View File

@@ -1219,7 +1219,8 @@ public:
protected:
float mX, mY, mR1, mR2, mAngle;
PRBool mLargeArcFlag, mSweepFlag;
PRPackedBool mLargeArcFlag;
PRPackedBool mSweepFlag;
};
//----------------------------------------------------------------------

2
mozilla/content/svg/content/src/nsSVGRect.cpp
View File

@@ -266,9 +266,9 @@ public:
private:
void MarkSet();
PRBool mIsSet;
nsCOMPtr<nsIDOMSVGLength> mViewportWidth;
nsCOMPtr<nsIDOMSVGLength> mViewportHeight;
PRPackedBool mIsSet;
};
//----------------------------------------------------------------------

5
mozilla/content/svg/content/src/nsSVGSVGElement.cpp
View File

@@ -147,9 +147,8 @@ protected:
float mPreviousTranslate_x;
float mPreviousTranslate_y;
float mPreviousScale;
PRBool mDispatchEvent;
PRInt32 mRedrawSuspendCount;
PRInt32 mRedrawSuspendCount;
PRPackedBool mDispatchEvent;
};

2
mozilla/content/svg/content/src/nsSVGStringProxyValue.cpp
View File

@@ -87,7 +87,7 @@ public:
protected:
nsString mCachedValue;
nsCOMPtr<nsISVGValue> mProxiedValue;
PRBool mUseCachedValue;
PRPackedBool mUseCachedValue;
};
//----------------------------------------------------------------------

5
mozilla/layout/svg/base/src/nsSVGForeignObjectFrame.h
View File

@@ -161,17 +161,18 @@ protected:
already_AddRefed<nsIDOMSVGMatrix> GetTMIncludingOffset();
nsresult TransformPointFromOuterPx(float aX, float aY, nsPoint* aOut);
PRBool mIsDirty;
nsCOMPtr<nsIDOMSVGLength> mX;
nsCOMPtr<nsIDOMSVGLength> mY;
nsCOMPtr<nsIDOMSVGLength> mWidth;
nsCOMPtr<nsIDOMSVGLength> mHeight;
nsCOMPtr<nsIDOMSVGMatrix> mCanvasTM;
PRBool mPropagateTransform;
nsCOMPtr<nsIDOMSVGMatrix> mOverrideCTM;
nsCOMPtr<nsISVGRendererRegion> mFilterRegion;
nsISVGFilterFrame *mFilter;
PRPackedBool mPropagateTransform;
PRPackedBool mIsDirty;
};
#endif

2
mozilla/layout/svg/base/src/nsSVGGFrame.h
View File

@@ -99,7 +99,7 @@ protected:
nsCOMPtr<nsISVGRendererRegion> mFilterRegion;
nsISVGFilterFrame *mFilter;
PRBool mPropagateTransform;
PRPackedBool mPropagateTransform;
};
#endif

2
mozilla/layout/svg/base/src/nsSVGGlyphFrame.cpp
View File

@@ -199,12 +199,12 @@ protected:
PRUint32 mGeometryUpdateFlags;
PRUint32 mMetricsUpdateFlags;
PRUint32 mCharOffset;
PRBool mFragmentTreeDirty;
nsString mCharacterData;
nsCOMPtr<nsISVGGradient> mFillGradient;
nsCOMPtr<nsISVGGradient> mStrokeGradient;
nsCOMPtr<nsISVGPattern> mFillPattern;
nsCOMPtr<nsISVGPattern> mStrokePattern;
PRPackedBool mFragmentTreeDirty;
};
//----------------------------------------------------------------------

4
mozilla/layout/svg/base/src/nsSVGGradientFrame.cpp
View File

@@ -153,7 +153,6 @@ protected:
//
nsSVGGradientFrame *mNextGrad;
PRBool mLoopFlag;
nsCOMPtr<nsIContent> mSourceContent;
private:
@@ -166,6 +165,9 @@ private:
PRInt32 GetStopElement(PRInt32 aIndex,
nsIDOMSVGStopElement * *aStopElement,
nsIFrame * *aStopFrame);
protected:
PRPackedBool mLoopFlag;
};
// -------------------------------------------------------------------------

2
mozilla/layout/svg/base/src/nsSVGImageFrame.cpp
View File

@@ -135,7 +135,7 @@ private:
nsresult ConvertFrame(gfxIImageFrame *aNewFrame);
friend class nsSVGImageListener;
PRBool mSurfaceInvalid;
PRPackedBool mSurfaceInvalid;
};
//----------------------------------------------------------------------

2
mozilla/layout/svg/base/src/nsSVGInnerSVGFrame.cpp
View File

@@ -164,7 +164,7 @@ protected:
nsCOMPtr<nsISVGRendererRegion> mFilterRegion;
nsISVGFilterFrame *mFilter;
PRBool mPropagateTransform;
PRPackedBool mPropagateTransform;
};
//----------------------------------------------------------------------

17
mozilla/layout/svg/base/src/nsSVGOuterSVGFrame.cpp
View File

@@ -266,8 +266,6 @@ protected:
// nsIView* mView;
PRUint32 mRedrawSuspendCount;
PRBool mNeedsReflow;
PRBool mViewportInitialized;
nsCOMPtr<nsISVGRenderer> mRenderer;
nsCOMPtr<nsIDOMSVGMatrix> mCanvasTM;
@@ -275,6 +273,9 @@ protected:
nsCOMPtr<nsISVGEnum> mZoomAndPan;
nsCOMPtr<nsIDOMSVGPoint> mCurrentTranslate;
nsCOMPtr<nsIDOMSVGNumber> mCurrentScale;
PRPackedBool mNeedsReflow;
PRPackedBool mViewportInitialized;
};
//----------------------------------------------------------------------
@@ -315,20 +316,24 @@ nsSVGOuterSVGFrame::~nsSVGOuterSVGFrame()
nsresult nsSVGOuterSVGFrame::Init()
{
nsresult rv;
#if (defined(MOZ_SVG_RENDERER_GDIPLUS) + \
defined(MOZ_SVG_RENDERER_LIBART) + \
defined(MOZ_SVG_RENDERER_CAIRO) > 1)
#error "Multiple SVG renderers. Please choose one manually."
#elif defined(MOZ_SVG_RENDERER_GDIPLUS)
mRenderer = do_CreateInstance(NS_SVG_RENDERER_GDIPLUS_CONTRACTID);
mRenderer = do_CreateInstance(NS_SVG_RENDERER_GDIPLUS_CONTRACTID, &rv);
#elif defined(MOZ_SVG_RENDERER_LIBART)
mRenderer = do_CreateInstance(NS_SVG_RENDERER_LIBART_CONTRACTID);
mRenderer = do_CreateInstance(NS_SVG_RENDERER_LIBART_CONTRACTID, &rv);
#elif defined(MOZ_SVG_RENDERER_CAIRO)
mRenderer = do_CreateInstance(NS_SVG_RENDERER_CAIRO_CONTRACTID);
mRenderer = do_CreateInstance(NS_SVG_RENDERER_CAIRO_CONTRACTID, &rv);
#else
#error "No SVG renderer."
#endif
NS_ASSERTION(mRenderer, "could not get renderer");
NS_ASSERTION(mRenderer, "could not get SVG renderer");
if (NS_FAILED(rv))
return rv;
// we are an *outer* svg element, so this frame will become the
// coordinate context for our content element:

9
mozilla/layout/svg/base/src/nsSVGPathGeometryFrame.h
View File

@@ -153,18 +153,19 @@ protected:
nsISVGFilterFrame *mFilter;
private:
void GetMarkerFrames(nsISVGMarkerFrame **markerStart,
nsISVGMarkerFrame **markerMid,
nsISVGMarkerFrame **markerEnd);
nsCOMPtr<nsISVGRendererPathGeometry> mGeometry;
PRUint32 mUpdateFlags;
PRBool mPropagateTransform;
nsCOMPtr<nsISVGGradient> mFillGradient;
nsCOMPtr<nsISVGGradient> mStrokeGradient;
nsCOMPtr<nsIDOMSVGMatrix> mOverrideCTM;
nsCOMPtr<nsISVGPattern> mFillPattern;
nsCOMPtr<nsISVGPattern> mStrokePattern;
void GetMarkerFrames(nsISVGMarkerFrame **markerStart,
nsISVGMarkerFrame **markerMid,
nsISVGMarkerFrame **markerEnd);
PRPackedBool mPropagateTransform;
};
#endif // __NS_SVGPATHGEOMETRYFRAME_H__

9
mozilla/layout/svg/base/src/nsSVGPatternFrame.cpp
View File

@@ -170,11 +170,6 @@ protected:
nsresult GetPatternMatrix(nsIDOMSVGMatrix **ctm, nsIDOMSVGRect *bbox, nsIDOMSVGRect *aViewRect);
nsresult ConstructCTM(nsIDOMSVGMatrix **ctm, nsIDOMSVGMatrix *aPCTM, nsIDOMSVGRect *aViewRect);
//
nsSVGPatternFrame *mNextPattern;
PRBool mLoopFlag;
private:
// Cached values
nsCOMPtr<nsIDOMSVGAnimatedEnumeration> mPatternUnits;
@@ -194,6 +189,10 @@ private:
nsCOMPtr<nsIDOMSVGMatrix> mCTM;
nsAutoString mNextPatternStr;
protected:
nsSVGPatternFrame *mNextPattern;
PRPackedBool mLoopFlag;
};
//----------------------------------------------------------------------

8
mozilla/layout/svg/base/src/nsSVGTextFrame.cpp
View File

@@ -206,15 +206,17 @@ protected:
updating};
UpdateState mFragmentTreeState;
UpdateState mMetricsState;
PRBool mFragmentTreeDirty;
PRBool mPositioningDirty;
nsCOMPtr<nsIDOMSVGMatrix> mCanvasTM;
nsCOMPtr<nsIDOMSVGMatrix> mOverrideCTM;
PRBool mPropagateTransform;
nsCOMPtr<nsISVGRendererRegion> mFilterRegion;
nsISVGFilterFrame *mFilter;
PRPackedBool mFragmentTreeDirty;
PRPackedBool mPositioningDirty;
PRPackedBool mPropagateTransform;
};
//----------------------------------------------------------------------

10
mozilla/layout/svg/renderer/src/gdiplus/nsSVGGDIPlusGlyphMetrics.cpp
View File

@@ -135,7 +135,7 @@ public:
RectF* retval, PRBool aLocalCoord = PR_TRUE);
NS_IMETHOD_(const Font*) GetFont();
NS_IMETHOD_(TextRenderingHint) GetTextRenderingHint();
protected:
void MarkRectForUpdate() { mRectNeedsUpdate = PR_TRUE; }
void ClearFontInfo() { if (mFont) { delete mFont; mFont = nsnull; }}
@@ -144,14 +144,14 @@ protected:
void PrepareGraphics(Graphics &g);
float GetPixelScale();
public:
static nsDataHashtable<nsStringHashKey,const nsString*> sFontAliases;
private:
PRBool mRectNeedsUpdate;
RectF mRect;
Font *mFont;
nsCOMPtr<nsISVGGlyphMetricsSource> mSource;
public:
static nsDataHashtable<nsStringHashKey,const nsString*> sFontAliases;
PRPackedBool mRectNeedsUpdate;
};
/** @} */