Bug 945572 part 1. Make NS_NewHTMLElement take an Element** outparam instead of an nsIContent** one. r=smaug

content/base/public/nsContentCreatorFunctions.h

@@ -22,6 +22,12 @@ class imgRequestProxy;
 class nsNodeInfoManager;
 class nsGenericHTMLElement;
 
+namespace mozilla {
+namespace dom {
+class Element;
+} // namespace dom
+} // namespace mozilla
+
 nsresult
 NS_NewElement(nsIContent** aResult,
               already_AddRefed<nsINodeInfo> aNodeInfo,
@@ -31,7 +37,8 @@ nsresult
 NS_NewXMLElement(nsIContent** aResult, already_AddRefed<nsINodeInfo> aNodeInfo);
 
 nsresult
-NS_NewHTMLElement(nsIContent** aResult, already_AddRefed<nsINodeInfo> aNodeInfo,
+NS_NewHTMLElement(mozilla::dom::Element** aResult,
+                  already_AddRefed<nsINodeInfo> aNodeInfo,
                   mozilla::dom::FromParser aFromParser);
 
 // First argument should be nsHTMLTag, but that adds dependency to parser

content/base/src/nsDocument.cpp

@@ -11466,13 +11466,13 @@ nsIDocument::CreateHTMLElement(nsIAtom* aTag)
                                            nsIDOMNode::ELEMENT_NODE);
   MOZ_ASSERT(nodeInfo, "GetNodeInfo should never fail");
 
-  nsCOMPtr<nsIContent> content = nullptr;
+  nsCOMPtr<Element> element;
-  DebugOnly<nsresult> rv = NS_NewHTMLElement(getter_AddRefs(content),
+  DebugOnly<nsresult> rv = NS_NewHTMLElement(getter_AddRefs(element),
                                              nodeInfo.forget(),
                                              mozilla::dom::NOT_FROM_PARSER);
 
   MOZ_ASSERT(NS_SUCCEEDED(rv), "NS_NewHTMLElement should never fail");
-  return dont_AddRef(content.forget().get()->AsElement());
+  return element.forget();
 }
 
 bool

content/base/src/nsNameSpaceManager.cpp

@@ -19,6 +19,7 @@
 #include "nsString.h"
 #include "nsINodeInfo.h"
 #include "mozilla/dom/XBLChildrenElement.h"
+#include "mozilla/dom/Element.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
@@ -193,7 +194,10 @@ NS_NewElement(nsIContent** aResult,
 {
   int32_t ns = aNodeInfo.get()->NamespaceID();
   if (ns == kNameSpaceID_XHTML) {
-    return NS_NewHTMLElement(aResult, aNodeInfo, aFromParser);
+    nsCOMPtr<Element> el;
+    nsresult rv = NS_NewHTMLElement(getter_AddRefs(el), aNodeInfo, aFromParser);
+    el.forget(aResult);
+    return rv;
   }
 #ifdef MOZ_XUL
   if (ns == kNameSpaceID_XUL) {

content/html/content/src/nsTextEditorState.h

@@ -12,7 +12,7 @@
 #include "nsITextControlElement.h"
 #include "nsITextControlFrame.h"
 #include "nsCycleCollectionParticipant.h"
-#include "nsIContent.h"
+#include "mozilla/dom/Element.h"
 #include "mozilla/WeakPtr.h"
 
 class nsTextInputListener;
@@ -142,12 +142,12 @@ public:
 
   nsresult CreatePlaceholderNode();
 
-  nsIContent* GetRootNode() {
+  mozilla::dom::Element* GetRootNode() {
     if (!mRootNode)
       CreateRootNode();
     return mRootNode;
   }
-  nsIContent* GetPlaceholderNode() {
+  mozilla::dom::Element* GetPlaceholderNode() {
     return mPlaceholderDiv;
   }
 
@@ -267,8 +267,8 @@ private:
   nsRefPtr<nsTextInputSelectionImpl> mSelCon;
   RestoreSelectionState* mRestoringSelection;
   nsCOMPtr<nsIEditor> mEditor;
-  nsCOMPtr<nsIContent> mRootNode;
+  nsCOMPtr<mozilla::dom::Element> mRootNode;
-  nsCOMPtr<nsIContent> mPlaceholderDiv;
+  nsCOMPtr<mozilla::dom::Element> mPlaceholderDiv;
   nsTextControlFrame* mBoundFrame;
   nsTextInputListener* mTextListener;
   nsAutoPtr<nsCString> mValue;

content/html/document/src/PluginDocument.cpp

@@ -44,7 +44,7 @@ public:
   virtual bool CanSavePresentation(nsIRequest *aNewRequest);
 
   const nsCString& GetType() const { return mMimeType; }
-  nsIContent*      GetPluginContent() { return mPluginContent; }
+  Element*         GetPluginContent() { return mPluginContent; }
 
   void StartLayout() { MediaDocument::StartLayout(); }
 
@@ -52,7 +52,7 @@ public:
 protected:
   nsresult CreateSyntheticPluginDocument();
 
-  nsCOMPtr<nsIContent>                     mPluginContent;
+  nsCOMPtr<Element>                        mPluginContent;
   nsRefPtr<MediaDocumentStreamListener>    mStreamListener;
   nsCString                                mMimeType;
 };

content/html/document/src/nsHTMLContentSink.cpp

@@ -242,7 +242,7 @@ public:
 };
 
 nsresult
-NS_NewHTMLElement(nsIContent** aResult, already_AddRefed<nsINodeInfo> aNodeInfo,
+NS_NewHTMLElement(Element** aResult, already_AddRefed<nsINodeInfo> aNodeInfo,
                   FromParser aFromParser)
 {
   *aResult = nullptr;

content/xslt/src/xslt/txMozillaTextOutput.cpp

@@ -242,12 +242,7 @@ nsresult
 txMozillaTextOutput::createXHTMLElement(nsIAtom* aName,
                                         nsIContent** aResult)
 {
-    *aResult = nullptr;
+    nsCOMPtr<Element> element = mDocument->CreateHTMLElement(aName);
-
+    element.forget(aResult);
-    nsCOMPtr<nsINodeInfo> ni;
+    return NS_OK;
-    ni = mDocument->NodeInfoManager()->
-        GetNodeInfo(aName, nullptr, kNameSpaceID_XHTML,
-                    nsIDOMNode::ELEMENT_NODE);
-
-    return NS_NewHTMLElement(aResult, ni.forget(), NOT_FROM_PARSER);
 }

content/xslt/src/xslt/txMozillaXMLOutput.cpp

@@ -934,9 +934,13 @@ txMozillaXMLOutput::createHTMLElement(nsIAtom* aName,
                                        kNameSpaceID_XHTML,
                                        nsIDOMNode::ELEMENT_NODE);
 
-    return NS_NewHTMLElement(aResult, ni.forget(), mCreatingNewDocument ?
+    nsCOMPtr<Element> el;
-        FROM_PARSER_XSLT : FROM_PARSER_FRAGMENT);
+    nsresult rv =
-
+        NS_NewHTMLElement(getter_AddRefs(el), ni.forget(),
+                          mCreatingNewDocument ?
+                            FROM_PARSER_XSLT : FROM_PARSER_FRAGMENT);
+    el.forget(aResult);
+    return rv;
 }
 
 txTransformNotifier::txTransformNotifier()

layout/forms/nsComboboxControlFrame.cpp

@@ -1168,13 +1168,7 @@ nsComboboxControlFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
   if (!aElements.AppendElement(mDisplayContent))
     return NS_ERROR_OUT_OF_MEMORY;
 
-  nsCOMPtr<nsINodeInfo> nodeInfo;
+  mButtonContent = mContent->OwnerDoc()->CreateHTMLElement(nsGkAtoms::button);
-  nodeInfo = nimgr->GetNodeInfo(nsGkAtoms::button, nullptr, kNameSpaceID_XHTML,
-                                nsIDOMNode::ELEMENT_NODE);
-
-  // create button which drops the list down
-  NS_NewHTMLElement(getter_AddRefs(mButtonContent), nodeInfo.forget(),
-                    dom::NOT_FROM_PARSER);
   if (!mButtonContent)
     return NS_ERROR_OUT_OF_MEMORY;
 

layout/forms/nsFileControlFrame.cpp

@@ -9,6 +9,7 @@
 #include "nsCOMPtr.h"
 #include "nsIDocument.h"
 #include "nsINodeInfo.h"
+#include "mozilla/dom/Element.h"
 #include "mozilla/dom/HTMLButtonElement.h"
 #include "mozilla/dom/HTMLInputElement.h"
 #include "nsNodeInfoManager.h"
@@ -75,14 +76,9 @@ nsresult
 nsFileControlFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
 {
   nsCOMPtr<nsIDocument> doc = mContent->GetDocument();
-  nsCOMPtr<nsINodeInfo> nodeInfo;
 
   // Create and setup the file picking button.
-  nodeInfo = doc->NodeInfoManager()->GetNodeInfo(nsGkAtoms::button, nullptr,
+  mBrowse = doc->CreateHTMLElement(nsGkAtoms::button);
-                                                 kNameSpaceID_XHTML,
-                                                 nsIDOMNode::ELEMENT_NODE);
-  NS_NewHTMLElement(getter_AddRefs(mBrowse), nodeInfo.forget(),
-                    dom::NOT_FROM_PARSER);
   // NOTE: SetIsNativeAnonymousRoot() has to be called before setting any
   // attribute.
   mBrowse->SetIsNativeAnonymousRoot();
@@ -122,6 +118,7 @@ nsFileControlFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
   }
 
   // Create and setup the text showing the selected files.
+  nsCOMPtr<nsINodeInfo> nodeInfo;
   nodeInfo = doc->NodeInfoManager()->GetNodeInfo(nsGkAtoms::label, nullptr,
                                                  kNameSpaceID_XUL,
                                                  nsIDOMNode::ELEMENT_NODE);