Bug 585933 - Only implement HTMLUnknownElement on unknown elements; r=jonas,smaug

--HG--
rename : content/html/content/src/nsHTMLSpanElement.cpp => content/html/content/src/nsHTMLUnknownElement.cpp

content/html/content/src/Makefile.in

@@ -112,6 +112,7 @@ CPPSRCS		= \
 		nsHTMLTableSectionElement.cpp \
 		nsHTMLTextAreaElement.cpp \
 		nsHTMLTitleElement.cpp \
+		nsHTMLUnknownElement.cpp \
 		nsDOMValidityState.cpp \
 		nsIConstraintValidation.cpp \
 		$(NULL)

content/html/content/src/nsHTMLSpanElement.cpp

@@ -95,34 +95,3 @@ NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLSpanElement)
 
 
 NS_IMPL_ELEMENT_CLONE(nsHTMLSpanElement)
-
-
-// ------------------------------------------------------------------
-
-class nsHTMLUnknownElement : public nsHTMLSpanElement
-{
-public:
-  nsHTMLUnknownElement(already_AddRefed<nsINodeInfo> aNodeInfo);
-
-  NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr);
-  nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
-
-  virtual nsXPCClassInfo* GetClassInfo();
-};
-
-DOMCI_NODE_DATA(HTMLUnknownElement, nsHTMLUnknownElement)
-
-NS_INTERFACE_MAP_BEGIN(nsHTMLUnknownElement)
-  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(HTMLUnknownElement)
-NS_INTERFACE_MAP_END_INHERITING(nsHTMLSpanElement)
-
-nsHTMLUnknownElement::nsHTMLUnknownElement(already_AddRefed<nsINodeInfo> aNodeInfo)
-  : nsHTMLSpanElement(aNodeInfo)
-{
-}
-
-
-NS_IMPL_NS_NEW_HTML_ELEMENT(Unknown)
-
-
-NS_IMPL_ELEMENT_CLONE(nsHTMLUnknownElement)

content/html/content/src/nsHTMLUnknownElement.cpp

@@ -0,0 +1,95 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * 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"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsGenericHTMLElement.h"
+#include "nsIDOMHTMLUnknownElement.h"
+
+class nsHTMLUnknownElement : public nsGenericHTMLElement
+                           , public nsIDOMHTMLUnknownElement
+{
+public:
+  nsHTMLUnknownElement(already_AddRefed<nsINodeInfo> aNodeInfo);
+  virtual ~nsHTMLUnknownElement();
+
+  // nsISupports
+  NS_DECL_ISUPPORTS_INHERITED
+
+  // nsIDOMNode
+  NS_FORWARD_NSIDOMNODE(nsGenericHTMLElement::)
+
+  // nsIDOMElement
+  NS_FORWARD_NSIDOMELEMENT(nsGenericHTMLElement::)
+
+  // nsIDOMHTMLElement
+  NS_FORWARD_NSIDOMHTMLELEMENT(nsGenericHTMLElement::)
+
+  virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
+
+  virtual nsXPCClassInfo* GetClassInfo();
+};
+
+
+NS_IMPL_NS_NEW_HTML_ELEMENT(Unknown)
+
+
+nsHTMLUnknownElement::nsHTMLUnknownElement(already_AddRefed<nsINodeInfo> aNodeInfo)
+  : nsGenericHTMLElement(aNodeInfo)
+{
+}
+
+nsHTMLUnknownElement::~nsHTMLUnknownElement()
+{
+}
+
+
+NS_IMPL_ADDREF_INHERITED(nsHTMLUnknownElement, nsGenericElement)
+NS_IMPL_RELEASE_INHERITED(nsHTMLUnknownElement, nsGenericElement)
+
+
+DOMCI_NODE_DATA(HTMLUnknownElement, nsHTMLUnknownElement)
+
+// QueryInterface implementation for nsHTMLUnknownElement
+NS_INTERFACE_TABLE_HEAD(nsHTMLUnknownElement)
+  NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLUnknownElement,
+                                   nsIDOMHTMLUnknownElement)
+  NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(nsHTMLUnknownElement,
+                                               nsGenericHTMLElement)
+NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLUnknownElement)
+
+
+NS_IMPL_ELEMENT_CLONE(nsHTMLUnknownElement)

content/html/content/test/test_bug389797.html

@@ -263,6 +263,10 @@ for each (var tag in allTags) {
      "Unexpected classname for " + tagName(tag));
   is(node instanceof window[classInfoString], true,
      tagName(tag) + " not an instance of " + classInfos[tag]);
+  is(node instanceof HTMLUnknownElement, false,
+     tagName(tag) + " is an instance of HTMLUnknownElement");
+  is(node instanceof Components.interfaces.nsIDOMHTMLUnknownElement, false,
+     tagName(tag) + " is an instance of nsIDOMHTMLUnknownElement");
 
   // Check that each node QIs to all the things we expect it to QI to
   for each (var iface in interfaces[tag].concat(interfacesNonClassinfo[tag])) {

dom/base/nsDOMClassInfo.cpp

@@ -314,6 +314,7 @@
 #include "nsIDOMNSHTMLTextAreaElement.h"
 #include "nsIDOMHTMLTitleElement.h"
 #include "nsIDOMHTMLUListElement.h"
+#include "nsIDOMHTMLUnknownElement.h"
 #include "nsIDOMMediaError.h"
 #include "nsIDOMTimeRanges.h"
 #include "nsIDOMHTMLSourceElement.h"
@@ -2825,8 +2826,8 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
   DOM_CLASSINFO_MAP_END
 
-  DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(HTMLUnknownElement, nsIDOMHTMLElement)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLElement)
+  DOM_CLASSINFO_MAP_BEGIN(HTMLUnknownElement, nsIDOMHTMLUnknownElement)
+    DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLUnknownElement)
     DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
   DOM_CLASSINFO_MAP_END
 

dom/interfaces/html/Makefile.in

@@ -117,6 +117,7 @@ SDK_XPIDLSRCS =					\
 
 XPIDLSRCS = 					\
 	nsIDOMHTMLCanvasElement.idl		\
+	nsIDOMHTMLUnknownElement.idl \
 	nsIDOMNSHTMLDocument.idl		\
 	nsIDOMNSHTMLElement.idl			\
 	nsIDOMNSHTMLFormElement.idl		\

dom/interfaces/html/nsIDOMHTMLUnknownElement.idl

@@ -0,0 +1,49 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Ms2ger <ms2ger@gmail.com>.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsIDOMHTMLElement.idl"
+
+/**
+ * The nsIDOMHTMLUnknownElement interface is the interface to an unknown HTML
+ * element.
+ *
+ * @see <http://www.whatwg.org/html/#htmlunknownelement>
+ */
+[scriptable, uuid(13d29c53-a9a6-45b8-bb69-e5294bb6e09e)]
+interface nsIDOMHTMLUnknownElement : nsIDOMHTMLElement
+{
+};