From 5b745dcbdbca14325025ead910a71d027390ad25 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Sun, 17 Feb 2013 19:28:09 +1100
Subject: [PATCH] Bug 842009 - Ignore <tref> elements when computing SVG text
 layout. r=longsonr

---
 layout/svg/crashtests/842009-1.svg    | 5 +++++
 layout/svg/crashtests/crashtests.list | 1 +
 layout/svg/nsSVGTextFrame2.cpp        | 1 -
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 layout/svg/crashtests/842009-1.svg

diff --git a/layout/svg/crashtests/842009-1.svg b/layout/svg/crashtests/842009-1.svg
new file mode 100644
index 00000000000..25656ba530c
--- /dev/null
+++ b/layout/svg/crashtests/842009-1.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink">
+  <title id="hello">hello</title>
+  <text x="100" y="100"> <tref xlink:href="#hello"/></text>
+</svg>
diff --git a/layout/svg/crashtests/crashtests.list b/layout/svg/crashtests/crashtests.list
index 33337863ed1..d50de1fc732 100644
--- a/layout/svg/crashtests/crashtests.list
+++ b/layout/svg/crashtests/crashtests.list
@@ -153,3 +153,4 @@ load 808318-1.svg
 load 813420-1.svg
 load 841163-1.svg
 load 841812-1.svg
+load 842009-1.svg
diff --git a/layout/svg/nsSVGTextFrame2.cpp b/layout/svg/nsSVGTextFrame2.cpp
index fb51c631586..138e8b406ba 100644
--- a/layout/svg/nsSVGTextFrame2.cpp
+++ b/layout/svg/nsSVGTextFrame2.cpp
@@ -253,7 +253,6 @@ IsTextContentElement(nsIContent* aContent)
 
   if (aContent->Tag() == nsGkAtoms::a ||
       aContent->Tag() == nsGkAtoms::tspan ||
-      aContent->Tag() == nsGkAtoms::tref ||
       aContent->Tag() == nsGkAtoms::altGlyph) {
     return true;
   }