From d1500cce4736a0b7e357defe374b47ad75f73c2d Mon Sep 17 00:00:00 2001 From: David Zbarsky Date: Thu, 1 Aug 2013 15:24:23 -0700 Subject: [PATCH] Bug 893117: Remove nsIDOMHTMLModElement r=bz --- content/html/content/src/HTMLModElement.cpp | 9 +------- content/html/content/src/HTMLModElement.h | 11 ++++----- dom/interfaces/html/moz.build | 1 - dom/interfaces/html/nsIDOMHTMLModElement.idl | 24 -------------------- 4 files changed, 6 insertions(+), 39 deletions(-) delete mode 100644 dom/interfaces/html/nsIDOMHTMLModElement.idl diff --git a/content/html/content/src/HTMLModElement.cpp b/content/html/content/src/HTMLModElement.cpp index 4d199489faa..811e92dd244 100644 --- a/content/html/content/src/HTMLModElement.cpp +++ b/content/html/content/src/HTMLModElement.cpp @@ -26,20 +26,13 @@ NS_IMPL_ADDREF_INHERITED(HTMLModElement, Element) NS_IMPL_RELEASE_INHERITED(HTMLModElement, Element) // QueryInterface implementation for HTMLModElement -NS_INTERFACE_TABLE_HEAD(HTMLModElement) +NS_INTERFACE_MAP_BEGIN(HTMLModElement) NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement) - NS_INTERFACE_TABLE_INHERITED1(HTMLModElement, - nsIDOMHTMLModElement) - NS_INTERFACE_TABLE_TO_MAP_SEGUE NS_ELEMENT_INTERFACE_MAP_END NS_IMPL_ELEMENT_CLONE(HTMLModElement) - -NS_IMPL_URI_ATTR(HTMLModElement, Cite, cite) -NS_IMPL_STRING_ATTR(HTMLModElement, DateTime, datetime) - JSObject* HTMLModElement::WrapNode(JSContext* aCx, JS::Handle aScope) { diff --git a/content/html/content/src/HTMLModElement.h b/content/html/content/src/HTMLModElement.h index e17495e3703..3ca9a9d7925 100644 --- a/content/html/content/src/HTMLModElement.h +++ b/content/html/content/src/HTMLModElement.h @@ -8,14 +8,13 @@ #include "mozilla/Attributes.h" #include "nsGenericHTMLElement.h" -#include "nsIDOMHTMLModElement.h" #include "nsGkAtoms.h" namespace mozilla { namespace dom { class HTMLModElement MOZ_FINAL : public nsGenericHTMLElement, - public nsIDOMHTMLModElement + public nsIDOMHTMLElement { public: HTMLModElement(already_AddRefed aNodeInfo); @@ -33,9 +32,6 @@ public: // nsIDOMHTMLElement NS_FORWARD_NSIDOMHTMLELEMENT_TO_GENERIC - // nsIDOMHTMLModElement - NS_DECL_NSIDOMHTMLMODELEMENT - virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE; virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; } @@ -48,7 +44,10 @@ public: { SetHTMLAttr(nsGkAtoms::cite, aCite, aRv); } - // XPCOM GetDateTime is fine. + void GetDateTime(nsAString& aDateTime) + { + GetHTMLAttr(nsGkAtoms::datetime, aDateTime); + } void SetDateTime(const nsAString& aDateTime, ErrorResult& aRv) { SetHTMLAttr(nsGkAtoms::datetime, aDateTime, aRv); diff --git a/dom/interfaces/html/moz.build b/dom/interfaces/html/moz.build index 0a55251ffd6..414166b2c69 100644 --- a/dom/interfaces/html/moz.build +++ b/dom/interfaces/html/moz.build @@ -44,7 +44,6 @@ XPIDL_SOURCES += [ 'nsIDOMHTMLMenuItemElement.idl', 'nsIDOMHTMLMetaElement.idl', 'nsIDOMHTMLMeterElement.idl', - 'nsIDOMHTMLModElement.idl', 'nsIDOMHTMLOListElement.idl', 'nsIDOMHTMLObjectElement.idl', 'nsIDOMHTMLOptGroupElement.idl', diff --git a/dom/interfaces/html/nsIDOMHTMLModElement.idl b/dom/interfaces/html/nsIDOMHTMLModElement.idl deleted file mode 100644 index 40033f8a2ab..00000000000 --- a/dom/interfaces/html/nsIDOMHTMLModElement.idl +++ /dev/null @@ -1,24 +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 nsIDOMHTMLModElement interface is the interface to a [X]HTML - * ins and del 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(8a1bdf64-19f3-401b-aaea-8c6a5ef1c66f)] -interface nsIDOMHTMLModElement : nsIDOMHTMLElement -{ - attribute DOMString cite; - attribute DOMString dateTime; -};