From 9af9ebbaedd4bf14ab91c929b177f658ddb478de Mon Sep 17 00:00:00 2001
From: Robert Longson <longsonr@gmail.com>
Date: Wed, 9 Nov 2011 12:13:31 +0000
Subject: [PATCH] Bug 693424 - remove Should not be calling this on a
 non-display child assert in nsSVGForeignObjectFrame::GetBBoxContribution.
 r=dholbert

---
 layout/svg/base/src/nsSVGForeignObjectFrame.cpp | 3 ---
 layout/svg/crashtests/693424-1.svg              | 6 ++++++
 layout/svg/crashtests/crashtests.list           | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 layout/svg/crashtests/693424-1.svg

diff --git a/layout/svg/base/src/nsSVGForeignObjectFrame.cpp b/layout/svg/base/src/nsSVGForeignObjectFrame.cpp
index 57af49aee328..5b5852560bfb 100644
--- a/layout/svg/base/src/nsSVGForeignObjectFrame.cpp
+++ b/layout/svg/base/src/nsSVGForeignObjectFrame.cpp
@@ -436,9 +436,6 @@ gfxRect
 nsSVGForeignObjectFrame::GetBBoxContribution(const gfxMatrix &aToBBoxUserspace,
                                              PRUint32 aFlags)
 {
-  NS_ASSERTION(!(GetStateBits() & NS_STATE_SVG_NONDISPLAY_CHILD),
-               "Should not be calling this on a non-display child");
-
   nsSVGForeignObjectElement *content =
     static_cast<nsSVGForeignObjectElement*>(mContent);
 
diff --git a/layout/svg/crashtests/693424-1.svg b/layout/svg/crashtests/693424-1.svg
new file mode 100644
index 000000000000..8485f6b617dd
--- /dev/null
+++ b/layout/svg/crashtests/693424-1.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <marker id="m">
+    <foreignObject/>
+  </marker>
+  <line marker-end="url(#m)"/>
+</svg>
diff --git a/layout/svg/crashtests/crashtests.list b/layout/svg/crashtests/crashtests.list
index a6e3876e7978..2c2a29d70e80 100644
--- a/layout/svg/crashtests/crashtests.list
+++ b/layout/svg/crashtests/crashtests.list
@@ -118,3 +118,4 @@ load 669025-2.svg
 load 682411-1.svg
 load 692203-1.svg
 load 692203-2.svg
+load 693424-1.svg