Bug 833446: Remove nsIDOMSVGStyleElement r=peterv

content/svg/content/src/SVGStyleElement.cpp

@@ -9,8 +9,6 @@
 #include "nsStubMutationObserver.h"
 #include "mozilla/dom/SVGStyleElementBinding.h"
 
-DOMCI_NODE_DATA(SVGStyleElement, mozilla::dom::SVGStyleElement)
-
 NS_IMPL_NS_NEW_NAMESPACED_SVG_ELEMENT(Style)
 
 namespace mozilla {
@@ -29,11 +27,10 @@ NS_IMPL_ADDREF_INHERITED(SVGStyleElement, SVGStyleElementBase)
 NS_IMPL_RELEASE_INHERITED(SVGStyleElement, SVGStyleElementBase)
 
 NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(SVGStyleElement)
-  NS_NODE_INTERFACE_TABLE7(SVGStyleElement, nsIDOMNode, nsIDOMElement,
-                           nsIDOMSVGElement, nsIDOMSVGStyleElement,
+  NS_NODE_INTERFACE_TABLE6(SVGStyleElement, nsIDOMNode, nsIDOMElement,
+                           nsIDOMSVGElement,
                            nsIDOMLinkStyle, nsIStyleSheetLinkingElement,
                            nsIMutationObserver)
-  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGStyleElement)
 NS_INTERFACE_MAP_END_INHERITING(SVGStyleElementBase)
 
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(SVGStyleElement,
@@ -194,56 +191,61 @@ SVGStyleElement::ContentChanged(nsIContent* aContent)
 }
 
 //----------------------------------------------------------------------
-// nsIDOMSVGStyleElement methods
 
-/* attribute DOMString xmlspace; */
-NS_IMETHODIMP SVGStyleElement::GetXmlspace(nsAString & aXmlspace)
+void
+SVGStyleElement::GetXmlspace(nsAString & aXmlspace)
 {
   GetAttr(kNameSpaceID_XML, nsGkAtoms::space, aXmlspace);
+}
 
-  return NS_OK;
-}
-NS_IMETHODIMP SVGStyleElement::SetXmlspace(const nsAString & aXmlspace)
-{
-  return SetAttr(kNameSpaceID_XML, nsGkAtoms::space, aXmlspace, true);
-}
 void
 SVGStyleElement::SetXmlspace(const nsAString & aXmlspace, ErrorResult& rv)
 {
   rv = SetAttr(kNameSpaceID_XML, nsGkAtoms::space, aXmlspace, true);
 }
 
-/* attribute DOMString media; */
-NS_IMPL_STRING_ATTR(SVGStyleElement, Media, media)
+void
+SVGStyleElement::GetMedia(nsAString & aMedia)
+{
+  GetAttr(kNameSpaceID_None, nsGkAtoms::media, aMedia);
+}
+
 void
 SVGStyleElement::SetMedia(const nsAString& aMedia, ErrorResult& rv)
 {
   rv = SetAttr(kNameSpaceID_None, nsGkAtoms::media, aMedia, true);
 }
 
-/* attribute boolean scoped; */
-NS_IMPL_BOOL_ATTR(SVGStyleElement, Scoped, scoped)
 bool
 SVGStyleElement::Scoped() const
 {
   return GetBoolAttr(nsGkAtoms::scoped);
 }
+
 void
 SVGStyleElement::SetScoped(bool aScoped, ErrorResult& rv)
 {
   rv = SetBoolAttr(nsGkAtoms::scoped, aScoped);
 }
 
-/* attribute DOMString type; */
-NS_IMPL_STRING_ATTR(SVGStyleElement, Type, type)
+void
+SVGStyleElement::GetType(nsAString & aType)
+{
+  GetAttr(kNameSpaceID_None, nsGkAtoms::type, aType);
+}
+
 void
 SVGStyleElement::SetType(const nsAString& aType, ErrorResult& rv)
 {
   rv = SetAttr(kNameSpaceID_None, nsGkAtoms::type, aType, true);
 }
 
