Additional patch for Bug 425265, r+sr=bz

Brli · Mar 30, 2009 · e7f06f5 · e7f06f5
1 parent 7590460
commit e7f06f5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/layout/svg/base/src/nsSVGGlyphFrame.cpp b/layout/svg/base/src/nsSVGGlyphFrame.cpp
@@ -281,12 +281,12 @@ nsSVGGlyphFrame::IsSelectable(PRBool* aIsSelectable,
   return rv;
 }
 
-#ifdef DEBUG
 NS_IMETHODIMP
 nsSVGGlyphFrame::Init(nsIContent* aContent,
                       nsIFrame* aParent,
                       nsIFrame* aPrevInFlow)
 {
+#ifdef DEBUG
   NS_ASSERTION(aParent, "null parent");
 
   nsIFrame* ancestorFrame = nsSVGUtils::GetFirstNonAAncestorFrame(aParent);
@@ -298,14 +298,14 @@ nsSVGGlyphFrame::Init(nsIContent* aContent,
 
   NS_ASSERTION(aContent->IsNodeOfType(nsINode::eTEXT),
                "trying to construct an SVGGlyphFrame for wrong content element");
+#endif /* DEBUG */
 
   if (!PresContext()->IsDynamic()) {
     AddStateBits(NS_STATE_SVG_PRINTING);
   }
 
   return nsSVGGlyphFrameBase::Init(aContent, aParent, aPrevInFlow);
 }
-#endif /* DEBUG */
 
 nsIAtom *
 nsSVGGlyphFrame::GetType() const

diff --git a/layout/svg/base/src/nsSVGGlyphFrame.h b/layout/svg/base/src/nsSVGGlyphFrame.h
@@ -87,11 +87,9 @@ class nsSVGGlyphFrame : public nsSVGGlyphFrameBase,
   NS_IMETHOD  GetSelected(PRBool *aSelected) const;
   NS_IMETHOD  IsSelectable(PRBool* aIsSelectable, PRUint8* aSelectStyle) const;
 
-#ifdef DEBUG
   NS_IMETHOD Init(nsIContent*      aContent,
                   nsIFrame*        aParent,
                   nsIFrame*        aPrevInFlow);
-#endif
 
   /**
    * Get the "type" of the frame