diff --git a/layout/svg/base/src/nsSVGForeignObjectFrame.cpp b/layout/svg/base/src/nsSVGForeignObjectFrame.cpp index feb558907e6c..7c1461f7af82 100644 --- a/layout/svg/base/src/nsSVGForeignObjectFrame.cpp +++ b/layout/svg/base/src/nsSVGForeignObjectFrame.cpp @@ -494,9 +494,7 @@ void nsSVGForeignObjectFrame::UpdateGraphic() return; } - PRBool suspended; - outerSVGFrame->IsRedrawSuspended(&suspended); - if (suspended) { + if (outerSVGFrame->IsRedrawSuspended()) { AddStateBits(NS_STATE_SVG_DIRTY); } else { RemoveStateBits(NS_STATE_SVG_DIRTY); @@ -593,9 +591,7 @@ nsSVGForeignObjectFrame::FlushDirtyRegion() { return; } - PRBool suspended; - outerSVGFrame->IsRedrawSuspended(&suspended); - if (suspended) + if (outerSVGFrame->IsRedrawSuspended()) return; nsRect rect = nsSVGUtils::FindFilterInvalidation(this); diff --git a/layout/svg/base/src/nsSVGGlyphFrame.cpp b/layout/svg/base/src/nsSVGGlyphFrame.cpp index bde55e210596..11b7c00b58a5 100644 --- a/layout/svg/base/src/nsSVGGlyphFrame.cpp +++ b/layout/svg/base/src/nsSVGGlyphFrame.cpp @@ -1311,9 +1311,7 @@ void nsSVGGlyphFrame::UpdateGeometry(PRBool bRedraw, return; } - PRBool suspended; - outerSVGFrame->IsRedrawSuspended(&suspended); - if (suspended) { + if (outerSVGFrame->IsRedrawSuspended()) { AddStateBits(NS_STATE_SVG_DIRTY); } else { RemoveStateBits(NS_STATE_SVG_DIRTY); diff --git a/layout/svg/base/src/nsSVGOuterSVGFrame.cpp b/layout/svg/base/src/nsSVGOuterSVGFrame.cpp index a747df2ecec2..d93f6ae34dbf 100644 --- a/layout/svg/base/src/nsSVGOuterSVGFrame.cpp +++ b/layout/svg/base/src/nsSVGOuterSVGFrame.cpp @@ -517,11 +517,10 @@ nsSVGOuterSVGFrame::InvalidateRect(nsRect aRect) return NS_OK; } -nsresult -nsSVGOuterSVGFrame::IsRedrawSuspended(PRBool* isSuspended) +PRBool +nsSVGOuterSVGFrame::IsRedrawSuspended() { - *isSuspended = (mRedrawSuspendCount>0) || !mViewportInitialized; - return NS_OK; + return (mRedrawSuspendCount>0) || !mViewportInitialized; } //---------------------------------------------------------------------- diff --git a/layout/svg/base/src/nsSVGOuterSVGFrame.h b/layout/svg/base/src/nsSVGOuterSVGFrame.h index 5da4332bc3f7..225e4ff59505 100644 --- a/layout/svg/base/src/nsSVGOuterSVGFrame.h +++ b/layout/svg/base/src/nsSVGOuterSVGFrame.h @@ -110,7 +110,7 @@ public: /* Invalidate takes a nsRect in screen pixel coordinates */ nsresult InvalidateRect(nsRect aRect); - nsresult IsRedrawSuspended(PRBool* isSuspended); + PRBool IsRedrawSuspended(); // nsISVGSVGFrame interface: NS_IMETHOD SuspendRedraw(); diff --git a/layout/svg/base/src/nsSVGPathGeometryFrame.cpp b/layout/svg/base/src/nsSVGPathGeometryFrame.cpp index 8d278bdd2904..d649365dd763 100644 --- a/layout/svg/base/src/nsSVGPathGeometryFrame.cpp +++ b/layout/svg/base/src/nsSVGPathGeometryFrame.cpp @@ -752,9 +752,7 @@ nsSVGPathGeometryFrame::UpdateGraphic(PRBool suppressInvalidation) return NS_ERROR_FAILURE; } - PRBool suspended; - outerSVGFrame->IsRedrawSuspended(&suspended); - if (suspended) { + if (outerSVGFrame->IsRedrawSuspended()) { AddStateBits(NS_STATE_SVG_DIRTY); } else { RemoveStateBits(NS_STATE_SVG_DIRTY);