-/* attribute DOMString title; */
-NS_IMPL_STRING_ATTR(SVGStyleElement, Title, title)
+void
+SVGStyleElement::GetTitle(nsAString & aTitle)
+{
+  GetAttr(kNameSpaceID_None, nsGkAtoms::title, aTitle);
+}
+
 void
 SVGStyleElement::SetTitle(const nsAString& aTitle, ErrorResult& rv)
 {

content/svg/content/src/SVGStyleElement.h

@@ -7,7 +7,6 @@
 #define mozilla_dom_SVGStyleElement_h
 
 #include "nsSVGElement.h"
-#include "nsIDOMSVGStyleElement.h"
 #include "nsStyleLinkElement.h"
 #include "nsStubMutationObserver.h"
 
@@ -20,7 +19,7 @@ namespace mozilla {
 namespace dom {
 
 class SVGStyleElement MOZ_FINAL : public SVGStyleElementBase,
-                                  public nsIDOMSVGStyleElement,
+                                  public nsIDOMSVGElement,
                                   public nsStyleLinkElement,
                                   public nsStubMutationObserver
 {
@@ -33,7 +32,6 @@ protected:
 
 public:
   NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_NSIDOMSVGSTYLEELEMENT
 
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(SVGStyleElement,
                                            SVGStyleElementBase)
@@ -72,17 +70,19 @@ public:
   NS_DECL_NSIMUTATIONOBSERVER_CONTENTINSERTED
   NS_DECL_NSIMUTATIONOBSERVER_CONTENTREMOVED
 
-  virtual nsXPCClassInfo* GetClassInfo();
-
   virtual nsIDOMNode* AsDOMNode() { return this; }
 
   // WebIDL
+  void GetXmlspace(nsAString & aXmlspace);
   void SetXmlspace(const nsAString & aXmlspace, ErrorResult& rv);
-  void SetType(const nsAString & aType, ErrorResult& rv);
-  void SetMedia(const nsAString & aMedia, ErrorResult& rv);
-  void SetTitle(const nsAString & aTitle, ErrorResult& rv);
+  void GetMedia(nsAString & aMedia);
+  void SetMedia(const nsAString& aMedia, ErrorResult& rv);
   bool Scoped() const;
   void SetScoped(bool aScoped, ErrorResult& rv);
+  void GetType(nsAString & aType);
+  void SetType(const nsAString& aType, ErrorResult& rv);
+  void GetTitle(nsAString & aTitle);
+  void SetTitle(const nsAString& aTitle, ErrorResult& rv);
 
 protected:
   // Dummy init method to make the NS_IMPL_NS_NEW_SVG_ELEMENT and

dom/base/nsDOMClassInfo.cpp

@@ -329,7 +329,6 @@
 #include "nsIDOMSVGMaskElement.h"
 #include "nsIDOMSVGNumber.h"
 #include "nsIDOMSVGRect.h"
-#include "nsIDOMSVGStyleElement.h"
 #include "nsIDOMSVGSVGElement.h"
 #include "nsIDOMSVGSwitchElement.h"
 #include "nsIDOMSVGSymbolElement.h"
@@ -1109,8 +1108,6 @@ static nsDOMClassInfoData sClassInfoData[] = {
                            ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(SVGMaskElement, nsElementSH,
                            ELEMENT_SCRIPTABLE_FLAGS)
-  NS_DEFINE_CLASSINFO_DATA(SVGStyleElement, nsElementSH,
-                           ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(SVGSVGElement, nsElementSH,
                            ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(SVGSwitchElement, nsElementSH,
@@ -3117,12 +3114,6 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_SVG_ELEMENT_MAP_ENTRIES
   DOM_CLASSINFO_MAP_END
 
-  DOM_CLASSINFO_MAP_BEGIN(SVGStyleElement, nsIDOMSVGStyleElement)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGStyleElement)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMLinkStyle)
-    DOM_CLASSINFO_SVG_ELEMENT_MAP_ENTRIES
-  DOM_CLASSINFO_MAP_END
-
   DOM_CLASSINFO_MAP_BEGIN(SVGSVGElement, nsIDOMSVGSVGElement)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGSVGElement)
     DOM_CLASSINFO_SVG_GRAPHIC_ELEMENT_MAP_ENTRIES

dom/base/nsDOMClassInfoClasses.h

@@ -222,7 +222,6 @@ DOMCI_CLASS(SVGFilterElement)
 DOMCI_CLASS(SVGImageElement)
 DOMCI_CLASS(SVGMarkerElement)
 DOMCI_CLASS(SVGMaskElement)
-DOMCI_CLASS(SVGStyleElement)
 DOMCI_CLASS(SVGSVGElement)
 DOMCI_CLASS(SVGSwitchElement)
 DOMCI_CLASS(SVGSymbolElement)

dom/interfaces/svg/Makefile.in

@@ -38,7 +38,6 @@ XPIDLSRCS	= \
 		nsIDOMSVGRect.idl \
 		nsIDOMSVGSVGElement.idl \
 		nsIDOMSVGStringList.idl \
-		nsIDOMSVGStyleElement.idl \
 		nsIDOMSVGSwitchElement.idl \
 		nsIDOMSVGSymbolElement.idl \
 		nsIDOMSVGTextContentElement.idl \

dom/interfaces/svg/nsIDOMSVGStyleElement.idl

@@ -1,21 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsIDOMSVGElement.idl"
-
-[scriptable, uuid(2fecabb2-4671-4553-9e99-1b8167e3c131)]
-interface nsIDOMSVGStyleElement
-  : nsIDOMSVGElement
-{
-  attribute DOMString         xmlspace;
-                       // raises DOMException on setting
-  attribute DOMString         type;
-                       // raises DOMException on setting
-  attribute DOMString         media;
-                       // raises DOMException on setting
-  attribute DOMString         title;
-                       // raises DOMException on setting
-  attribute boolean           scoped;
-};