Bug 296626 - handle SVG glyph frames being constructed in invalid

context.  r=dbaron, sr=roc, a=brendan.

layout/base/nsCSSFrameConstructor.cpp

@@ -5199,8 +5199,13 @@ nsCSSFrameConstructor::ConstructTextFrame(nsFrameConstructorState& aState,
   // XXX kipp: temporary
   newFrame->AddStateBits(NS_FRAME_REPLACED_ELEMENT);
 
-  InitAndRestoreFrame(aState, aContent, aParentFrame, aStyleContext, nsnull,
+  rv = InitAndRestoreFrame(aState, aContent, aParentFrame, aStyleContext,
-                      newFrame);
+                           nsnull, newFrame);
+
+  if (NS_FAILED(rv)) {
+    newFrame->Destroy(aState.mPresContext);
+    return rv;
+  }
 
   // We never need to create a view for a text frame.
 

layout/svg/base/src/nsSVGGlyphFrame.cpp

@@ -280,6 +280,7 @@ nsSVGGlyphFrame::Init(nsPresContext*  aPresContext,
   nsISVGOuterSVGFrame* outerSVGFrame = GetOuterSVGFrame();
   if (!outerSVGFrame) {
     NS_ERROR("No outerSVGFrame");
+    SetStyleContext(aPresContext, aContext);
     return NS_ERROR_FAILURE;
   }
   nsCOMPtr<nsISVGRenderer> renderer;