Bug 587463 - Drop support for HTMLDelElement and HTMLInsElement; r=jonas

--HG--
rename : content/html/content/src/nsHTMLDelElement.cpp => content/html/content/src/nsHTMLModElement.cpp

content/html/content/src/Makefile.in

@@ -68,7 +68,6 @@ CPPSRCS		= \
 		nsHTMLButtonElement.cpp \
 		nsHTMLCanvasElement.cpp \
 		nsHTMLDataListElement.cpp \
-		nsHTMLDelElement.cpp \
 		nsHTMLDivElement.cpp \
 		nsHTMLFieldSetElement.cpp \
 		nsHTMLFontElement.cpp \
@@ -86,6 +85,7 @@ CPPSRCS		= \
 		nsHTMLLinkElement.cpp \
 		nsHTMLMapElement.cpp \
 		nsHTMLMetaElement.cpp \
+		nsHTMLModElement.cpp \
 		nsHTMLObjectElement.cpp \
 		nsHTMLOListElement.cpp \
 		nsHTMLSharedObjectElement.cpp \

content/html/content/src/nsHTMLModElement.cpp

@@ -20,6 +20,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
+ *   Ms2ger <ms2ger@gmail.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either of the GNU General Public License Version 2 or later (the "GPL"),
@@ -34,13 +35,13 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
+
 #include "nsIDOMHTMLModElement.h"
 #include "nsIDOMEventTarget.h"
 #include "nsGenericHTMLElement.h"
 #include "nsGkAtoms.h"
 #include "nsStyleConsts.h"
 
-
 class nsHTMLModElement : public nsGenericHTMLElement,
                          public nsIDOMHTMLModElement
 {
@@ -64,11 +65,8 @@ public:
   NS_DECL_NSIDOMHTMLMODELEMENT
 
   virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
-  virtual nsXPCClassInfo* GetClassInfo()
+
-  {
+  virtual nsXPCClassInfo* GetClassInfo();
-    return static_cast<nsXPCClassInfo*>(GetClassInfoInternal());
-  }
-  nsIClassInfo* GetClassInfoInternal();
 };
 
 
@@ -87,28 +85,15 @@ nsHTMLModElement::~nsHTMLModElement()
 NS_IMPL_ADDREF_INHERITED(nsHTMLModElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLModElement, nsGenericElement)
 
-DOMCI_DATA(HTMLDelElement, nsHTMLModElement)
+DOMCI_NODE_DATA(HTMLModElement, nsHTMLModElement)
-DOMCI_DATA(HTMLInsElement, nsHTMLModElement)
-
-nsIClassInfo* 
-nsHTMLModElement::GetClassInfoInternal()
-{
-  if (mNodeInfo->Equals(nsGkAtoms::del)) {
-    return NS_GetDOMClassInfoInstance(eDOMClassInfo_HTMLDelElement_id);
-  }
-  if (mNodeInfo->Equals(nsGkAtoms::ins)) {
-    return NS_GetDOMClassInfoInstance(eDOMClassInfo_HTMLInsElement_id);
-  }
-  return nsnull;
-}
 
 // QueryInterface implementation for nsHTMLModElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLModElement)
-  NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLModElement, nsIDOMHTMLModElement)
+  NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLModElement,
+                                   nsIDOMHTMLModElement)
   NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(nsHTMLModElement,
                                                nsGenericHTMLElement)
-  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO_GETTER(GetClassInfoInternal)
+NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLModElement)
-NS_HTML_CONTENT_INTERFACE_MAP_END
 
 
 NS_IMPL_ELEMENT_CLONE(nsHTMLModElement)

content/html/content/test/test_bug389797.html

