From 7c392f077e794e6d5d54dda83ded853754c84543 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Tue, 30 Jan 2018 00:25:36 -0500 Subject: [PATCH] Bug 1418085 part 6. Remove nsIDOMHTMLElement. r=mystor MozReview-Commit-ID: 5QUyFeAQYZQ --- docshell/base/nsDocShellTreeOwner.cpp | 1 - dom/base/ShadowRoot.cpp | 1 - dom/base/nsContentUtils.cpp | 1 - dom/events/EventStateManager.cpp | 1 - dom/html/HTMLDataElement.h | 1 - dom/html/HTMLMapElement.cpp | 5 ++--- dom/html/HTMLSlotElement.h | 3 +-- dom/html/HTMLSpanElement.h | 1 - dom/html/HTMLTemplateElement.h | 1 - dom/html/HTMLTimeElement.h | 1 - dom/html/HTMLTrackElement.h | 1 - dom/html/ImageDocument.cpp | 1 - dom/html/nsGenericHTMLElement.cpp | 2 -- dom/html/nsGenericHTMLElement.h | 4 ++-- dom/html/nsHTMLDocument.cpp | 1 - dom/interfaces/base/domstubs.idl | 1 - dom/interfaces/html/moz.build | 1 - dom/interfaces/html/nsIDOMHTMLElement.idl | 22 ------------------- dom/interfaces/html/nsIDOMHTMLFormElement.idl | 2 +- .../html/nsIDOMHTMLMediaElement.idl | 1 - dom/security/nsCSPContext.cpp | 1 - .../spellcheck/src/mozInlineSpellChecker.cpp | 1 - layout/base/PresShell.cpp | 1 - layout/base/nsDocumentViewer.cpp | 1 - layout/base/nsLayoutUtils.cpp | 1 - layout/base/nsPresContext.cpp | 1 - layout/forms/nsTextControlFrame.cpp | 1 - layout/tables/nsTableFrame.cpp | 1 - toolkit/components/find/nsWebBrowserFind.cpp | 1 - .../typeaheadfind/nsTypeAheadFind.cpp | 1 - xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp | 3 --- 31 files changed, 6 insertions(+), 59 deletions(-) delete mode 100644 dom/interfaces/html/nsIDOMHTMLElement.idl diff --git a/docshell/base/nsDocShellTreeOwner.cpp b/docshell/base/nsDocShellTreeOwner.cpp index d0f3bfb186ed..2ea226553677 100644 --- a/docshell/base/nsDocShellTreeOwner.cpp +++ b/docshell/base/nsDocShellTreeOwner.cpp @@ -40,7 +40,6 @@ #include "nsIDOMHTMLInputElement.h" #include "nsIImageLoadingContent.h" #include "nsIWebNavigation.h" -#include "nsIDOMHTMLElement.h" #include "nsIPresShell.h" #include "nsIStringBundle.h" #include "nsPIDOMWindow.h" diff --git a/dom/base/ShadowRoot.cpp b/dom/base/ShadowRoot.cpp index 8f38e3aa22cb..fc643302026c 100644 --- a/dom/base/ShadowRoot.cpp +++ b/dom/base/ShadowRoot.cpp @@ -11,7 +11,6 @@ #include "ChildIterator.h" #include "nsContentUtils.h" #include "nsDOMClassInfoID.h" -#include "nsIDOMHTMLElement.h" #include "nsIStyleSheetLinkingElement.h" #include "mozilla/dom/Element.h" #include "mozilla/dom/HTMLSlotElement.h" diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index d8ce57f773f7..d05870820393 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -133,7 +133,6 @@ #include "nsIDOMDocumentType.h" #include "nsIDOMEvent.h" #include "nsIDOMElement.h" -#include "nsIDOMHTMLElement.h" #include "nsIDOMHTMLFormElement.h" #include "nsIDOMHTMLInputElement.h" #include "nsIDOMNode.h" diff --git a/dom/events/EventStateManager.cpp b/dom/events/EventStateManager.cpp index 415f70d32e54..ea7b85aced82 100644 --- a/dom/events/EventStateManager.cpp +++ b/dom/events/EventStateManager.cpp @@ -40,7 +40,6 @@ #include "nsIFormControl.h" #include "nsIComboboxControlFrame.h" #include "nsIScrollableFrame.h" -#include "nsIDOMHTMLElement.h" #include "nsIDOMXULControlElement.h" #include "nsNameSpaceManager.h" #include "nsIBaseWindow.h" diff --git a/dom/html/HTMLDataElement.h b/dom/html/HTMLDataElement.h index d53a17179c87..0d9bec139a31 100644 --- a/dom/html/HTMLDataElement.h +++ b/dom/html/HTMLDataElement.h @@ -8,7 +8,6 @@ #define mozilla_dom_HTMLDataElement_h #include "mozilla/Attributes.h" -#include "nsIDOMHTMLElement.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" diff --git a/dom/html/HTMLMapElement.cpp b/dom/html/HTMLMapElement.cpp index 3e90c89a4e97..c9fc2cd3bcdf 100644 --- a/dom/html/HTMLMapElement.cpp +++ b/dom/html/HTMLMapElement.cpp @@ -28,9 +28,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(HTMLMapElement, NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mAreas) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_IMPL_ISUPPORTS_CYCLE_COLLECTION_INHERITED(HTMLMapElement, - nsGenericHTMLElement, - nsIDOMHTMLElement) +NS_IMPL_ISUPPORTS_CYCLE_COLLECTION_INHERITED_0(HTMLMapElement, + nsGenericHTMLElement) NS_IMPL_ELEMENT_CLONE(HTMLMapElement) diff --git a/dom/html/HTMLSlotElement.h b/dom/html/HTMLSlotElement.h index d448a85ae174..5055ec20db83 100644 --- a/dom/html/HTMLSlotElement.h +++ b/dom/html/HTMLSlotElement.h @@ -7,7 +7,6 @@ #ifndef mozilla_dom_HTMLSlotElement_h #define mozilla_dom_HTMLSlotElement_h -#include "nsIDOMHTMLElement.h" #include "nsGenericHTMLElement.h" #include "nsTArray.h" @@ -78,4 +77,4 @@ protected: } // namespace dom } // namespace mozilla -#endif // mozilla_dom_HTMLSlotElement_h \ No newline at end of file +#endif // mozilla_dom_HTMLSlotElement_h diff --git a/dom/html/HTMLSpanElement.h b/dom/html/HTMLSpanElement.h index 16fe5625d446..ac6dc0620253 100644 --- a/dom/html/HTMLSpanElement.h +++ b/dom/html/HTMLSpanElement.h @@ -8,7 +8,6 @@ #define mozilla_dom_HTMLSpanElement_h #include "mozilla/Attributes.h" -#include "nsIDOMHTMLElement.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/dom/html/HTMLTemplateElement.h b/dom/html/HTMLTemplateElement.h index a49c7203c458..ec9dbb85f52f 100644 --- a/dom/html/HTMLTemplateElement.h +++ b/dom/html/HTMLTemplateElement.h @@ -8,7 +8,6 @@ #define mozilla_dom_HTMLTemplateElement_h #include "mozilla/Attributes.h" -#include "nsIDOMHTMLElement.h" #include "nsGenericHTMLElement.h" #include "mozilla/dom/DocumentFragment.h" diff --git a/dom/html/HTMLTimeElement.h b/dom/html/HTMLTimeElement.h index c5710ddd5090..b647ae217cb5 100644 --- a/dom/html/HTMLTimeElement.h +++ b/dom/html/HTMLTimeElement.h @@ -8,7 +8,6 @@ #define mozilla_dom_HTMLTimeElement_h #include "mozilla/Attributes.h" -#include "nsIDOMHTMLElement.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" diff --git a/dom/html/HTMLTrackElement.h b/dom/html/HTMLTrackElement.h index 615df846706d..0732c6535454 100644 --- a/dom/html/HTMLTrackElement.h +++ b/dom/html/HTMLTrackElement.h @@ -13,7 +13,6 @@ #include "nsCycleCollectionParticipant.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" -#include "nsIDOMHTMLElement.h" #include "nsIDOMEventTarget.h" #include "nsIHttpChannel.h" diff --git a/dom/html/ImageDocument.cpp b/dom/html/ImageDocument.cpp index 637c72656a6c..23b0188a9b5d 100644 --- a/dom/html/ImageDocument.cpp +++ b/dom/html/ImageDocument.cpp @@ -32,7 +32,6 @@ #include "nsContentPolicyUtils.h" #include "nsPIDOMWindow.h" #include "nsIDOMElement.h" -#include "nsIDOMHTMLElement.h" #include "nsError.h" #include "nsURILoader.h" #include "nsIDocShell.h" diff --git a/dom/html/nsGenericHTMLElement.cpp b/dom/html/nsGenericHTMLElement.cpp index 2b00f4bf9786..0b40d070bc43 100644 --- a/dom/html/nsGenericHTMLElement.cpp +++ b/dom/html/nsGenericHTMLElement.cpp @@ -27,7 +27,6 @@ #include "nsIDocument.h" #include "nsIDocumentEncoder.h" #include "nsIDOMDocumentFragment.h" -#include "nsIDOMHTMLElement.h" #include "nsIDOMWindow.h" #include "nsIDOMDocument.h" #include "nsMappedAttributes.h" @@ -172,7 +171,6 @@ NS_IMPL_ADDREF_INHERITED(nsGenericHTMLElement, nsGenericHTMLElementBase) NS_IMPL_RELEASE_INHERITED(nsGenericHTMLElement, nsGenericHTMLElementBase) NS_INTERFACE_MAP_BEGIN(nsGenericHTMLElement) - NS_INTERFACE_MAP_ENTRY(nsIDOMHTMLElement) NS_INTERFACE_MAP_ENTRY(nsIDOMElement) NS_INTERFACE_MAP_ENTRY(nsIDOMNode) NS_INTERFACE_MAP_END_INHERITING(nsGenericHTMLElementBase) diff --git a/dom/html/nsGenericHTMLElement.h b/dom/html/nsGenericHTMLElement.h index e9ef12e6cea2..9cdb5b03b51a 100644 --- a/dom/html/nsGenericHTMLElement.h +++ b/dom/html/nsGenericHTMLElement.h @@ -9,7 +9,7 @@ #include "mozilla/Attributes.h" #include "mozilla/EventForwards.h" #include "nsMappedAttributeElement.h" -#include "nsIDOMHTMLElement.h" +#include "nsIDOMElement.h" #include "nsNameSpaceManager.h" // for kNameSpaceID_None #include "nsIFormControl.h" #include "nsGkAtoms.h" @@ -47,7 +47,7 @@ typedef nsMappedAttributeElement nsGenericHTMLElementBase; * A common superclass for HTML elements */ class nsGenericHTMLElement : public nsGenericHTMLElementBase, - public nsIDOMHTMLElement + public nsIDOMElement { public: using Element::SetTabIndex; diff --git a/dom/html/nsHTMLDocument.cpp b/dom/html/nsHTMLDocument.cpp index b6c1612be297..458e748f1d04 100644 --- a/dom/html/nsHTMLDocument.cpp +++ b/dom/html/nsHTMLDocument.cpp @@ -55,7 +55,6 @@ #include "nsIConsoleService.h" #include "nsIComponentManager.h" #include "nsParserCIID.h" -#include "nsIDOMHTMLElement.h" #include "nsNameSpaceManager.h" #include "nsGenericHTMLElement.h" #include "mozilla/css/Loader.h" diff --git a/dom/interfaces/base/domstubs.idl b/dom/interfaces/base/domstubs.idl index bb5c51698eaf..57e9c20fd385 100644 --- a/dom/interfaces/base/domstubs.idl +++ b/dom/interfaces/base/domstubs.idl @@ -50,7 +50,6 @@ interface nsIDOMEventTarget; interface nsIDOMEventListener; // HTML -interface nsIDOMHTMLElement; interface nsIDOMHTMLFormElement; interface nsIDOMHTMLHeadElement; diff --git a/dom/interfaces/html/moz.build b/dom/interfaces/html/moz.build index f3f8166aa8a8..f0d055fee54a 100644 --- a/dom/interfaces/html/moz.build +++ b/dom/interfaces/html/moz.build @@ -8,7 +8,6 @@ with Files("**"): BUG_COMPONENT = ("Core", "DOM") XPIDL_SOURCES += [ - 'nsIDOMHTMLElement.idl', 'nsIDOMHTMLFormElement.idl', 'nsIDOMHTMLInputElement.idl', 'nsIDOMHTMLMediaElement.idl', diff --git a/dom/interfaces/html/nsIDOMHTMLElement.idl b/dom/interfaces/html/nsIDOMHTMLElement.idl deleted file mode 100644 index 891372d725da..000000000000 --- a/dom/interfaces/html/nsIDOMHTMLElement.idl +++ /dev/null @@ -1,22 +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 "nsIDOMElement.idl" - -/** - * The nsIDOMHTMLElement interface is the primary [X]HTML element - * interface. It represents a single [X]HTML element in the document - * tree. - * - * 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/ - */ -[uuid(b0c42392-d0e7-4f6a-beb5-a698ce648945)] -interface nsIDOMHTMLElement : nsIDOMElement -{ -}; diff --git a/dom/interfaces/html/nsIDOMHTMLFormElement.idl b/dom/interfaces/html/nsIDOMHTMLFormElement.idl index 8d35d47bab3d..5a86ba34d97e 100644 --- a/dom/interfaces/html/nsIDOMHTMLFormElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLFormElement.idl @@ -3,7 +3,7 @@ * 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" +#include "nsISupports.idl" /** * The nsIDOMHTMLFormElement interface is the interface to a [X]HTML diff --git a/dom/interfaces/html/nsIDOMHTMLMediaElement.idl b/dom/interfaces/html/nsIDOMHTMLMediaElement.idl index e64624033e0c..33b1797f7dcb 100644 --- a/dom/interfaces/html/nsIDOMHTMLMediaElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLMediaElement.idl @@ -4,7 +4,6 @@ * 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" #include "nsIDOMTimeRanges.idl" /** diff --git a/dom/security/nsCSPContext.cpp b/dom/security/nsCSPContext.cpp index 8944270cd48d..79f4edbec1c2 100644 --- a/dom/security/nsCSPContext.cpp +++ b/dom/security/nsCSPContext.cpp @@ -19,7 +19,6 @@ #include "nsIDocShell.h" #include "nsIDocShellTreeItem.h" #include "nsIDOMDocument.h" -#include "nsIDOMHTMLElement.h" #include "nsIDOMNode.h" #include "nsIHttpChannel.h" #include "nsIInterfaceRequestor.h" diff --git a/extensions/spellcheck/src/mozInlineSpellChecker.cpp b/extensions/spellcheck/src/mozInlineSpellChecker.cpp index 59907fec019b..5280d1348868 100644 --- a/extensions/spellcheck/src/mozInlineSpellChecker.cpp +++ b/extensions/spellcheck/src/mozInlineSpellChecker.cpp @@ -48,7 +48,6 @@ #include "nsIDOMNode.h" #include "nsIDOMDocument.h" #include "nsIDOMElement.h" -#include "nsIDOMHTMLElement.h" #include "nsIDOMMouseEvent.h" #include "nsIDOMKeyEvent.h" #include "nsIDOMNode.h" diff --git a/layout/base/PresShell.cpp b/layout/base/PresShell.cpp index 6f4c1ed84aeb..3b5c4e417a38 100644 --- a/layout/base/PresShell.cpp +++ b/layout/base/PresShell.cpp @@ -170,7 +170,6 @@ #include "ChildIterator.h" #include "mozilla/RestyleManager.h" #include "mozilla/RestyleManagerInlines.h" -#include "nsIDOMHTMLElement.h" #include "nsIDragSession.h" #include "nsIFrameInlines.h" #include "mozilla/gfx/2D.h" diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp index 5121176d24cb..f89d96e09e55 100644 --- a/layout/base/nsDocumentViewer.cpp +++ b/layout/base/nsDocumentViewer.cpp @@ -33,7 +33,6 @@ #include "nsIDOMDocument.h" #include "nsISelectionListener.h" #include "mozilla/dom/Selection.h" -#include "nsIDOMHTMLElement.h" #include "nsContentUtils.h" #include "nsLayoutStylesheetCache.h" #ifdef ACCESSIBILITY diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp index ca4493cb6c30..59e2fe0db698 100644 --- a/layout/base/nsLayoutUtils.cpp +++ b/layout/base/nsLayoutUtils.cpp @@ -26,7 +26,6 @@ #include "nsFontMetrics.h" #include "nsPresContext.h" #include "nsIContent.h" -#include "nsIDOMHTMLElement.h" #include "nsFrameList.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp index d3e0f3d64e96..5dc72cd12333 100644 --- a/layout/base/nsPresContext.cpp +++ b/layout/base/nsPresContext.cpp @@ -32,7 +32,6 @@ #include "mozilla/LookAndFeel.h" #include "nsIInterfaceRequestorUtils.h" #include "nsHTMLDocument.h" -#include "nsIDOMHTMLElement.h" #include "nsIWeakReferenceUtils.h" #include "nsThreadUtils.h" #include "nsFrameManager.h" diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp index 6f57841ce4be..8231a452b0ab 100644 --- a/layout/forms/nsTextControlFrame.cpp +++ b/layout/forms/nsTextControlFrame.cpp @@ -24,7 +24,6 @@ #include "nsGkAtoms.h" #include "nsLayoutUtils.h" #include "nsIDOMElement.h" -#include "nsIDOMHTMLElement.h" #include "nsIPresShell.h" #include diff --git a/layout/tables/nsTableFrame.cpp b/layout/tables/nsTableFrame.cpp index 100bd4fee44e..6eb004248567 100644 --- a/layout/tables/nsTableFrame.cpp +++ b/layout/tables/nsTableFrame.cpp @@ -34,7 +34,6 @@ #include "nsCSSAnonBoxes.h" #include "nsIPresShell.h" #include "nsIDOMElement.h" -#include "nsIDOMHTMLElement.h" #include "nsIScriptError.h" #include "nsFrameManager.h" #include "nsError.h" diff --git a/toolkit/components/find/nsWebBrowserFind.cpp b/toolkit/components/find/nsWebBrowserFind.cpp index 62507452180f..369eb885ed99 100644 --- a/toolkit/components/find/nsWebBrowserFind.cpp +++ b/toolkit/components/find/nsWebBrowserFind.cpp @@ -26,7 +26,6 @@ #include "nsIFrame.h" #include "nsITextControlFrame.h" #include "nsReadableUtils.h" -#include "nsIDOMHTMLElement.h" #include "nsIContent.h" #include "nsContentCID.h" #include "nsIServiceManager.h" diff --git a/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp b/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp index 0f8d0912e5d5..a8a998663a69 100644 --- a/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp +++ b/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp @@ -29,7 +29,6 @@ #include "nsIFrame.h" #include "nsFrameTraversal.h" #include "nsIImageDocument.h" -#include "nsIDOMHTMLElement.h" #include "nsIDOMDocument.h" #include "nsIDocument.h" #include "nsISelection.h" diff --git a/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp b/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp index 25b9bf340e13..a6a4c44a79cc 100644 --- a/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp +++ b/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp @@ -38,7 +38,6 @@ #include "nsIDOMFormData.h" #include "nsIDOMGeoPositionError.h" #include "nsIDOMHistory.h" -#include "nsIDOMHTMLElement.h" #include "nsIDOMHTMLFormElement.h" #include "nsIDOMHTMLInputElement.h" #include "nsIDOMHTMLMediaElement.h" @@ -125,7 +124,6 @@ #include "mozilla/dom/HTMLAnchorElementBinding.h" #include "mozilla/dom/HTMLAreaElementBinding.h" #include "mozilla/dom/HTMLButtonElementBinding.h" -#include "mozilla/dom/HTMLElementBinding.h" #include "mozilla/dom/HTMLFormElementBinding.h" #include "mozilla/dom/HTMLFrameSetElementBinding.h" #include "mozilla/dom/HTMLHtmlElementBinding.h" @@ -266,7 +264,6 @@ const ComponentsInterfaceShimEntry kComponentsInterfaceShimMap[] = DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIFrameLoader, FrameLoader), DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIDOMGeoPositionError, PositionError), DEFINE_SHIM(History), - DEFINE_SHIM(HTMLElement), DEFINE_SHIM(HTMLFormElement), DEFINE_SHIM(HTMLInputElement), DEFINE_SHIM(HTMLMediaElement),