From e3b924526e7ac9092e3ae01a0b2e464b100cf733 Mon Sep 17 00:00:00 2001
From: longsonr <longsonr@gmail.com>
Date: Wed, 19 Aug 2020 15:25:39 +0000
Subject: [PATCH] Bug 1659783 - Fix use pointing to image elements r=emilio

Differential Revision: https://phabricator.services.mozilla.com/D87571
---
 dom/svg/SVGImageElement.h            |  4 ++--
 layout/reftests/svg/reftest.list     |  1 +
 layout/reftests/svg/use-image-01.svg | 10 ++++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 layout/reftests/svg/use-image-01.svg

diff --git a/dom/svg/SVGImageElement.h b/dom/svg/SVGImageElement.h
index 69d2df918e4b..e26e588dae74 100644
--- a/dom/svg/SVGImageElement.h
+++ b/dom/svg/SVGImageElement.h
@@ -57,9 +57,9 @@ class SVGImageElement : public SVGImageElementBase,
                                 nsIPrincipal* aSubjectPrincipal,
                                 bool aNotify) override;
   bool IsNodeOfType(uint32_t aFlags) const override {
-    // <imag> is not really a SVGGeometryElement, we should
+    // <image> is not really a SVGGeometryElement, we should
     // ignore eSHAPE flag accepted by SVGGeometryElement.
-    return SVGGraphicsElement::IsNodeOfType(aFlags);
+    return !(aFlags & ~eUSE_TARGET);
   }
 
   virtual nsresult BindToTree(BindContext&, nsINode& aParent) override;
diff --git a/layout/reftests/svg/reftest.list b/layout/reftests/svg/reftest.list
index 9b359154f606..49e7394eeee6 100644
--- a/layout/reftests/svg/reftest.list
+++ b/layout/reftests/svg/reftest.list
@@ -550,6 +550,7 @@ pref(layout.css.devPixelsPerPx,"1.0") == svg-blurry-with-subpixel-position.html
 == use-children.svg pass.svg
 
 == use-element-shadow-tree-rule-matching.html pass.svg
+== use-image-01.svg pass.svg
 
 # test case for Fragment URLs
 # https://drafts.csswg.org/css-values/#local-urls
diff --git a/layout/reftests/svg/use-image-01.svg b/layout/reftests/svg/use-image-01.svg
new file mode 100644
index 000000000000..a49d15411db4
--- /dev/null
+++ b/layout/reftests/svg/use-image-01.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<rect width="100%" height="100%" fill="url(#pattern0)"/>
+<defs>
+<pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
+<use xlink:href="#image0" />
+</pattern>
+<image id="image0" width="100%" height="100%" xlink:href="pass.svg"/>
+</defs>
+</svg>
+