Bug 893117: Remove nsIDOMHTMLFontElement r=bz
authorDavid Zbarsky <dzbarsky@gmail.com>
Thu, 01 Aug 2013 15:24:24 -0700
changeset 148585 1ea6c2e6a468b92314aca449165d0c384af00b00
parent 148584 11d7091b3bf44754ec12f5686c3f078300df022d
child 148586 a944279cd8f719945bc6da3d423f21341e45beff
push idunknown
push userunknown
push dateunknown
reviewersbz
bugs893117
milestone25.0a1
Bug 893117: Remove nsIDOMHTMLFontElement r=bz
content/html/content/src/HTMLFontElement.cpp
content/html/content/src/HTMLFontElement.h
dom/interfaces/html/moz.build
dom/interfaces/html/nsIDOMHTMLFontElement.idl
--- a/content/html/content/src/HTMLFontElement.cpp
+++ b/content/html/content/src/HTMLFontElement.cpp
@@ -26,76 +26,23 @@ HTMLFontElement::WrapNode(JSContext *aCx
 {
   return HTMLFontElementBinding::Wrap(aCx, aScope, this);
 }
 
 NS_IMPL_ADDREF_INHERITED(HTMLFontElement, Element)
 NS_IMPL_RELEASE_INHERITED(HTMLFontElement, Element)
 
 // QueryInterface implementation for HTMLFontElement
-NS_INTERFACE_TABLE_HEAD(HTMLFontElement)
+NS_INTERFACE_MAP_BEGIN(HTMLFontElement)
   NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
-  NS_INTERFACE_TABLE_INHERITED1(HTMLFontElement, nsIDOMHTMLFontElement)
-  NS_INTERFACE_TABLE_TO_MAP_SEGUE
 NS_ELEMENT_INTERFACE_MAP_END
 
 
 NS_IMPL_ELEMENT_CLONE(HTMLFontElement)
 
-NS_IMETHODIMP
-HTMLFontElement::GetColor(nsAString& aColor)
-{
-  nsString color;
-  GetColor(color);
-  aColor = color;
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-HTMLFontElement::SetColor(const nsAString& aColor)
-{
-  ErrorResult rv;
-  SetColor(aColor, rv);
-  return rv.ErrorCode();
-}
-
-NS_IMETHODIMP
-HTMLFontElement::GetFace(nsAString& aFace)
-{
-  nsString face;
-  GetFace(face);
-  aFace = face;
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-HTMLFontElement::SetFace(const nsAString& aFace)
-{
-  ErrorResult rv;
-  SetFace(aFace, rv);
-  return rv.ErrorCode();
-}
-
-NS_IMETHODIMP
-HTMLFontElement::GetSize(nsAString& aSize)
-{
-  nsString size;
-  GetSize(size);
-  aSize = size;
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-HTMLFontElement::SetSize(const nsAString& aSize)
-{
-  ErrorResult rv;
-  SetSize(aSize, rv);
-  return rv.ErrorCode();
-}
-
 bool
 HTMLFontElement::ParseAttribute(int32_t aNamespaceID,
                                 nsIAtom* aAttribute,
                                 const nsAString& aValue,
                                 nsAttrValue& aResult)
 {
   if (aNamespaceID == kNameSpaceID_None) {
     if (aAttribute == nsGkAtoms::size) {
--- a/content/html/content/src/HTMLFontElement.h
+++ b/content/html/content/src/HTMLFontElement.h
@@ -2,23 +2,22 @@
 /* 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/. */
 #ifndef HTMLFontElement_h___
 #define HTMLFontElement_h___
 
 #include "mozilla/Attributes.h"
 #include "nsGenericHTMLElement.h"
-#include "nsIDOMHTMLFontElement.h"
 
 namespace mozilla {
 namespace dom {
 
 class HTMLFontElement MOZ_FINAL : public nsGenericHTMLElement,
-                                  public nsIDOMHTMLFontElement
+                                  public nsIDOMHTMLElement
 {
 public:
   HTMLFontElement(already_AddRefed<nsINodeInfo> aNodeInfo)
     : nsGenericHTMLElement(aNodeInfo)
   {
   }
   virtual ~HTMLFontElement();
 
@@ -29,19 +28,16 @@ public:
   NS_FORWARD_NSIDOMNODE_TO_NSINODE
 
   // nsIDOMElement
   NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
 
   // nsIDOMHTMLElement
   NS_FORWARD_NSIDOMHTMLELEMENT_TO_GENERIC
 
-  // nsIDOMHTMLFontElement
-  NS_DECL_NSIDOMHTMLFONTELEMENT
-
   void GetColor(nsString& aColor)
   {
     GetHTMLAttr(nsGkAtoms::color, aColor);
   }
   void SetColor(const nsAString& aColor, ErrorResult& aError)
   {
     SetHTMLAttr(nsGkAtoms::color, aColor, aError);
   }
--- a/dom/interfaces/html/moz.build
+++ b/dom/interfaces/html/moz.build
@@ -18,17 +18,16 @@ XPIDL_SOURCES += [
     'nsIDOMHTMLCollection.idl',
     'nsIDOMHTMLDListElement.idl',
     'nsIDOMHTMLDirectoryElement.idl',
     'nsIDOMHTMLDivElement.idl',
     'nsIDOMHTMLDocument.idl',
     'nsIDOMHTMLElement.idl',
     'nsIDOMHTMLEmbedElement.idl',
     'nsIDOMHTMLFieldSetElement.idl',
-    'nsIDOMHTMLFontElement.idl',
     'nsIDOMHTMLFormElement.idl',
     'nsIDOMHTMLFrameElement.idl',
     'nsIDOMHTMLFrameSetElement.idl',
     'nsIDOMHTMLHRElement.idl',
     'nsIDOMHTMLHeadElement.idl',
     'nsIDOMHTMLHeadingElement.idl',
     'nsIDOMHTMLHtmlElement.idl',
     'nsIDOMHTMLIFrameElement.idl',
deleted file mode 100644
--- a/dom/interfaces/html/nsIDOMHTMLFontElement.idl
+++ /dev/null
@@ -1,25 +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 "nsIDOMHTMLElement.idl"
-
-/**
- * The nsIDOMHTMLFontElement interface is the interface to a [X]HTML
- * font element.
- *
- * This interface is trying to follow the DOM Level 2 HTML specification:
- * http://www.w3.org/TR/DOM-Level-2-HTML/
- *
- * with changes from the work-in-progress WHATWG HTML specification:
- * http://www.whatwg.org/specs/web-apps/current-work/
- */
-
-[scriptable, uuid(e4d86aad-f245-4901-877e-0ae233c5fd37)]
-interface nsIDOMHTMLFontElement : nsIDOMHTMLElement
-{
-           attribute DOMString        color;
-           attribute DOMString        face;
-           attribute DOMString        size;
-};