Bug 562688 part 2. Create a mozilla::dom::Element class sitting between nsGenericElement and nsIContent. r=jst, sr=sicking

content/base/public/Element.h

@@ -0,0 +1,64 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et :
+ * ***** 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
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Boris Zbarsky <bzbarsky@mit.edu> (Original Author)
+ *
+ * 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 ***** */
+
+#ifndef mozilla_dom_Element_h__
+#define mozilla_dom_Element_h__
+
+#include "nsIContent.h"
+
+namespace mozilla {
+namespace dom {
+
+class Element : public nsIContent
+{
+public:
+#ifdef MOZILLA_INTERNAL_API
+  Element(nsINodeInfo* aNodeInfo) : nsIContent(aNodeInfo) {}
+#endif // MOZILLA_INTERNAL_API
+};
+
+} // namespace dom
+} // namespace mozilla
+
+inline mozilla::dom::Element* nsINode::AsElement() {
+  NS_ASSERTION(IsElement(), "Not an element?");
+  return static_cast<mozilla::dom::Element*>(this);
+}
+
+#endif // mozilla_dom_Element_h__

content/base/public/Makefile.in

@@ -78,6 +78,7 @@ nsDOMFile.h \
 nsLineBreaker.h \
 nsReferencedElement.h \
 nsXMLNameSpaceMap.h \
+Element.h \
 $(NULL)
 
 ifndef DISABLE_XFORMS_HOOKS

content/base/public/nsINode.h

@@ -66,6 +66,12 @@ class nsNodeWeakReference;
 class nsNodeSupportsWeakRefTearoff;
 class nsIEditor;
 
+namespace mozilla {
+namespace dom {
+class Element;
+} // namespace dom
+} // namespace mozilla
+
 enum {
   // This bit will be set if the node doesn't have nsSlots
   NODE_DOESNT_HAVE_SLOTS =       0x00000001U,
@@ -341,6 +347,12 @@ public:
     return HasFlag(NODE_IS_ELEMENT);
   }
 
+  /**
+   * Return this node as an Element.  Should only be used for nodes
+   * for which IsElement() is true.
+   */
+  mozilla::dom::Element* AsElement();
+
   /**
    * Get the number of children
    * @return the number of children

content/base/src/nsGenericElement.cpp

@@ -1786,7 +1786,7 @@ nsGenericElement::nsDOMSlots::~nsDOMSlots()
 }
 
 nsGenericElement::nsGenericElement(nsINodeInfo *aNodeInfo)
-  : nsIContent(aNodeInfo)
+  : Element(aNodeInfo)
 {
   // Set the default scriptID to JS - but skip SetScriptTypeID as it
   // does extra work we know isn't necessary here...

content/base/src/nsGenericElement.h

@@ -46,7 +46,7 @@
 
 #include "nsCOMPtr.h"
 #include "nsAutoPtr.h"
-#include "nsIContent.h"
+#include "Element.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMDocumentFragment.h"
 #include "nsIDOMEventTarget.h"
@@ -332,7 +332,7 @@ class nsNSElementTearoff;
  * A generic base class for DOM elements, implementing many nsIContent,
  * nsIDOMNode and nsIDOMElement methods.
  */
-class nsGenericElement : public nsIContent
+class nsGenericElement : public mozilla::dom::Element
 {
 public:
   nsGenericElement(nsINodeInfo *aNodeInfo);