Bug 1474311 - check whether we should load images r=jwatt

Differential Revision: https://phabricator.services.mozilla.com/D93096

Author: longsonr

dom/svg/SVGFEImageElement.cpp

@@ -87,6 +87,10 @@ nsresult SVGFEImageElement::LoadSVGImage(bool aForce, bool aNotify) {
   return LoadImage(href, aForce, aNotify, eImageLoadType_Normal);
 }
 
+bool SVGFEImageElement::ShouldLoadImage() const {
+  return LoadingEnabled() && OwnerDoc()->ShouldLoadImages();
+}
+
 //----------------------------------------------------------------------
 // EventTarget methods:
 
@@ -113,7 +117,9 @@ nsresult SVGFEImageElement::AfterSetAttr(int32_t aNamespaceID, nsAtom* aName,
   if (aName == nsGkAtoms::href && (aNamespaceID == kNameSpaceID_XLink ||
                                    aNamespaceID == kNameSpaceID_None)) {
     if (aValue) {
-      LoadSVGImage(true, aNotify);
+      if (ShouldLoadImage()) {
+        LoadSVGImage(true, aNotify);
+      }
     } else {
       CancelImageRequests(aNotify);
     }
@@ -138,8 +144,9 @@ nsresult SVGFEImageElement::BindToTree(BindContext& aContext,
 
   nsImageLoadingContent::BindToTree(aContext, aParent);
 
-  if (mStringAttributes[HREF].IsExplicitlySet() ||
-      mStringAttributes[XLINK_HREF].IsExplicitlySet()) {
+  if ((mStringAttributes[HREF].IsExplicitlySet() ||
+       mStringAttributes[XLINK_HREF].IsExplicitlySet()) &&
+      ShouldLoadImage()) {
     nsContentUtils::AddScriptRunner(
         NewRunnableMethod("dom::SVGFEImageElement::MaybeLoadSVGImage", this,
                           &SVGFEImageElement::MaybeLoadSVGImage));

dom/svg/SVGFEImageElement.h

@@ -70,8 +70,7 @@ class SVGFEImageElement final : public SVGFEImageElementBase,
   virtual EventStates IntrinsicState() const override;
   virtual void DestroyContent() override;
 
-  void Notify(imgIRequest* aRequest, int32_t aType,
-              const nsIntRect* aData) override;
+  NS_DECL_IMGINOTIFICATIONOBSERVER
 
   // Override for nsIImageLoadingContent.
   NS_IMETHOD_(void) FrameCreated(nsIFrame* aFrame) override;
@@ -84,6 +83,7 @@ class SVGFEImageElement final : public SVGFEImageElementBase,
 
  private:
   nsresult LoadSVGImage(bool aForce, bool aNotify);
+  bool ShouldLoadImage() const;
 
  protected:
   virtual bool ProducesSRGB() override { return true; }

dom/svg/SVGImageElement.cpp

@@ -147,6 +147,10 @@ nsresult SVGImageElement::LoadSVGImage(bool aForce, bool aNotify) {
   return LoadImage(href, aForce, aNotify, eImageLoadType_Normal);
 }
 
+bool SVGImageElement::ShouldLoadImage() const {
+  return LoadingEnabled() && OwnerDoc()->ShouldLoadImages();
+}
+
 //----------------------------------------------------------------------
 // EventTarget methods:
 
@@ -180,7 +184,9 @@ nsresult SVGImageElement::AfterSetAttr(int32_t aNamespaceID, nsAtom* aName,
   if (aName == nsGkAtoms::href && (aNamespaceID == kNameSpaceID_None ||
                                    aNamespaceID == kNameSpaceID_XLink)) {
     if (aValue) {
-      LoadSVGImage(true, aNotify);
+      if (ShouldLoadImage()) {
+        LoadSVGImage(true, aNotify);
+      }
     } else {
       CancelImageRequests(aNotify);
     }
@@ -209,8 +215,9 @@ nsresult SVGImageElement::BindToTree(BindContext& aContext, nsINode& aParent) {
 
   nsImageLoadingContent::BindToTree(aContext, aParent);
 
-  if (mStringAttributes[HREF].IsExplicitlySet() ||
-      mStringAttributes[XLINK_HREF].IsExplicitlySet()) {
+  if ((mStringAttributes[HREF].IsExplicitlySet() ||
+       mStringAttributes[XLINK_HREF].IsExplicitlySet()) &&
+      ShouldLoadImage()) {
     nsContentUtils::AddScriptRunner(
         NewRunnableMethod("dom::SVGImageElement::MaybeLoadSVGImage", this,
                           &SVGImageElement::MaybeLoadSVGImage));

dom/svg/SVGImageElement.h

@@ -104,6 +104,7 @@ class SVGImageElement : public SVGImageElementBase,
 
  protected:
   nsresult LoadSVGImage(bool aForce, bool aNotify);
+  bool ShouldLoadImage() const;
 
   virtual LengthAttributesInfo GetLengthInfo() override;
   virtual SVGAnimatedPreserveAspectRatio* GetAnimatedPreserveAspectRatio()

dom/svg/test/mochitest.ini

@@ -58,6 +58,7 @@ skip-if = true # disabled-for-intermittent-failures--bug-701060
 [test_object-delayed-intrinsic-size.html]
 [test_onerror.xhtml]
 [test_onload.xhtml]
+[test_onload2.xhtml]
 [test_pairParsing.html]
 [test_pathAnimInterpolation.xhtml]
 skip-if = true # We need to polyfill the SVG DOM for path data

dom/svg/test/test_onload2.xhtml

@@ -0,0 +1,48 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1474311
+-->
+<head>
+  <title>Test onload behaviour</title>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1474311">Mozilla Bug 1474311</a>
+<p id="display"></p>
+<script class="testbody" type="text/javascript">
+<![CDATA[
+
+SimpleTest.waitForExplicitFinish();
+
+function run() {
+
+  let doc = document.implementation.createHTMLDocument('');
+
+  doc.body.innerHTML = '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><image id="image" xlink:href="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" height="200" width="200"/></svg>';
+
+  let img = doc.body.firstChild.firstChild;
+
+  document.getElementById('svg').appendChild(img);
+
+  img.addEventListener('load', function () {
+    ok(true, "onload method called");
+    SimpleTest.finish();
+  });
+
+  img.addEventListener('error', function () {
+    ok(false, "onerror method called");
+  });
+}
+
+]]>
+</script>
+<div id="content">
+
+  <svg id="svg" onload="run()" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100%" height="1">
+  </svg>
+</div>
+<pre id="test">
+</pre>
+</body>
+</html>