From b0d2ba05a0bd759684d64c4758f0313d0c003ec8 Mon Sep 17 00:00:00 2001
From: Robert Longson <longsonr@gmail.com>
Date: Wed, 25 Apr 2018 22:44:31 +0100
Subject: [PATCH] Bug 1455763 - Remove SVGViewElement.viewTarget r=heycam
 r=mystor

---
 dom/svg/SVGFragmentIdentifier.cpp             |  1 -
 dom/svg/SVGViewElement.cpp                    | 22 -------------------
 dom/svg/SVGViewElement.h                      |  7 ------
 dom/webidl/SVGViewElement.webidl              |  1 -
 layout/svg/SVGViewFrame.cpp                   |  3 +--
 .../web-platform/meta/svg/historical.html.ini |  3 ---
 6 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/dom/svg/SVGFragmentIdentifier.cpp b/dom/svg/SVGFragmentIdentifier.cpp
index 945449c5d3b2..b904b92fe134 100644
--- a/dom/svg/SVGFragmentIdentifier.cpp
+++ b/dom/svg/SVGFragmentIdentifier.cpp
@@ -110,7 +110,6 @@ public:
         return false;
       }
     } else {
-      // We don't support viewTarget currently
       return false;
     }
     return true;
diff --git a/dom/svg/SVGViewElement.cpp b/dom/svg/SVGViewElement.cpp
index 65310a394e26..49b3df3a480e 100644
--- a/dom/svg/SVGViewElement.cpp
+++ b/dom/svg/SVGViewElement.cpp
@@ -6,7 +6,6 @@
 
 #include "mozilla/dom/SVGViewElement.h"
 #include "mozilla/dom/SVGViewElementBinding.h"
-#include "DOMSVGStringList.h"
 
 NS_IMPL_NS_NEW_NAMESPACED_SVG_ELEMENT(View)
 
@@ -21,11 +20,6 @@ SVGViewElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aGivenProto)
   return SVGViewElementBinding::Wrap(aCx, this, aGivenProto);
 }
 
-nsSVGElement::StringListInfo SVGViewElement::sStringListInfo[1] =
-{
-  { &nsGkAtoms::viewTarget }
-};
-
 nsSVGEnumMapping SVGViewElement::sZoomAndPanMap[] = {
   {&nsGkAtoms::disable, SVG_ZOOMANDPAN_DISABLE},
   {&nsGkAtoms::magnify, SVG_ZOOMANDPAN_MAGNIFY},
@@ -79,15 +73,6 @@ SVGViewElement::PreserveAspectRatio()
   return mPreserveAspectRatio.ToDOMAnimatedPreserveAspectRatio(this);
 }
 
-//----------------------------------------------------------------------
-
-already_AddRefed<DOMSVGStringList>
-SVGViewElement::ViewTarget()
-{
-  return DOMSVGStringList::GetDOMWrapper(
-           &mStringListAttributes[VIEW_TARGET], this, false, VIEW_TARGET);
-}
-
 //----------------------------------------------------------------------
 // nsSVGElement methods
 
@@ -110,12 +95,5 @@ SVGViewElement::GetPreserveAspectRatio()
   return &mPreserveAspectRatio;
 }
 
-nsSVGElement::StringListAttributesInfo
-SVGViewElement::GetStringListInfo()
-{
-  return StringListAttributesInfo(mStringListAttributes, sStringListInfo,
-                                  ArrayLength(sStringListInfo));
-}
-
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/svg/SVGViewElement.h b/dom/svg/SVGViewElement.h
index 2ddeff16dc6a..bc4a346cda22 100644
--- a/dom/svg/SVGViewElement.h
+++ b/dom/svg/SVGViewElement.h
@@ -47,7 +47,6 @@ public:
   void SetZoomAndPan(uint16_t aZoomAndPan, ErrorResult& rv);
   already_AddRefed<SVGAnimatedRect> ViewBox();
   already_AddRefed<DOMSVGAnimatedPreserveAspectRatio> PreserveAspectRatio();
-  already_AddRefed<DOMSVGStringList> ViewTarget();
 
 private:
 
@@ -65,12 +64,6 @@ private:
 
   nsSVGViewBox                   mViewBox;
   SVGAnimatedPreserveAspectRatio mPreserveAspectRatio;
-
-  virtual StringListAttributesInfo GetStringListInfo() override;
-
-  enum { VIEW_TARGET };
-  SVGStringList mStringListAttributes[1];
-  static StringListInfo sStringListInfo[1];
 };
 
 } // namespace dom
diff --git a/dom/webidl/SVGViewElement.webidl b/dom/webidl/SVGViewElement.webidl
index 42d9880590f8..b4be87645de7 100644
--- a/dom/webidl/SVGViewElement.webidl
+++ b/dom/webidl/SVGViewElement.webidl
@@ -11,7 +11,6 @@
  */
 
 interface SVGViewElement : SVGElement {
-  readonly attribute SVGStringList viewTarget;
 };
 
 SVGViewElement implements SVGFitToViewBox;
diff --git a/layout/svg/SVGViewFrame.cpp b/layout/svg/SVGViewFrame.cpp
index d021d72af6ab..cb453e863ed3 100644
--- a/layout/svg/SVGViewFrame.cpp
+++ b/layout/svg/SVGViewFrame.cpp
@@ -91,8 +91,7 @@ SVGViewFrame::AttributeChanged(int32_t  aNameSpaceID,
 
   if (aNameSpaceID == kNameSpaceID_None &&
       (aAttribute == nsGkAtoms::preserveAspectRatio ||
-       aAttribute == nsGkAtoms::viewBox ||
-       aAttribute == nsGkAtoms::viewTarget)) {
+       aAttribute == nsGkAtoms::viewBox)) {
 
     nsSVGOuterSVGFrame *outerSVGFrame = nsSVGUtils::GetOuterSVGFrame(this);
     NS_ASSERTION(outerSVGFrame->GetContent()->IsSVGElement(nsGkAtoms::svg),
diff --git a/testing/web-platform/meta/svg/historical.html.ini b/testing/web-platform/meta/svg/historical.html.ini
index 87582dda0921..bbfd65c4c484 100644
--- a/testing/web-platform/meta/svg/historical.html.ini
+++ b/testing/web-platform/meta/svg/historical.html.ini
@@ -17,6 +17,3 @@
   [SVGSVGElement.prototype.useCurrentView must be removed]
     expected: FAIL
 
-  [SVGViewElement.prototype.viewTarget must be removed]
-    expected: FAIL
-