@@ -52,11 +52,9 @@ function HTML_TAG(aTagName, aImplClass) {
   if (interfaceName in Components.interfaces) {  // no nsIDOMHTMLSpanElement
     interfaces[aTagName].push(interfaceName);
     interfacesNonClassinfo[aTagName].push("nsIDOMHTMLElement");
-  } else if (aTagName != "ins" && aTagName != "del") {
+  } else {
-    // Inherits directly from nsIDOMHTMLElement, unless it's "ins" or "del",
+    // Inherits directly from nsIDOMHTMLElement.
-    // which are weird.
     interfaces[aTagName].push("nsIDOMHTMLElement");
-    
   }
 
   var interfaceNameNS = "nsIDOMNS" + getClassName(aTagName);
@@ -95,11 +93,9 @@ objectIfaces2.push("nsIImageLoadingContent");
    applet
    base
    blockquote
-   del
    dir
    dl
    embed
-   ins
    isindex
    menu
    ol
@@ -112,45 +108,45 @@ objectIfaces2.push("nsIImageLoadingContent");
  */
 
 HTML_TAG("a", "Anchor");
-HTML_TAG("abbr", ""); // HTMLElement
+HTML_TAG("abbr", "");
-HTML_TAG("acronym", ""); // HTMLElement
+HTML_TAG("acronym", "");
-HTML_TAG("address", ""); // HTMLElement
+HTML_TAG("address", "");
 HTML_TAG("applet", "Applet", [], objectIfaces);
 HTML_TAG("area", "Area");
-HTML_TAG("article", ""); // HTMLElement
+HTML_TAG("article", "");
-HTML_TAG("aside", ""); // HTMLElement
+HTML_TAG("aside", "");
-HTML_TAG("b", ""); // HTMLElement
+HTML_TAG("b", "");
 HTML_TAG("base", "Base");
-HTML_TAG("bdo", ""); // HTMLElement
+HTML_TAG("bdo", "");
 HTML_TAG("bgsound", "Span");
-HTML_TAG("big", ""); // HTMLElement
+HTML_TAG("big", "");
-HTML_TAG("blink", ""); // HTMLElement
+HTML_TAG("blink", "");
 HTML_TAG("blockquote", "Quote");
 HTML_TAG("body", "Body");
 HTML_TAG("br", "BR");
 HTML_TAG("button", "Button");
 HTML_TAG("canvas", "Canvas");
 HTML_TAG("caption", "TableCaption");
-HTML_TAG("center", ""); // HTMLElement
+HTML_TAG("center", "");
-HTML_TAG("cite", ""); // HTMLElement
+HTML_TAG("cite", "");
-HTML_TAG("code", ""); // HTMLElement
+HTML_TAG("code", "");
 HTML_TAG("col", "TableCol");
 HTML_TAG("colgroup", "TableCol");
 HTML_TAG("datalist", "DataList");
-HTML_TAG("dd", ""); // HTMLElement
+HTML_TAG("dd", "");
-HTML_TAG("del", "Del", [ "nsIDOMHTMLModElement" ]);
+HTML_TAG("del", "Mod");
-HTML_TAG("dfn", ""); // HTMLElement
+HTML_TAG("dfn", "");
 HTML_TAG("dir", "Directory");
 HTML_TAG("div", "Div");
 HTML_TAG("dl", "DList");
-HTML_TAG("dt", ""); // HTMLElement
+HTML_TAG("dt", "");
-HTML_TAG("em", ""); // HTMLElement
+HTML_TAG("em", "");
 HTML_TAG("embed", "Embed", [ "nsIDOMGetSVGDocument" ], objectIfaces);
 HTML_TAG("fieldset", "FieldSet");
-HTML_TAG("figcaption", "") // HTMLElement
+HTML_TAG("figcaption", "")
-HTML_TAG("figure", "") // HTMLElement
+HTML_TAG("figure", "")
 HTML_TAG("font", "Font");
-HTML_TAG("footer", "") // HTMLElement
+HTML_TAG("footer", "")
 HTML_TAG("form", "Form", [], [ "nsIWebProgressListener" ]);
 HTML_TAG("frame", "Frame", [], [ "nsIFrameLoaderOwner" ]);
 HTML_TAG("frameset", "FrameSet");
@@ -161,11 +157,11 @@ HTML_TAG("h4", "Heading");
 HTML_TAG("h5", "Heading");
 HTML_TAG("h6", "Heading");
 HTML_TAG("head", "Head");
-HTML_TAG("header", "") // HTMLElement
+HTML_TAG("header", "")
-HTML_TAG("hgroup", "") // HTMLElement
+HTML_TAG("hgroup", "")
 HTML_TAG("hr", "HR");
 HTML_TAG("html", "Html");
-HTML_TAG("i", ""); // HTMLElement
+HTML_TAG("i", "");
 HTML_TAG("iframe", "IFrame", [ "nsIDOMNSHTMLFrameElement", "nsIDOMGetSVGDocument" ],
                              [ "nsIFrameLoaderOwner" ]);
 HTML_TAG("image", "Span");
@@ -174,26 +170,26 @@ HTML_TAG("img", "Image", [], [ "imgIDecoderObserver",
 HTML_TAG("input", "Input", [], [ "imgIDecoderObserver",
                                  "nsIImageLoadingContent",
                                  "nsIDOMNSEditableElement" ]);
-HTML_TAG("ins", "Ins", [ "nsIDOMHTMLModElement" ]);
+HTML_TAG("ins", "Mod");
-HTML_TAG("isindex", ""); // HTMLElement
+HTML_TAG("isindex", "");
-HTML_TAG("kbd", ""); // HTMLElement
+HTML_TAG("kbd", "");
 HTML_TAG("keygen", "Span");
 HTML_TAG("label", "Label");
 HTML_TAG("legend", "Legend");
 HTML_TAG("li", "LI");
 HTML_TAG("link", "Link", [ "nsIDOMLinkStyle" ]);
-HTML_TAG("listing", ""); // HTMLElement
+HTML_TAG("listing", "");
 HTML_TAG("map", "Map");
-HTML_TAG("mark", ""); // HTMLElement
+HTML_TAG("mark", "");
 HTML_TAG("marquee", "Div");
 HTML_TAG("menu", "Menu");
 HTML_TAG("meta", "Meta");
 HTML_TAG("multicol", "Span");
-HTML_TAG("nav", "") // HTMLElement
+HTML_TAG("nav", "")
-HTML_TAG("nobr", ""); // HTMLElement
+HTML_TAG("nobr", "");
-HTML_TAG("noembed", ""); // HTMLElement
+HTML_TAG("noembed", "");
-HTML_TAG("noframes", ""); // HTMLElement
+HTML_TAG("noframes", "");
-HTML_TAG("noscript", ""); // HTMLElement
+HTML_TAG("noscript", "");
 HTML_TAG("object", "Object", [ "nsIDOMGetSVGDocument" ],
                              objectIfaces.concat([ "nsIImageLoadingContent" ]));
 HTML_TAG("ol", "OList");
@@ -201,21 +197,21 @@ HTML_TAG("optgroup", "OptGroup");
 HTML_TAG("option", "Option");
 HTML_TAG("p", "Paragraph");
 HTML_TAG("param", "Param");
-HTML_TAG("plaintext", ""); // HTMLElement
+HTML_TAG("plaintext", "");
 HTML_TAG("pre", "Pre");
 HTML_TAG("q", "Quote");
-HTML_TAG("s", ""); // HTMLElement
+HTML_TAG("s", "");
-HTML_TAG("samp", ""); // HTMLElement
+HTML_TAG("samp", "");
 HTML_TAG("script", "Script", [], [ "nsIScriptLoaderObserver" ]);
-HTML_TAG("section", "") // HTMLElement
+HTML_TAG("section", "")
 HTML_TAG("select", "Select", ["nsIDOMHTMLSelectElement"]);
-HTML_TAG("small", ""); // HTMLElement
+HTML_TAG("small", "");
 HTML_TAG("span", "Span");
-HTML_TAG("strike", ""); // HTMLElement
+HTML_TAG("strike", "");
-HTML_TAG("strong", ""); // HTMLElement
+HTML_TAG("strong", "");
 HTML_TAG("style", "Style", [ "nsIDOMLinkStyle" ]);
-HTML_TAG("sub", ""); // HTMLElement
+HTML_TAG("sub", "");
-HTML_TAG("sup", ""); // HTMLElement
+HTML_TAG("sup", "");
 HTML_TAG("table", "Table");
 HTML_TAG("tbody", "TableSection");
 HTML_TAG("td", "TableCell");
@@ -225,12 +221,12 @@ HTML_TAG("th", "TableCell");
 HTML_TAG("thead", "TableSection");
 HTML_TAG("title", "Title");
 HTML_TAG("tr", "TableRow");
-HTML_TAG("tt", ""); // HTMLElement
+HTML_TAG("tt", "");
-HTML_TAG("u", ""); // HTMLElement
+HTML_TAG("u", "");
 HTML_TAG("ul", "UList");
-HTML_TAG("var", ""); // HTMLElement
+HTML_TAG("var", "");
-HTML_TAG("wbr", ""); // HTMLElement
+HTML_TAG("wbr", "");
-HTML_TAG("xmp", ""); // HTMLElement
+HTML_TAG("xmp", "");
 
 function tagName(aTag) {
   return "<" + aTag + ">";

dom/base/nsDOMClassInfo.cpp

@@ -795,8 +795,6 @@ static nsDOMClassInfoData sClassInfoData[] = {
                            ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(HTMLDListElement, nsElementSH,
                            ELEMENT_SCRIPTABLE_FLAGS)
-  NS_DEFINE_CLASSINFO_DATA(HTMLDelElement, nsElementSH,
-                           ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(HTMLDirectoryElement, nsElementSH,
                            ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(HTMLDivElement, nsElementSH,
@@ -829,8 +827,6 @@ static nsDOMClassInfoData sClassInfoData[] = {
                            ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(HTMLInputElement, nsElementSH,
                            ELEMENT_SCRIPTABLE_FLAGS)
-  NS_DEFINE_CLASSINFO_DATA(HTMLInsElement, nsElementSH,
-                           ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(HTMLIsIndexElement, nsElementSH,
                            ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(HTMLLIElement, nsElementSH,
@@ -847,6 +843,8 @@ static nsDOMClassInfoData sClassInfoData[] = {
                            ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(HTMLMetaElement, nsElementSH,
                            ELEMENT_SCRIPTABLE_FLAGS)
+  NS_DEFINE_CLASSINFO_DATA(HTMLModElement, nsElementSH,
+                           ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(HTMLOListElement, nsElementSH,
                            ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(HTMLObjectElement, nsHTMLPluginObjElementSH,
@@ -2728,11 +2726,6 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
   DOM_CLASSINFO_MAP_END
 
-  DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(HTMLDelElement, nsIDOMHTMLElement)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLModElement)
-    DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
-  DOM_CLASSINFO_MAP_END
-
   DOM_CLASSINFO_MAP_BEGIN(HTMLDirectoryElement, nsIDOMHTMLDirectoryElement)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLDirectoryElement)
     DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
@@ -2814,11 +2807,6 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
   DOM_CLASSINFO_MAP_END
 
-  DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(HTMLInsElement, nsIDOMHTMLElement)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLModElement)
-    DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
-  DOM_CLASSINFO_MAP_END
-
   DOM_CLASSINFO_MAP_BEGIN(HTMLIsIndexElement, nsIDOMHTMLIsIndexElement)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLIsIndexElement)
     DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
@@ -2860,6 +2848,11 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
   DOM_CLASSINFO_MAP_END
 
+  DOM_CLASSINFO_MAP_BEGIN(HTMLModElement, nsIDOMHTMLModElement)
+    DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLModElement)
+    DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
+  DOM_CLASSINFO_MAP_END
+
   DOM_CLASSINFO_MAP_BEGIN(HTMLOListElement, nsIDOMHTMLOListElement)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLOListElement)
     DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES

dom/base/nsDOMClassInfoClasses.h

@@ -94,7 +94,6 @@ DOMCI_CLASS(HTMLBodyElement)
 DOMCI_CLASS(HTMLButtonElement)
 DOMCI_CLASS(HTMLDataListElement)
 DOMCI_CLASS(HTMLDListElement)
-DOMCI_CLASS(HTMLDelElement)
 DOMCI_CLASS(HTMLDirectoryElement)
 DOMCI_CLASS(HTMLDivElement)
 DOMCI_CLASS(HTMLEmbedElement)
@@ -110,7 +109,6 @@ DOMCI_CLASS(HTMLHtmlElement)
 DOMCI_CLASS(HTMLIFrameElement)
 DOMCI_CLASS(HTMLImageElement)
 DOMCI_CLASS(HTMLInputElement)
-DOMCI_CLASS(HTMLInsElement)
 DOMCI_CLASS(HTMLIsIndexElement)
 DOMCI_CLASS(HTMLLIElement)
 DOMCI_CLASS(HTMLLabelElement)
@@ -119,6 +117,7 @@ DOMCI_CLASS(HTMLLinkElement)
 DOMCI_CLASS(HTMLMapElement)
 DOMCI_CLASS(HTMLMenuElement)
 DOMCI_CLASS(HTMLMetaElement)
+DOMCI_CLASS(HTMLModElement)
 DOMCI_CLASS(HTMLOListElement)
 DOMCI_CLASS(HTMLObjectElement)
 DOMCI_CLASS(HTMLOptGroupElement)