Miscellaneous cleanup. r/sr=jst.

content/base/src/mozSanitizingSerializer.cpp

@@ -54,7 +54,6 @@
 #include "nsHTMLAtoms.h"
 #include "nsIDOMText.h"
 #include "nsIDOMElement.h"
-#include "nsIHTMLContent.h"
 #include "nsITextContent.h"
 #include "nsTextFragment.h"
 #include "nsContentUtils.h"

content/base/src/nsContentUtils.cpp

@@ -981,7 +981,6 @@ nsContentUtils::GetAncestorsAndOffsets(nsIDOMNode* aNode,
 {
   NS_ENSURE_ARG_POINTER(aNode);
 
-  PRInt32 offset = 0;
   nsCOMPtr<nsIContent> content(do_QueryInterface(aNode));
 
   if (!content) {
@@ -1006,9 +1005,8 @@ nsContentUtils::GetAncestorsAndOffsets(nsIDOMNode* aNode,
   nsIContent* child = content;
   nsIContent* parent = child->GetParent();
   while (parent) {
-    offset = parent->IndexOf(child);
     aAncestorNodes->AppendElement(parent);
-    aAncestorOffsets->AppendElement(NS_INT32_TO_PTR(offset));
+    aAncestorOffsets->AppendElement(NS_INT32_TO_PTR(parent->IndexOf(child)));
     child = parent;
     parent = parent->GetParent();
   }

content/base/src/nsDOMAttributeMap.cpp

@@ -233,7 +233,7 @@ nsDOMAttributeMap::Item(PRUint32 aIndex, nsIDOMNode** aReturn)
                                            &nameSpaceID,
                                            getter_AddRefs(nameAtom),
                                            getter_AddRefs(prefix)))) {
-    nsAutoString value, name;
+    nsAutoString value;
     mContent->GetAttr(nameSpaceID, nameAtom, value);
 
     nsINodeInfo *contentNi = mContent->GetNodeInfo();

content/base/src/nsDocumentViewer.cpp

@@ -184,7 +184,6 @@ static const char sPrintOptionsContractID[]         = "@mozilla.org/gfx/printset
 #include "nsINodeInfo.h"
 #include "nsIDocument.h"
 #include "nsHTMLAtoms.h"
-#include "nsIHTMLContent.h"
 #include "nsIWebShell.h"
 
 //focus

content/base/src/nsGenericDOMDataNode.cpp

@@ -58,15 +58,6 @@
 #include "pldhash.h"
 #include "prprf.h"
 
-// static
-void
-nsGenericDOMDataNode::Shutdown()
-{
-}
-
-
-//----------------------------------------------------------------------
-
 nsGenericDOMDataNode::nsGenericDOMDataNode()
   : mText()
 {

content/base/src/nsGenericDOMDataNode.h

@@ -245,8 +245,6 @@ public:
   void ToCString(nsAString& aBuf, PRInt32 aOffset, PRInt32 aLen) const;
 #endif
 
-  static void Shutdown();
-
 protected:
   nsTextFragment mText;
 

content/base/src/nsHTMLContentSerializer.cpp

@@ -56,7 +56,6 @@
 #include "nsEscape.h"
 #include "nsITextToSubURI.h"
 #include "nsCRT.h"
-#include "nsIHTMLContent.h"
 #include "nsIParserService.h"
 #include "nsContentUtils.h"
 #include "nsILineBreakerFactory.h"

content/base/src/nsImageLoadingContent.cpp

@@ -39,7 +39,6 @@
 #include "nsImageLoadingContent.h"
 #include "nsContentErrors.h"
 #include "nsIContent.h"
-#include "nsIHTMLContent.h"
 #include "nsIDocument.h"
 #include "nsINodeInfo.h"
 #include "nsIScriptGlobalObject.h"

content/base/src/nsNameSpaceManager.cpp

@@ -42,11 +42,8 @@
 #include "nsIElementFactory.h"
 #include "nsIServiceManager.h"
 #include "nsDoubleHashtable.h"
-#include "nsVoidArray.h"
 #include "nsLayoutAtoms.h"
 #include "nsString.h"
-#include "nsCRT.h"
-#include "nsContentCID.h"
 
 static nsINameSpaceManager* gNameSpaceManager = nsnull;
 

content/base/src/nsPlainTextSerializer.cpp

@@ -48,7 +48,6 @@
 #include "nsIDOMText.h"
 #include "nsIDOMElement.h"
 #include "nsINameSpaceManager.h"
-#include "nsIHTMLContent.h"
 #include "nsITextContent.h"
 #include "nsTextFragment.h"
 #include "nsContentUtils.h"

content/base/src/nsPrintData.cpp

@@ -45,7 +45,6 @@
 #include "nsISelection.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIDocShell.h"
-#include "nsIHTMLContent.h"
 #include "nsIURI.h"
 #include "nsINodeInfo.h"
 

content/base/src/nsPrintEngine.cpp

@@ -45,7 +45,6 @@
 #include "nsISelection.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIDocShell.h"
-#include "nsIHTMLContent.h"
 #include "nsIURI.h"
 #include "nsINodeInfo.h"
 
@@ -106,7 +105,6 @@ static const char kPrintingPromptService[] = "@mozilla.org/embedcomp/printingpro
 #include "nsINodeInfo.h"
 #include "nsIDocument.h"
 #include "nsHTMLAtoms.h"
-#include "nsIHTMLContent.h"
 #include "nsIWebShell.h"
 
 // Focus

content/html/content/src/nsAttributeContent.cpp

@@ -1,516 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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):
- *   Pierre Phaneuf <pp@ludusdesign.com>
- *
- *
- * 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 NPL, 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 NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-#include "nsGenericElement.h"
-#include "nsIDocument.h"
-#include "nsIDocument.h"
-#include "nsIDOMRange.h"
-#include "nsIDOMDocument.h"
-#include "nsIDOMDocumentFragment.h"
-#include "nsRange.h"
-
-#include "nsISelection.h"
-#include "nsIEnumerator.h"
-
-#include "nsCRT.h"
-#include "nsIEventStateManager.h"
-#include "nsIPrivateDOMEvent.h"
-#include "nsIDOMEvent.h"
-#include "nsIDOMText.h"
-#include "nsIDOMScriptObjectFactory.h"
-#include "prprf.h"
-#include "nsCOMPtr.h"
-
-#include "nsIContent.h"
-#include "nsTextFragment.h"
-#include "nsVoidArray.h"
-#include "nsINameSpaceManager.h"
-#include "nsITextContent.h"
-#include "nsIURI.h"
-#include "nsLayoutAtoms.h"
-// XXX share all id's in this dir
-
-
-class nsAttributeContent : public nsITextContent
-{
-public:
-  nsAttributeContent(nsIContent* aContent, PRInt32 aNameSpaceID,
-                     nsIAtom* aAttrName);
-  virtual ~nsAttributeContent();
-
-  // nsISupports
-  NS_DECL_ISUPPORTS
-
-  // Implementation for nsIContent
-  virtual PRBool IsNativeAnonymous() const { return PR_TRUE; }
-  virtual void SetNativeAnonymous(PRBool aAnonymous) { }
-
-  virtual void GetNameSpaceID(PRInt32* aID) const
-  {
-    *aID = kNameSpaceID_None;
-  }
-
-  virtual nsIAtom *Tag() const
-  {
-    return nsLayoutAtoms::textTagName;
-  }
-
-  virtual nsINodeInfo *GetNodeInfo() const
-  {
-    return nsnull;
-  }
-
-  virtual nsIAtom *GetIDAttributeName() const
-  {
-    return nsnull;
-  }
-  
-  virtual nsIAtom * GetClassAttributeName() const
-  {
-    return nsnull;
-  }
-  
-  virtual already_AddRefed<nsINodeInfo> GetExistingAttrNameFromQName(const nsAString& aStr) const
-  {
-    return nsnull; 
-  }
-
-  virtual nsIContent *GetBindingParent() const {
-    return nsnull;
-  }
-
-  virtual nsresult SetBindingParent(nsIContent* aParent) {
-    return NS_OK;
-  }
-
-  virtual PRBool IsContentOfType(PRUint32 aFlags) const {
-    return !(aFlags & ~eTEXT);
-  }
-
-  virtual nsresult GetListenerManager(nsIEventListenerManager **aResult) {
-    return NS_ERROR_NOT_IMPLEMENTED;
-  }
-
-  virtual already_AddRefed<nsIURI> GetBaseURI() const;
-  
-  nsresult SetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
-                   const nsAString& aValue, PRBool aNotify)
-  {
-    return SetAttr(aNameSpaceID, aName, nsnull, aValue, aNotify);
-  }
-  virtual nsresult SetAttr(PRInt32 aNameSpaceID, nsIAtom* aAttribute, nsIAtom* aPrefix, const nsAString& aValue,
-                           PRBool aNotify) {  return NS_OK; }
-  virtual nsresult SetAttr(nsINodeInfo *aNodeInfo, const nsAString& aValue,
-                           PRBool aNotify) {  return NS_OK; }
-  virtual nsresult UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRBool aNotify) { return NS_OK; }
-  virtual nsresult GetAttr(PRInt32 aNameSpaceID, nsIAtom *aAttribute, nsAString& aResult) const {return NS_CONTENT_ATTR_NOT_THERE; }
-  virtual PRBool HasAttr(PRInt32 aNameSpaceID, nsIAtom *aAttribute) const {
-    return PR_FALSE;
-  }
-  virtual nsresult GetAttrNameAt(PRUint32 aIndex, PRInt32* aNameSpaceID,
-                                 nsIAtom** aName, nsIAtom** aPrefix) const {
-    aName = nsnull;
-    aPrefix = nsnull;
-    return NS_ERROR_ILLEGAL_VALUE;
-  }
-
-  virtual PRUint32 GetAttrCount() const { return 0; }
-
-#ifdef DEBUG
-  void List(FILE* out, PRInt32 aIndent) const { }
-  void DumpContent(FILE* out, PRInt32 aIndent, PRBool aDumpAll) const { }
-#endif
-  virtual nsresult HandleDOMEvent(nsIPresContext* aPresContext,
-                                  nsEvent* aEvent, nsIDOMEvent** aDOMEvent,
-                                  PRUint32 aFlags,
-                                  nsEventStatus* aEventStatus);
-
-  virtual PRUint32 ContentID() const {
-    NS_ERROR("nsAttributeContent::ContentID() not implemented!");
-    return 0;
-  }
-
-  virtual nsresult RangeAdd(nsIDOMRange* aRange);
-  virtual void RangeRemove(nsIDOMRange* aRange);
-  const nsVoidArray * GetRangeList() const;
-
-  // Implementation for nsIContent
-  virtual PRBool CanContainChildren() const { return PR_FALSE; }
-
-  virtual PRUint32 GetChildCount() const { return 0; }
-  virtual nsIContent *GetChildAt(PRUint32 aIndex) const { return nsnull; }
-  virtual PRInt32 IndexOf(nsIContent* aPossibleChild) const { return -1; }
-  virtual nsresult InsertChildAt(nsIContent* aKid, PRUint32 aIndex, PRBool aNotify,
-                                 PRBool aDeepSetDocument) { return NS_OK; }
-  virtual nsresult ReplaceChildAt(nsIContent* aKid, PRUint32 aIndex, PRBool aNotify,
-                                  PRBool aDeepSetDocument) { return NS_OK; }
-  virtual nsresult AppendChildTo(nsIContent* aKid, PRBool aNotify,
-                                 PRBool aDeepSetDocument) { return NS_OK; }
-  virtual nsresult RemoveChildAt(PRUint32 aIndex, PRBool aNotify) { return NS_OK; }
-  NS_IMETHOD SplitText(PRUint32 aOffset, nsIDOMText** aReturn){ return NS_OK; }
-
-  ///////////////////
-  // Implementation for nsITextContent
-  NS_IMETHOD GetText(const nsTextFragment** aFragmentsResult);
-  NS_IMETHOD GetTextLength(PRInt32* aLengthResult);
-  NS_IMETHOD CopyText(nsAString& aResult);
-  NS_IMETHOD SetText(const PRUnichar* aBuffer,
-                   PRInt32 aLength,
-                   PRBool aNotify);
-  NS_IMETHOD SetText(const nsAString& aStr,
-                     PRBool aNotify);
-  NS_IMETHOD SetText(const char* aBuffer,
-                   PRInt32 aLength,
-                   PRBool aNotify);
-  NS_IMETHOD IsOnlyWhitespace(PRBool* aResult);
-  NS_IMETHOD CloneContent(PRBool aCloneText, nsITextContent** aClone);
-  NS_IMETHOD AppendTextTo(nsAString& aResult);
-
-  //----------------------------------------
-
-  void ValidateTextFragment();
-
-  void ToCString(nsAString& aBuf, PRInt32 aOffset, PRInt32 aLen) const;
-
-  nsIContent*  GetParent() const {
-    // Override nsIContent::GetParent to be more efficient internally,
-    // since we don't use the low 2 bits of mParentPtrBits for anything.
- 
-    return NS_REINTERPRET_CAST(nsIContent *, mParentPtrBits);
-  }
-
-  // Up pointer to the real content object that we are
-  // supporting. Sometimes there is work that we just can't do
-  // ourselves, so this is needed to ask the real object to do the
-  // work.
-  nsIContent*  mContent;
-
-  nsTextFragment mText;
-  PRInt32        mNameSpaceID;
-  nsCOMPtr<nsIAtom> mAttrName;
-};
-
-
-nsresult
-NS_NewAttributeContent(nsIContent* aContent, PRInt32 aNameSpaceID,
-                       nsIAtom* aAttrName, nsIContent** aResult)
-{
-  NS_ENSURE_TRUE(aContent && aAttrName && aResult, NS_ERROR_ILLEGAL_VALUE);
-
-  *aResult = new nsAttributeContent(aContent, aNameSpaceID, aAttrName);
-  if (!*aResult) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  NS_ADDREF(*aResult);
-
-  return NS_OK;
-}
-
-//----------------------------------------------------------------------
-
-nsAttributeContent::nsAttributeContent(nsIContent* aContent,
-                                       PRInt32 aNameSpaceID,
-                                       nsIAtom* aAttrName)
-  : mContent(aContent), mNameSpaceID(aNameSpaceID), mAttrName(aAttrName)
-{
-}
-
-//----------------------------------------------------------------------
-nsAttributeContent::~nsAttributeContent()
-{
-}
-
-/**
- * @param aIID The name of the class implementing the method
- * @param _classiiddef The name of the #define symbol that defines the IID
- * for the class (e.g. NS_ISUPPORTS_IID)
- * 
- */
-
-NS_INTERFACE_MAP_BEGIN(nsAttributeContent)
-  NS_INTERFACE_MAP_ENTRY(nsIContent)
-  NS_INTERFACE_MAP_ENTRY(nsITextContent)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIContent)
-NS_INTERFACE_MAP_END
-
-
-NS_IMPL_ADDREF(nsAttributeContent)
-NS_IMPL_RELEASE(nsAttributeContent)
-
-
-//----------------------------------------------------------------------
-
-// Implementation of nsIContent
-
-
-void
-nsAttributeContent::ToCString(nsAString& aBuf, PRInt32 aOffset,
-                                PRInt32 aLen) const
-{
-}
-
-nsresult
-nsAttributeContent::HandleDOMEvent(nsIPresContext* aPresContext,
-                                     nsEvent* aEvent,
-                                     nsIDOMEvent** aDOMEvent,
-                                     PRUint32 aFlags,
-                                     nsEventStatus* aEventStatus)
-{
-  nsresult ret = NS_OK;
-  return ret;
-}
-
-
-nsresult 
-nsAttributeContent::RangeAdd(nsIDOMRange* aRange)
-{
-  return NS_ERROR_FAILURE;
-}
-
-
-void
-nsAttributeContent::RangeRemove(nsIDOMRange* aRange)
-{
-}
-
-
-const nsVoidArray *
-nsAttributeContent::GetRangeList() const
-{
-  return nsnull;
-}
-
-already_AddRefed<nsIURI>
-nsAttributeContent::GetBaseURI() const
-{
-  if (GetParent()) {
-    return GetParent()->GetBaseURI();
-  }
-
-  nsIURI *uri;
-
-  if (mDocument) {
-    uri = mDocument->GetBaseURI();
-    NS_IF_ADDREF(uri);
-  } else {
-    uri = nsnull;
-  }
-
-  return uri;
-}
-
-
-
-//----------------------------------------------------------------------
-
-// Implementation of the nsITextContent interface
-
-void
-nsAttributeContent::ValidateTextFragment()
-{
-  if (nsnull != mContent) {
-    nsAutoString result;
-    mContent->GetAttr(mNameSpaceID, mAttrName, result);
-
-    mText.SetTo(result.get(), result.Length());
-  }
-  else {
-    mText.SetTo("", 0);
-  }
-}
-
-nsresult
-nsAttributeContent::GetText(const nsTextFragment** aFragmentsResult)
-{
-  ValidateTextFragment();
-  if (nsnull != mContent) {
-    *aFragmentsResult = &mText;
-    return NS_OK;
-  } 
-  // XXX is this a good idea, or should we just return an empty
-  // fragment with no data in it?
-  return NS_ERROR_FAILURE;
-}
-
-nsresult
-nsAttributeContent::GetTextLength(PRInt32* aLengthResult)
-{
-  if (!aLengthResult) {
-    return NS_ERROR_NULL_POINTER;
-  }
-
-  ValidateTextFragment();
-  *aLengthResult = mText.GetLength();
-  return NS_OK;
-}
-
-nsresult
-nsAttributeContent::CopyText(nsAString& aResult)
-{
-  ValidateTextFragment();
-  if (mText.Is2b()) {
-    aResult.Assign(mText.Get2b(), mText.GetLength());
-  }
-  else {
-    const char *data = mText.Get1b();
-    CopyASCIItoUTF16(Substring(data, data + mText.GetLength()), aResult);
-  }
-  return NS_OK;
-}
-
-// XXX shouldn't these update mContent's attribute?
-nsresult
-nsAttributeContent::SetText(const PRUnichar* aBuffer, PRInt32 aLength,
-                            PRBool aNotify)
-{
-  NS_PRECONDITION((aLength >= 0) && (nsnull != aBuffer), "bad args");
-  if (aLength < 0) {
-    return NS_ERROR_ILLEGAL_VALUE;
-  }
-  if (nsnull == aBuffer) {
-    return NS_ERROR_NULL_POINTER;
-  }
-  mText.SetTo(aBuffer, aLength);
-
-  // Trigger a reflow
-  if (aNotify && (nsnull != mDocument)) {
-    mDocument->ContentChanged(mContent, nsnull);
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsAttributeContent::SetText(const nsAString& aStr,
-                            PRBool aNotify)
-{
-  mText = aStr;
-  
-  // Trigger a reflow
-  if (aNotify && (nsnull != mDocument)) {
-    mDocument->ContentChanged(mContent, nsnull);
-  }
-  return NS_OK;
-}
-
-// XXX shouldn't these update mContent's attribute?
-nsresult
-nsAttributeContent::SetText(const char* aBuffer, 
-                            PRInt32 aLength,
-                            PRBool aNotify)
-{
-  NS_PRECONDITION((aLength >= 0) && (nsnull != aBuffer), "bad args");
-  if (aLength < 0) {
-    return NS_ERROR_ILLEGAL_VALUE;
-  }
-  if (nsnull == aBuffer) {
-    return NS_ERROR_NULL_POINTER;
-  }
-  mText.SetTo(aBuffer, aLength);
-
-  // Trigger a reflow
-  if (aNotify && (nsnull != mDocument)) {
-    mDocument->ContentChanged(mContent, nsnull);
-  }
-  return NS_OK;
-}
-
-
-nsresult
-nsAttributeContent::IsOnlyWhitespace(PRBool* aResult)
-{
-  ValidateTextFragment();
-
-  nsTextFragment& frag = mText;
-  if (frag.Is2b()) {
-    const PRUnichar* cp = frag.Get2b();
-    const PRUnichar* end = cp + frag.GetLength();
-    while (cp < end) {
-      PRUnichar ch = *cp++;
-      if (!XP_IS_SPACE(ch)) {
-        *aResult = PR_FALSE;
-        return NS_OK;
-      }
-    }
-  }
-  else {
-    const char* cp = frag.Get1b();
-    const char* end = cp + frag.GetLength();
-    while (cp < end) {
-      PRUnichar ch = PRUnichar(*(unsigned char*)cp);
-      cp++;
-      if (!XP_IS_SPACE(ch)) {
-        *aResult = PR_FALSE;
-        return NS_OK;
-      }
-    }
-  }
-
-  *aResult = PR_TRUE;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsAttributeContent::CloneContent(PRBool aCloneText, nsITextContent** aReturn)
-{
-  nsAttributeContent* it =
-    new nsAttributeContent(mContent, mNameSpaceID, mAttrName);
-  if (!it) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  it->mText = mText;
-
-  NS_ADDREF(*aReturn = it);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsAttributeContent::AppendTextTo(nsAString& aResult)
-{
-  ValidateTextFragment();
-  if (mText.Is2b()) {
-    aResult.Append(mText.Get2b(), mText.GetLength());
-  }
-  else {
-    AppendASCIItoUTF16(mText.Get1b(), aResult);
-  }
-
-  return NS_OK;
-}

content/html/style/src/nsHTMLStyleSheet.cpp

@@ -35,7 +35,6 @@
 #include "nsIServiceManager.h"
 #include "nsISupportsArray.h"
 #include "pldhash.h"
-#include "nsIHTMLContent.h"
 #include "nsHTMLAttributes.h"
 #include "nsILink.h"
 #include "nsIStyleRuleProcessor.h"

content/html/style/src/nsStyleUtil.cpp

@@ -46,7 +46,6 @@
 #include "nsILinkHandler.h"
 #include "nsILink.h"
 #include "nsIXMLContent.h"
-#include "nsIHTMLContent.h"
 #include "nsIDocument.h"
 #include "nsINameSpaceManager.h"
 #include "nsIURI.h"

content/svg/content/src/nsSVGElementFactory.cpp

@@ -122,33 +122,26 @@ nsSVGElementFactory::CreateInstanceByTag(nsINodeInfo *aNodeInfo,
   
   if (name == nsSVGAtoms::polyline)
     return NS_NewSVGPolylineElement(aResult, aNodeInfo);
-  else if (name == nsSVGAtoms::polygon)
+  if (name == nsSVGAtoms::polygon)
     return NS_NewSVGPolygonElement(aResult, aNodeInfo);
-  else if (name == nsSVGAtoms::circle)
+  if (name == nsSVGAtoms::circle)
     return NS_NewSVGCircleElement(aResult, aNodeInfo);
-  else if (name == nsSVGAtoms::ellipse)
+  if (name == nsSVGAtoms::ellipse)
     return NS_NewSVGEllipseElement(aResult, aNodeInfo);
-  else if (name == nsSVGAtoms::line)
+  if (name == nsSVGAtoms::line)
     return NS_NewSVGLineElement(aResult, aNodeInfo);
-  else if (name == nsSVGAtoms::rect)
+  if (name == nsSVGAtoms::rect)
     return NS_NewSVGRectElement(aResult, aNodeInfo);
-  else if (name == nsSVGAtoms::svg)
+  if (name == nsSVGAtoms::svg)
     return NS_NewSVGSVGElement(aResult, aNodeInfo);
-  else if (name == nsSVGAtoms::g)
+  if (name == nsSVGAtoms::g)
     return NS_NewSVGGElement(aResult, aNodeInfo);
-  else if (name == nsSVGAtoms::foreignObject)
+  if (name == nsSVGAtoms::foreignObject)
     return NS_NewSVGForeignObjectElement(aResult, aNodeInfo);
-  else if (name == nsSVGAtoms::path)
+  if (name == nsSVGAtoms::path)
     return NS_NewSVGPathElement(aResult, aNodeInfo);
 
   // if we don't know what to create, just create a standard xml element:
-  nsCOMPtr<nsIContent> xmlContent;
-  nsresult rv;
-  rv = NS_NewXMLElement(getter_AddRefs(xmlContent), aNodeInfo);
-  
-  *aResult = xmlContent;
-  NS_IF_ADDREF(*aResult);
-  
-  return rv;
+  return NS_NewXMLElement(aResult, aNodeInfo);
 }
 

content/xbl/src/nsXBLBinding.cpp

@@ -59,9 +59,7 @@
 #include "plstr.h"
 #include "nsIContent.h"
 #include "nsIDocument.h"
-#include "nsIXMLContent.h"
 #ifdef MOZ_XUL
-#include "nsIXULContent.h"
 #include "nsIXULDocument.h"
 #endif
 #include "nsIXMLContentSink.h"

content/xbl/src/nsXBLPrototypeBinding.cpp

@@ -54,7 +54,6 @@
 #include "plstr.h"
 #include "nsIContent.h"
 #include "nsIDocument.h"
-#include "nsIXMLContent.h"
 #include "nsIXMLContentSink.h"
 #include "nsContentCID.h"
 #include "nsXMLDocument.h"

content/xul/document/public/nsIXULDocument.h

@@ -62,6 +62,7 @@ class nsIXULPrototypeDocument;
 class nsIXULTemplateBuilder;
 class nsIURI;
 class nsIContent;
+class nsIRDFDataSource;
 
 // {954F0811-81DC-11d2-B52A-000000000000}
 #define NS_IXULDOCUMENT_IID \
@@ -71,9 +72,6 @@ class nsIContent;
  * XUL extensions to nsIDocument
  */
 
-class nsIRDFDataSource;
-class nsIXULPrototypeDocument;
-
 class nsIXULDocument : public nsISupports
 {
 public:

content/xul/document/src/nsXULContentSink.cpp

@@ -64,7 +64,6 @@
 #include "nsIDocument.h"
 #include "nsIDocumentLoader.h"
 #include "nsIFormControl.h"
-#include "nsIHTMLContent.h"
 #include "nsIHTMLStyleSheet.h"
 #include "nsINameSpace.h"
 #include "nsINameSpaceManager.h"
@@ -78,7 +77,6 @@
 #include "nsITextContent.h"
 #include "nsIURL.h"
 #include "nsIViewManager.h"
-#include "nsIXMLContent.h"
 #include "nsIXULContentSink.h"
 #include "nsIXULDocument.h"
 #include "nsIXULPrototypeDocument.h"

content/xul/templates/src/nsXULContentUtils.cpp

@@ -55,7 +55,6 @@
 #include "nsIServiceManager.h"
 #include "nsITextContent.h"
 #include "nsIURL.h"
-#include "nsIXMLContent.h"
 #include "nsXULContentUtils.h"
 #include "nsIXULPrototypeCache.h"
 #include "nsLayoutCID.h"

content/xul/templates/src/nsXULTemplateBuilder.cpp

@@ -74,7 +74,6 @@
 #include "nsIDocument.h"
 #include "nsIBindingManager.h"
 #include "nsIDOMNodeList.h"
-#include "nsIHTMLContent.h"
 #include "nsINameSpace.h"
 #include "nsINameSpaceManager.h"
 #include "nsIRDFCompositeDataSource.h"

layout/base/nsDocumentViewer.cpp

@@ -184,7 +184,6 @@ static const char sPrintOptionsContractID[]         = "@mozilla.org/gfx/printset
 #include "nsINodeInfo.h"
 #include "nsIDocument.h"
 #include "nsHTMLAtoms.h"
-#include "nsIHTMLContent.h"
 #include "nsIWebShell.h"
 
 //focus

layout/base/nsFrameManager.cpp

@@ -57,7 +57,6 @@
 #include "nsIPresState.h"
 #include "nsIContent.h"
 #include "nsINameSpaceManager.h"
-#include "nsIXMLContent.h"
 #include "nsIXBLBinding.h"
 #include "nsIDocument.h"
 #include "nsIBindingManager.h"

layout/base/nsImageLoader.cpp

@@ -37,8 +37,6 @@
 
 #include "imgIContainer.h"
 
-#include "nsIHTMLContent.h"
-
 #include "nsIViewManager.h"
 
 #include "nsStyleContext.h"

layout/base/src/nsImageLoader.cpp

@@ -37,8 +37,6 @@
 
 #include "imgIContainer.h"
 
-#include "nsIHTMLContent.h"
-
 #include "nsIViewManager.h"
 
 #include "nsStyleContext.h"

layout/build/nsLayoutModule.cpp

@@ -54,7 +54,6 @@
 #include "nsEventStateManager.h"
 #include "nsEventListenerManager.h"
 #include "nsGenericElement.h"
-#include "nsGenericDOMDataNode.h"
 #include "nsHTMLAtoms.h"
 #include "nsHTMLAtoms.h"
 #include "nsHTMLContentSerializer.h"
@@ -317,7 +316,6 @@ Shutdown(nsIModule* aSelf)
 
   nsRange::Shutdown();
   nsGenericElement::Shutdown();
-  nsGenericDOMDataNode::Shutdown();
   nsEventListenerManager::Shutdown();
   nsContentList::Shutdown();
   nsComputedDOMStyle::Shutdown();

layout/forms/nsFieldSetFrame.cpp

@@ -50,7 +50,6 @@
 #include "nsISupports.h"
 #include "nsIAtom.h"
 #include "nsIPresContext.h"
-#include "nsIHTMLContent.h"
 #include "nsHTMLParts.h"
 #include "nsHTMLAtoms.h"
 #include "nsLayoutAtoms.h"

layout/forms/nsGfxButtonControlFrame.cpp

@@ -58,7 +58,6 @@ static NS_DEFINE_CID(kTextNodeCID,   NS_TEXTNODE_CID);
 
 // Saving PresState
 #include "nsIPresState.h"
-#include "nsIHTMLContent.h"
 
 const nscoord kSuggestedNotSet = -1;
 

layout/forms/nsListControlFrame.cpp

@@ -43,7 +43,6 @@
 #include "nsFormControlFrame.h" // for COMPARE macro
 #include "nsFormControlHelper.h"
 #include "nsHTMLAtoms.h"
-#include "nsIHTMLContent.h"
 #include "nsIFormControl.h"
 #include "nsIDeviceContext.h" 
 #include "nsIDocument.h"

layout/generic/nsHTMLContainerFrame.cpp

@@ -51,7 +51,6 @@
 #include "nsIDocument.h"
 #include "nsIURL.h"
 #include "nsPlaceholderFrame.h"
-#include "nsIHTMLContent.h"
 #include "nsHTMLParts.h"
 #include "nsIView.h"
 #include "nsIViewManager.h"

layout/generic/nsImageFrame.cpp

@@ -46,7 +46,6 @@
 #include "nsIImage.h"
 #include "nsIWidget.h"
 #include "nsHTMLAtoms.h"
-#include "nsIHTMLContent.h"
 #include "nsIDocument.h"
 #include "nsINodeInfo.h"
 #include "nsStyleContext.h"

layout/generic/nsImageMap.cpp

@@ -54,7 +54,6 @@
 #include "nsIDocument.h"
 #include "nsINameSpaceManager.h"
 #include "nsHTMLAtoms.h"
-#include "nsIHTMLContent.h"
 #include "nsIDOMEventReceiver.h"
 #include "nsIPresShell.h"
 #include "nsIFrame.h"

layout/generic/nsObjectFrame.cpp

@@ -60,7 +60,6 @@
 #include "nsIURL.h"
 #include "nsNetUtil.h"
 #include "nsIPluginInstanceOwner.h"
-#include "nsIHTMLContent.h"
 #include "nsISupportsArray.h"
 #include "plstr.h"
 #include "nsILinkHandler.h"

layout/generic/nsSpacerFrame.cpp

@@ -35,7 +35,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #include "nsHTMLParts.h"
-#include "nsIHTMLContent.h"
 #include "nsFrame.h"
 #include "nsLineLayout.h"
 #include "nsIPresContext.h"

layout/html/base/src/nsFrameManager.cpp

@@ -57,7 +57,6 @@
 #include "nsIPresState.h"
 #include "nsIContent.h"
 #include "nsINameSpaceManager.h"
-#include "nsIXMLContent.h"
 #include "nsIXBLBinding.h"
 #include "nsIDocument.h"
 #include "nsIBindingManager.h"

layout/html/base/src/nsHTMLContainerFrame.cpp

@@ -51,7 +51,6 @@
 #include "nsIDocument.h"
 #include "nsIURL.h"
 #include "nsPlaceholderFrame.h"
-#include "nsIHTMLContent.h"
 #include "nsHTMLParts.h"
 #include "nsIView.h"
 #include "nsIViewManager.h"

layout/html/base/src/nsImageFrame.cpp

@@ -46,7 +46,6 @@
 #include "nsIImage.h"
 #include "nsIWidget.h"
 #include "nsHTMLAtoms.h"
-#include "nsIHTMLContent.h"
 #include "nsIDocument.h"
 #include "nsINodeInfo.h"
 #include "nsStyleContext.h"

layout/html/base/src/nsImageMap.cpp

@@ -54,7 +54,6 @@
 #include "nsIDocument.h"
 #include "nsINameSpaceManager.h"
 #include "nsHTMLAtoms.h"
-#include "nsIHTMLContent.h"
 #include "nsIDOMEventReceiver.h"
 #include "nsIPresShell.h"
 #include "nsIFrame.h"

layout/html/base/src/nsObjectFrame.cpp

@@ -60,7 +60,6 @@
 #include "nsIURL.h"
 #include "nsNetUtil.h"
 #include "nsIPluginInstanceOwner.h"
-#include "nsIHTMLContent.h"
 #include "nsISupportsArray.h"
 #include "plstr.h"
 #include "nsILinkHandler.h"

layout/html/base/src/nsSpacerFrame.cpp

@@ -35,7 +35,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #include "nsHTMLParts.h"
-#include "nsIHTMLContent.h"
 #include "nsFrame.h"
 #include "nsLineLayout.h"
 #include "nsIPresContext.h"

layout/html/forms/src/nsFieldSetFrame.cpp

@@ -50,7 +50,6 @@
 #include "nsISupports.h"
 #include "nsIAtom.h"
 #include "nsIPresContext.h"
-#include "nsIHTMLContent.h"
 #include "nsHTMLParts.h"
 #include "nsHTMLAtoms.h"
 #include "nsLayoutAtoms.h"

layout/html/forms/src/nsGfxButtonControlFrame.cpp

@@ -58,7 +58,6 @@ static NS_DEFINE_CID(kTextNodeCID,   NS_TEXTNODE_CID);
 
 // Saving PresState
 #include "nsIPresState.h"
-#include "nsIHTMLContent.h"
 
 const nscoord kSuggestedNotSet = -1;
 

layout/html/forms/src/nsListControlFrame.cpp

@@ -43,7 +43,6 @@
 #include "nsFormControlFrame.h" // for COMPARE macro
 #include "nsFormControlHelper.h"
 #include "nsHTMLAtoms.h"
-#include "nsIHTMLContent.h"
 #include "nsIFormControl.h"
 #include "nsIDeviceContext.h" 
 #include "nsIDocument.h"

layout/html/table/src/nsTableColGroupFrame.cpp

@@ -43,7 +43,6 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsIPresContext.h"
-#include "nsIHTMLContent.h"
 #include "nsHTMLParts.h"
 #include "nsHTMLAtoms.h"
 #include "nsCOMPtr.h"

layout/html/table/src/nsTableFrame.cpp

@@ -50,7 +50,7 @@
 #include "nsTableRowFrame.h"
 #include "nsTableRowGroupFrame.h"
 #include "nsTableOuterFrame.h"
-#include "nsIHTMLContent.h"
+#include "nsHTMLValue.h"
 
 #include "BasicTableLayoutStrategy.h"
 #include "FixedTableLayoutStrategy.h"

layout/html/table/src/nsTableRowFrame.cpp

@@ -41,7 +41,6 @@
 #include "nsIPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIHTMLContent.h"
 #include "nsHTMLAtoms.h"
 #include "nsIContent.h"
 #include "nsTableFrame.h"

layout/mathml/base/src/nsMathMLContainerFrame.cpp

@@ -23,7 +23,6 @@
 
 #include "nsCOMPtr.h"
 #include "nsHTMLParts.h"
-#include "nsIHTMLContent.h"
 #include "nsFrame.h"
 #include "nsIPresContext.h"
 #include "nsIPresShell.h"

layout/mathml/base/src/nsMathMLForeignFrameWrapper.cpp

@@ -26,7 +26,6 @@
 
 #include "nsCOMPtr.h"
 #include "nsHTMLParts.h"
-#include "nsIHTMLContent.h"
 #include "nsFrame.h"
 #include "nsAreaFrame.h"
 #include "nsLineLayout.h"

layout/printing/nsPrintData.cpp

@@ -45,7 +45,6 @@
 #include "nsISelection.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIDocShell.h"
-#include "nsIHTMLContent.h"
 #include "nsIURI.h"
 #include "nsINodeInfo.h"
 

layout/printing/nsPrintEngine.cpp

@@ -45,7 +45,6 @@
 #include "nsISelection.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIDocShell.h"
-#include "nsIHTMLContent.h"
 #include "nsIURI.h"
 #include "nsINodeInfo.h"
 
@@ -106,7 +105,6 @@ static const char kPrintingPromptService[] = "@mozilla.org/embedcomp/printingpro
 #include "nsINodeInfo.h"
 #include "nsIDocument.h"
 #include "nsHTMLAtoms.h"
-#include "nsIHTMLContent.h"
 #include "nsIWebShell.h"
 
 // Focus

layout/style/nsHTMLStyleSheet.cpp

@@ -35,7 +35,6 @@
 #include "nsIServiceManager.h"
 #include "nsISupportsArray.h"
 #include "pldhash.h"
-#include "nsIHTMLContent.h"
 #include "nsHTMLAttributes.h"
 #include "nsILink.h"
 #include "nsIStyleRuleProcessor.h"

layout/style/nsStyleUtil.cpp

@@ -46,7 +46,6 @@
 #include "nsILinkHandler.h"
 #include "nsILink.h"
 #include "nsIXMLContent.h"
-#include "nsIHTMLContent.h"
 #include "nsIDocument.h"
 #include "nsINameSpaceManager.h"
 #include "nsIURI.h"

layout/tables/nsTableColGroupFrame.cpp

@@ -43,7 +43,6 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsIPresContext.h"
-#include "nsIHTMLContent.h"
 #include "nsHTMLParts.h"
 #include "nsHTMLAtoms.h"
 #include "nsCOMPtr.h"

layout/tables/nsTableFrame.cpp

@@ -50,7 +50,7 @@
 #include "nsTableRowFrame.h"
 #include "nsTableRowGroupFrame.h"
 #include "nsTableOuterFrame.h"
-#include "nsIHTMLContent.h"
+#include "nsHTMLValue.h"
 
 #include "BasicTableLayoutStrategy.h"
 #include "FixedTableLayoutStrategy.h"

layout/tables/nsTableRowFrame.cpp

@@ -41,7 +41,6 @@
 #include "nsIPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIHTMLContent.h"
 #include "nsHTMLAtoms.h"
 #include "nsIContent.h"
 #include "nsTableFrame.h"

layout/xul/base/src/nsImageBoxFrame.cpp

@@ -63,7 +63,6 @@
 #include "nsIImage.h"
 #include "nsIWidget.h"
 #include "nsHTMLAtoms.h"
-#include "nsIHTMLContent.h"
 #include "nsIDocument.h"
 #include "nsIHTMLDocument.h"
 #include "nsStyleConsts.h"

layout/xul/base/src/nsSliderFrame.cpp

@@ -67,7 +67,6 @@
 #include "nsIScrollbarMediator.h"
 #include "nsIScrollbarFrame.h"
 #include "nsISupportsArray.h"
-#include "nsIXMLContent.h"
 #include "nsXULAtoms.h"
 #include "nsHTMLAtoms.h"
 #include "nsIScrollableView.h"

layout/xul/base/src/nsSplitterFrame.cpp

@@ -50,7 +50,6 @@
 #include "nsIDOMElement.h"
 #include "nsIDOMXULElement.h"
 #include "nsIDOMDocument.h"
-#include "nsIXMLContent.h"
 #include "nsIPresContext.h"
 #include "nsIDocument.h"
 #include "nsINameSpaceManager.h"