diff --git a/mozilla/content/base/public/nsINameSpaceManager.h b/mozilla/content/base/public/nsINameSpaceManager.h index f521846a041..57375fd954d 100644 --- a/mozilla/content/base/public/nsINameSpaceManager.h +++ b/mozilla/content/base/public/nsINameSpaceManager.h @@ -51,13 +51,11 @@ class nsIElementFactory; #define kNameSpaceID_None 0 #define kNameSpaceID_XMLNS 1 // not really a namespace, but it needs to play the game #define kNameSpaceID_XML 2 -#define kNameSpaceID_HTML 3 +#define kNameSpaceID_XHTML 3 #define kNameSpaceID_XLink 4 -#define kNameSpaceID_HTML2 5 // This is not a real namespace -#define kNameSpaceID_XSLT 6 -#define kNameSpaceID_XBL 7 -#define kNameSpaceID_MathML 8 -#define kNameSpaceID_XHTML kNameSpaceID_HTML +#define kNameSpaceID_XSLT 5 +#define kNameSpaceID_XBL 6 +#define kNameSpaceID_MathML 7 // 'html' is by definition bound to the namespace name "urn:w3-org-ns:HTML" XXX ??? // 'xml' is by definition bound to the namespace name "urn:Connolly:input:required" XXX diff --git a/mozilla/content/base/src/nsContentList.cpp b/mozilla/content/base/src/nsContentList.cpp index 7f52caadcc6..6d5688ecc65 100644 --- a/mozilla/content/base/src/nsContentList.cpp +++ b/mozilla/content/base/src/nsContentList.cpp @@ -535,10 +535,12 @@ nsContentList::NamedItem(const nsAString& aName, nsIDOMNode** aReturn, PRBool aD if (content) { nsAutoString name; // XXX Should it be an EqualsIgnoreCase? - if (((content->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::name, name) == NS_CONTENT_ATTR_HAS_VALUE) && - (aName.Equals(name))) || - ((content->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::id, name) == NS_CONTENT_ATTR_HAS_VALUE) && - (aName.Equals(name)))) { + if (((content->GetAttr(kNameSpaceID_None, nsHTMLAtoms::name, + name) == NS_CONTENT_ATTR_HAS_VALUE) && + aName.Equals(name)) || + ((content->GetAttr(kNameSpaceID_None, nsHTMLAtoms::id, + name) == NS_CONTENT_ATTR_HAS_VALUE) && + aName.Equals(name))) { return CallQueryInterface(content, aReturn); } } diff --git a/mozilla/content/base/src/nsHTMLContentSerializer.cpp b/mozilla/content/base/src/nsHTMLContentSerializer.cpp index 5102869437a..4af1e711ac0 100644 --- a/mozilla/content/base/src/nsHTMLContentSerializer.cpp +++ b/mozilla/content/base/src/nsHTMLContentSerializer.cpp @@ -508,7 +508,7 @@ nsHTMLContentSerializer::AppendElementStart(nsIDOMElement *aElement, if (name.get() == nsHTMLAtoms::textarea) { nsAutoString valueStr; - content->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::value, valueStr); + content->GetAttr(kNameSpaceID_None, nsHTMLAtoms::value, valueStr); AppendToString(valueStr, aStr); } diff --git a/mozilla/content/base/src/nsNameSpaceManager.cpp b/mozilla/content/base/src/nsNameSpaceManager.cpp index d62207ed668..b1115ff160e 100644 --- a/mozilla/content/base/src/nsNameSpaceManager.cpp +++ b/mozilla/content/base/src/nsNameSpaceManager.cpp @@ -53,8 +53,6 @@ extern nsresult NS_NewXMLElementFactory(nsIElementFactory** aResult); static const char kXMLNSNameSpaceURI[] = "http://www.w3.org/2000/xmlns/"; static const char kXMLNameSpaceURI[] = "http://www.w3.org/XML/1998/namespace"; -static const char kHTMLNameSpaceURI[] = "http://www.w3.org/TR/REC-html40"; // XXX?? "urn:w3-org-ns:HTML"?? -// XXX To be removed: Bug 7834 --- static const char kXHTMLNameSpaceURI[] = "http://www.w3.org/1999/xhtml"; static const char kXLinkNameSpaceURI[] = "http://www.w3.org/1999/xlink"; static const char kXSLTNameSpaceURI[] = "http://www.w3.org/1999/XSL/Transform"; @@ -79,26 +77,24 @@ static void InitializeNameSpaceManager() return; } - NS_ASSERTION(nsnull == gURIToIDTable, "already have URI table"); - NS_ASSERTION(nsnull == gURIArray, "already have URI array"); + NS_ASSERTION(!gURIToIDTable, "already have URI table"); + NS_ASSERTION(!gURIArray, "already have URI array"); gURIToIDTable = new nsHashtable(); gURIArray = new nsVoidArray(); - nsString* xmlns = new nsString( NS_ConvertASCIItoUCS2(kXMLNSNameSpaceURI) ); - nsString* xml = new nsString( NS_ConvertASCIItoUCS2(kXMLNameSpaceURI) ); - nsString* xhtml = new nsString( NS_ConvertASCIItoUCS2(kXHTMLNameSpaceURI) ); - nsString* xlink = new nsString( NS_ConvertASCIItoUCS2(kXLinkNameSpaceURI) ); - nsString* html = new nsString( NS_ConvertASCIItoUCS2(kHTMLNameSpaceURI) ); - nsString* xslt = new nsString( NS_ConvertASCIItoUCS2(kXSLTNameSpaceURI) ); - nsString* xbl = new nsString(NS_ConvertASCIItoUCS2(kXBLNameSpaceURI)); + nsString* xmlns = new nsString(NS_ConvertASCIItoUCS2(kXMLNSNameSpaceURI)); + nsString* xml = new nsString(NS_ConvertASCIItoUCS2(kXMLNameSpaceURI)); + nsString* xhtml = new nsString(NS_ConvertASCIItoUCS2(kXHTMLNameSpaceURI)); + nsString* xlink = new nsString(NS_ConvertASCIItoUCS2(kXLinkNameSpaceURI)); + nsString* xslt = new nsString(NS_ConvertASCIItoUCS2(kXSLTNameSpaceURI)); + nsString* xbl = new nsString(NS_ConvertASCIItoUCS2(kXBLNameSpaceURI)); nsString* mathml = new nsString(NS_ConvertASCIItoUCS2(kMathMLNameSpaceURI)); gURIArray->AppendElement(xmlns); // ordering here needs to match IDs gURIArray->AppendElement(xml); gURIArray->AppendElement(xhtml); gURIArray->AppendElement(xlink); - gURIArray->AppendElement(html); gURIArray->AppendElement(xslt); gURIArray->AppendElement(xbl); gURIArray->AppendElement(mathml); @@ -107,25 +103,23 @@ static void InitializeNameSpaceManager() nsStringKey xmlKey(*xml); nsStringKey xhtmlKey(*xhtml); nsStringKey xlinkKey(*xlink); - nsStringKey htmlKey(*html); nsStringKey xsltKey(*xslt); nsStringKey xblKey(*xbl); nsStringKey mathmlKey(*mathml); - gURIToIDTable->Put(&xmlnsKey, (void*)kNameSpaceID_XMLNS); - gURIToIDTable->Put(&xmlKey, (void*)kNameSpaceID_XML); - gURIToIDTable->Put(&xhtmlKey, (void*)kNameSpaceID_HTML); - gURIToIDTable->Put(&xlinkKey, (void*)kNameSpaceID_XLink); - gURIToIDTable->Put(&htmlKey, (void*)kNameSpaceID_HTML); - gURIToIDTable->Put(&xsltKey, (void*)kNameSpaceID_XSLT); - gURIToIDTable->Put(&xblKey, (void*)kNameSpaceID_XBL); - gURIToIDTable->Put(&mathmlKey, (void*)kNameSpaceID_MathML); + gURIToIDTable->Put(&xmlnsKey, NS_INT32_TO_PTR(kNameSpaceID_XMLNS)); + gURIToIDTable->Put(&xmlKey, NS_INT32_TO_PTR(kNameSpaceID_XML)); + gURIToIDTable->Put(&xhtmlKey, NS_INT32_TO_PTR(kNameSpaceID_XHTML)); + gURIToIDTable->Put(&xlinkKey, NS_INT32_TO_PTR(kNameSpaceID_XLink)); + gURIToIDTable->Put(&xsltKey, NS_INT32_TO_PTR(kNameSpaceID_XSLT)); + gURIToIDTable->Put(&xblKey, NS_INT32_TO_PTR(kNameSpaceID_XBL)); + gURIToIDTable->Put(&mathmlKey, NS_INT32_TO_PTR(kNameSpaceID_MathML)); NS_NewISupportsArray(&gElementFactoryArray); - NS_ASSERTION(nsnull != gURIToIDTable, "no URI table"); - NS_ASSERTION(nsnull != gURIArray, "no URI array"); - NS_ASSERTION(nsnull != gElementFactoryArray, "no element factory array"); + NS_ASSERTION(gURIToIDTable, "no URI table"); + NS_ASSERTION(gURIArray, "no URI array"); + NS_ASSERTION(gElementFactoryArray, "no element factory array"); gNameSpaceManagerIsInitialized = PR_TRUE; } @@ -151,11 +145,11 @@ void NS_NameSpaceManagerShutdown() static PRInt32 FindNameSpaceID(const nsAString& aURI) { - NS_ASSERTION(nsnull != gURIToIDTable, "no URI table"); + NS_ASSERTION(gURIToIDTable, "no URI table"); const nsPromiseFlatString& flatString = PromiseFlatString(aURI); nsStringKey key(flatString); void* value = gURIToIDTable->Get(&key); - if (nsnull != value) { + if (value) { return NS_PTR_TO_INT32(value); } return kNameSpaceID_Unknown; @@ -163,7 +157,7 @@ static PRInt32 FindNameSpaceID(const nsAString& aURI) static const nsString* FindNameSpaceURI(PRInt32 aID) { - NS_ASSERTION(nsnull != gURIArray, "no URI array"); + NS_ASSERTION(gURIArray, "no URI array"); return (const nsString*)gURIArray->SafeElementAt(aID - 1); } @@ -221,7 +215,7 @@ NameSpaceImpl::NameSpaceImpl(nsINameSpaceManager* aManager, mParent(aParent), mPrefix(aPrefix) { - NS_ASSERTION(nsnull != aManager, "null namespace manager"); + NS_ASSERTION(aManager, "null namespace manager"); NS_INIT_REFCNT(); NS_ADDREF(mManager); NS_IF_ADDREF(mParent); @@ -238,7 +232,7 @@ NameSpaceImpl::NameSpaceImpl(nsINameSpaceManager* aManager, mPrefix(aPrefix), mID(aNameSpaceID) { - NS_ASSERTION(nsnull != aManager, "null namespace manager"); + NS_ASSERTION(aManager, "null namespace manager"); NS_INIT_REFCNT(); NS_ADDREF(mManager); NS_IF_ADDREF(mParent); @@ -257,7 +251,7 @@ NS_IMPL_ISUPPORTS1(NameSpaceImpl, nsINameSpace) NS_IMETHODIMP NameSpaceImpl::GetNameSpaceManager(nsINameSpaceManager*& aManager) const { - NS_ASSERTION(nsnull != aManager, "null namespace manager"); + NS_ASSERTION(aManager, "null namespace manager"); aManager = mManager; NS_ADDREF(aManager); return NS_OK; @@ -273,7 +267,7 @@ NameSpaceImpl::GetNameSpaceID(PRInt32& aID) const NS_IMETHODIMP NameSpaceImpl::GetNameSpaceURI(nsAString& aURI) const { - NS_ASSERTION(nsnull != mManager, "null namespace manager"); + NS_ASSERTION(mManager, "null namespace manager"); return mManager->GetNameSpaceURI(mID, aURI); } @@ -297,6 +291,7 @@ NS_IMETHODIMP NameSpaceImpl::FindNameSpace(nsIAtom* aPrefix, nsINameSpace*& aNameSpace) const { const NameSpaceImpl* nameSpace = this; + do { if (aPrefix == nameSpace->mPrefix) { aNameSpace = (nsINameSpace*)nameSpace; @@ -304,8 +299,8 @@ NameSpaceImpl::FindNameSpace(nsIAtom* aPrefix, nsINameSpace*& aNameSpace) const return NS_OK; } nameSpace = nameSpace->mParent; - } - while (nsnull != nameSpace); + } while (nameSpace); + aNameSpace = nsnull; return NS_ERROR_ILLEGAL_VALUE; } @@ -320,9 +315,9 @@ NameSpaceImpl::FindNameSpaceID(nsIAtom* aPrefix, PRInt32& aNameSpaceID) const return NS_OK; } nameSpace = nameSpace->mParent; - } while (nsnull != nameSpace); + } while (nameSpace); - if (nsnull == aPrefix) { + if (!aPrefix) { aNameSpaceID = kNameSpaceID_None; } else { @@ -335,6 +330,7 @@ NS_IMETHODIMP NameSpaceImpl::FindNameSpacePrefix(PRInt32 aNameSpaceID, nsIAtom*& aPrefix) const { const NameSpaceImpl* nameSpace = this; + do { if (aNameSpaceID == nameSpace->mID) { aPrefix = nameSpace->mPrefix; @@ -342,8 +338,8 @@ NameSpaceImpl::FindNameSpacePrefix(PRInt32 aNameSpaceID, nsIAtom*& aPrefix) cons return NS_OK; } nameSpace = nameSpace->mParent; - } - while (nsnull != nameSpace); + } while (nameSpace); + aPrefix = nsnull; return NS_ERROR_ILLEGAL_VALUE; } @@ -432,11 +428,15 @@ NameSpaceManagerImpl::CreateRootNameSpace(nsINameSpace*& aRootNameSpace) nsresult rv = NS_ERROR_OUT_OF_MEMORY; aRootNameSpace = nsnull; - NameSpaceImpl* xmlns = new NameSpaceImpl(this, nsnull, nsLayoutAtoms::xmlnsNameSpace, kNameSpaceID_XMLNS); + NameSpaceImpl* xmlns = new NameSpaceImpl(this, nsnull, + nsLayoutAtoms::xmlnsNameSpace, + kNameSpaceID_XMLNS); if (nsnull != xmlns) { - NameSpaceImpl* xml = new NameSpaceImpl(this, xmlns, nsLayoutAtoms::xmlNameSpace, kNameSpaceID_XML); - if (nsnull != xml) { - rv = xml->QueryInterface(NS_GET_IID(nsINameSpace), (void**)&aRootNameSpace); + NameSpaceImpl* xml = new NameSpaceImpl(this, xmlns, + nsLayoutAtoms::xmlNameSpace, + kNameSpaceID_XML); + if (xml) { + rv = CallQueryInterface(xml, &aRootNameSpace); } else { delete xmlns; @@ -478,7 +478,7 @@ NameSpaceManagerImpl::GetNameSpaceURI(PRInt32 aNameSpaceID, nsAString& aURI) "Namespace manager used past content module shutdown!!!"); const nsString* result = FindNameSpaceURI(aNameSpaceID); - if (nsnull != result) { + if (result) { aURI = *result; return NS_OK; } diff --git a/mozilla/content/events/src/nsEventStateManager.cpp b/mozilla/content/events/src/nsEventStateManager.cpp index 09365d1020e..c30a2b5f5a4 100644 --- a/mozilla/content/events/src/nsEventStateManager.cpp +++ b/mozilla/content/events/src/nsEventStateManager.cpp @@ -60,7 +60,7 @@ #include "nsIDOMHTMLBodyElement.h" #include "nsImageMapUtils.h" #include "nsIHTMLDocument.h" -#include "nsINameSpaceManager.h" // for kNameSpaceID_HTML +#include "nsINameSpaceManager.h" // for kNameSpaceID_XHTML #include "nsIWebShell.h" #include "nsIBaseWindow.h" #include "nsIScrollableView.h" @@ -792,7 +792,7 @@ nsEventStateManager::PreHandleEvent(nsIPresContext* aPresContext, //Someone registered an accesskey. Find and activate it. PRUnichar accKey = nsCRT::ToLower((char)keyEvent->charCode); - nsVoidKey key((void*)accKey); + nsVoidKey key(NS_INT32_TO_PTR(accKey)); if (mAccessKeys->Exists(&key)) { nsCOMPtr content = dont_AddRef(NS_STATIC_CAST(nsIContent*, mAccessKeys->Get(&key))); @@ -1397,9 +1397,14 @@ nsEventStateManager::DoWheelScroll(nsIPresContext* aPresContext, nsCOMPtr view; docView->GetDefaultView(getter_AddRefs(view)); - if (scrollPage) - numLines = numLines > 0 ? nsIDOMNSUIEvent::SCROLL_PAGE_DOWN : nsIDOMNSUIEvent::SCROLL_PAGE_UP; - + if (scrollPage) { + if (numLines > 0) { + numLines = nsIDOMNSUIEvent::SCROLL_PAGE_DOWN; + } else { + numLines = nsIDOMNSUIEvent::SCROLL_PAGE_UP; + } + } + mouseEvent->InitMouseEvent(NS_LITERAL_STRING("DOMMouseScroll"), PR_TRUE, PR_TRUE, view, numLines, msEvent->refPoint.x, msEvent->refPoint.y, @@ -2023,28 +2028,22 @@ nsEventStateManager::GetNearestScrollingView(nsIView* aView) PRBool nsEventStateManager::CheckDisabled(nsIContent* aContent) { - PRBool disabled = PR_FALSE; - nsCOMPtr tag; aContent->GetTag(*getter_AddRefs(tag)); - if (nsHTMLAtoms::input == tag.get() || - nsHTMLAtoms::select == tag.get() || - nsHTMLAtoms::textarea == tag.get() || - nsHTMLAtoms::button == tag.get()) { - nsAutoString empty; - if (NS_CONTENT_ATTR_HAS_VALUE == aContent->GetAttr(kNameSpaceID_HTML, - nsHTMLAtoms::disabled, - empty)) { - disabled = PR_TRUE; - } + if (tag == nsHTMLAtoms::input || + tag == nsHTMLAtoms::select || + tag == nsHTMLAtoms::textarea || + tag == nsHTMLAtoms::button) { + return aContent->HasAttr(kNameSpaceID_None, nsHTMLAtoms::disabled); } - return disabled; + return PR_FALSE; } void -nsEventStateManager::UpdateCursor(nsIPresContext* aPresContext, nsEvent* aEvent, nsIFrame* aTargetFrame, +nsEventStateManager::UpdateCursor(nsIPresContext* aPresContext, + nsEvent* aEvent, nsIFrame* aTargetFrame, nsEventStatus* aStatus) { PRInt32 cursor; @@ -3969,7 +3968,7 @@ nsEventStateManager::RegisterAccessKey(nsIFrame * aFrame, nsIContent* aContent, if (content) { PRUnichar accKey = nsCRT::ToLower((char)aKey); - nsVoidKey key((void*)accKey); + nsVoidKey key(NS_INT32_TO_PTR(accKey)); #ifdef DEBUG_jag nsCOMPtr oldContent = dont_AddRef(NS_STATIC_CAST(nsIContent*, mAccessKeys->Get(&key))); @@ -3998,7 +3997,7 @@ nsEventStateManager::UnregisterAccessKey(nsIFrame * aFrame, nsIContent* aContent if (content) { PRUnichar accKey = nsCRT::ToLower((char)aKey); - nsVoidKey key((void*)accKey); + nsVoidKey key(NS_INT32_TO_PTR(accKey)); nsCOMPtr oldContent = dont_AddRef(NS_STATIC_CAST(nsIContent*, mAccessKeys->Get(&key))); #ifdef DEBUG_jag @@ -4471,8 +4470,9 @@ NS_IMETHODIMP nsEventStateManager::MoveCaretToFocus() nsCOMPtr selectionContent, endSelectionContent; nsIFrame *selectionFrame; PRUint32 selectionOffset; - nsresult rv = GetDocSelectionLocation(getter_AddRefs(selectionContent), getter_AddRefs(endSelectionContent), - &selectionFrame, &selectionOffset); + GetDocSelectionLocation(getter_AddRefs(selectionContent), + getter_AddRefs(endSelectionContent), + &selectionFrame, &selectionOffset); while (selectionContent) { nsCOMPtr parentContent; selectionContent->GetParent(*getter_AddRefs(parentContent)); diff --git a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp index 663e108fd76..88be103c694 100644 --- a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp +++ b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp @@ -1309,18 +1309,17 @@ nsGenericHTMLElement::FindForm(nsIDOMHTMLFormElement **aForm) nsCOMPtr content(this); nsCOMPtr tag; - PRInt32 nameSpaceID; *aForm = nsnull; while (content) { - content->GetTag(*getter_AddRefs(tag)); - content->GetNameSpaceID(nameSpaceID); + if (content->IsContentOfType(nsIContent::eHTML)) { + content->GetTag(*getter_AddRefs(tag)); - // If the current ancestor is a form, return it as our form - if ((tag.get() == nsHTMLAtoms::form) && - (kNameSpaceID_HTML == nameSpaceID)) { - return CallQueryInterface(content, aForm); + // If the current ancestor is a form, return it as our form + if (tag == nsHTMLAtoms::form) { + return CallQueryInterface(content, aForm); + } } nsIContent *tmp = content; @@ -1455,7 +1454,7 @@ nsGenericHTMLElement::HandleDOMEventForAnchors(nsIContent* aOuter, nsAutoString target; nsCOMPtr baseURL; GetBaseURL(*getter_AddRefs(baseURL)); - GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::target, target); + GetAttr(kNameSpaceID_None, nsHTMLAtoms::target, target); if (target.IsEmpty()) { GetBaseTarget(target); } @@ -1510,7 +1509,7 @@ nsGenericHTMLElement::HandleDOMEventForAnchors(nsIContent* aOuter, nsAutoString target; nsCOMPtr baseURL; GetBaseURL(*getter_AddRefs(baseURL)); - GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::target, target); + GetAttr(kNameSpaceID_None, nsHTMLAtoms::target, target); if (target.IsEmpty()) { GetBaseTarget(target); } @@ -1543,7 +1542,7 @@ nsGenericHTMLElement::GetNameSpaceID(PRInt32& aID) const // XXX // XXX This is incorrect!!!!!!!!!!!!!!!! // XXX - aID = kNameSpaceID_HTML; + aID = kNameSpaceID_XHTML; return NS_OK; } @@ -1568,11 +1567,13 @@ nsGenericHTMLElement::SetAttr(PRInt32 aNameSpaceID, const nsAString& aValue, PRBool aNotify) { + NS_ASSERTION(aNameSpaceID != kNameSpaceID_XHTML, + "Error, attribute on [X]HTML element set with XHTML namespace, " + "this is wrong, trust me! Loose the prefix on the attribute!"); + nsresult result = NS_OK; - if ((kNameSpaceID_HTML != aNameSpaceID) && - (kNameSpaceID_None != aNameSpaceID) && - (kNameSpaceID_Unknown != aNameSpaceID)) { + if (aNameSpaceID != kNameSpaceID_None) { nsCOMPtr nimgr; result = mNodeInfo->GetNodeInfoManager(*getter_AddRefs(nimgr)); NS_ENSURE_SUCCESS(result, result); @@ -1585,7 +1586,7 @@ nsGenericHTMLElement::SetAttr(PRInt32 aNameSpaceID, return SetAttr(ni, aValue, aNotify); } - if (nsHTMLAtoms::style == aAttribute) { + if (aAttribute == nsHTMLAtoms::style) { if (mDocument) { nsHTMLValue parsedValue; ParseStyleAttribute(aValue, parsedValue); @@ -1608,8 +1609,8 @@ nsGenericHTMLElement::SetAttr(PRInt32 aNameSpaceID, nsAutoString strValue; PRBool modification = PR_TRUE; - if (NS_CONTENT_ATTR_NOT_THERE != - StringToAttribute(aAttribute, aValue, val)) { + if (StringToAttribute(aAttribute, aValue, + val) != NS_CONTENT_ATTR_NOT_THERE) { // string value was mapped to nsHTMLValue, set it that way return SetHTMLAttribute(aAttribute, val, aNotify); } @@ -1644,7 +1645,9 @@ nsGenericHTMLElement::SetAttr(PRInt32 aNameSpaceID, : PRInt32(nsIDOMMutationEvent::ADDITION); GetMappedAttributeImpact(aAttribute, modHint, impact); - nsCOMPtr sheet(dont_AddRef(GetAttrStyleSheet(mDocument))); + nsCOMPtr sheet = + dont_AddRef(GetAttrStyleSheet(mDocument)); + if (!mAttributes) { result = NS_NewHTMLAttributes(&mAttributes); NS_ENSURE_SUCCESS(result, result); @@ -1663,7 +1666,8 @@ nsGenericHTMLElement::SetAttr(PRInt32 aNameSpaceID, binding->AttributeChanged(aAttribute, aNameSpaceID, PR_FALSE); if (nsGenericElement::HasMutationListeners(this, NS_EVENT_BITS_MUTATION_ATTRMODIFIED)) { - nsCOMPtr node(do_QueryInterface(NS_STATIC_CAST(nsIContent *, this))); + nsCOMPtr node = + do_QueryInterface(NS_STATIC_CAST(nsIContent *, this)); nsMutationEvent mutation; mutation.eventStructType = NS_MUTATION_EVENT; mutation.message = NS_MUTATION_ATTRMODIFIED; @@ -1690,8 +1694,10 @@ nsGenericHTMLElement::SetAttr(PRInt32 aNameSpaceID, } if (aNotify) { - PRInt32 modHint = modification ? PRInt32(nsIDOMMutationEvent::MODIFICATION) - : PRInt32(nsIDOMMutationEvent::ADDITION); + PRInt32 modHint = + modification ? PRInt32(nsIDOMMutationEvent::MODIFICATION) : + PRInt32(nsIDOMMutationEvent::ADDITION); + mDocument->AttributeChanged(this, aNameSpaceID, aAttribute, modHint, NS_STYLE_HINT_UNKNOWN); mDocument->EndUpdate(); @@ -1715,11 +1721,14 @@ nsGenericHTMLElement::SetAttr(nsINodeInfo* aNodeInfo, aNodeInfo->GetNameAtom(*getter_AddRefs(localName)); aNodeInfo->GetNamespaceID(namespaceID); - if (namespaceID == kNameSpaceID_HTML || - namespaceID == kNameSpaceID_None || - namespaceID == kNameSpaceID_Unknown) - return SetAttr(namespaceID, localName, aValue, aNotify); - + NS_ASSERTION(namespaceID != kNameSpaceID_XHTML, + "Error, attribute on [X]HTML element set with XHTML namespace, " + "this is wrong, trust me! Loose the prefix on the attribute!"); + + if (namespaceID == kNameSpaceID_None) { + return SetAttr(namespaceID, localName, aValue, aNotify); + } + // This code is copied from SetAttr(PRInt32, nsIAtom* ,... // It sux that we have it duplicated, but we'll have to live with it // until we have better SetAttr signatures in nsIContent @@ -1754,7 +1763,9 @@ nsGenericHTMLElement::SetAttr(nsINodeInfo* aNodeInfo, binding->AttributeChanged(localName, namespaceID, PR_FALSE); if (nsGenericElement::HasMutationListeners(this, NS_EVENT_BITS_MUTATION_ATTRMODIFIED)) { - nsCOMPtr node(do_QueryInterface(NS_STATIC_CAST(nsIContent *, this))); + nsCOMPtr node = + do_QueryInterface(NS_STATIC_CAST(nsIContent *, this)); + nsMutationEvent mutation; mutation.eventStructType = NS_MUTATION_EVENT; mutation.message = NS_MUTATION_ATTRMODIFIED; @@ -1764,7 +1775,8 @@ nsGenericHTMLElement::SetAttr(nsINodeInfo* aNodeInfo, localName->ToString(attrLocalName); aNodeInfo->GetNamespaceURI(attrNamespace); nsCOMPtr attrNode; - GetAttributeNodeNS(attrNamespace, attrLocalName, getter_AddRefs(attrNode)); + GetAttributeNodeNS(attrNamespace, attrLocalName, + getter_AddRefs(attrNode)); mutation.mRelatedNode = attrNode; mutation.mAttrName = localName; @@ -1782,8 +1794,9 @@ nsGenericHTMLElement::SetAttr(nsINodeInfo* aNodeInfo, } if (aNotify) { - PRInt32 modHint = modification ? PRInt32(nsIDOMMutationEvent::MODIFICATION) - : PRInt32(nsIDOMMutationEvent::ADDITION); + PRInt32 modHint = + modification ? PRInt32(nsIDOMMutationEvent::MODIFICATION) + : PRInt32(nsIDOMMutationEvent::ADDITION); mDocument->AttributeChanged(this, namespaceID, localName, modHint, NS_STYLE_HINT_UNKNOWN); mDocument->EndUpdate(); @@ -1844,15 +1857,13 @@ static PRInt32 GetStyleImpactFrom(const nsHTMLValue& aValue) if (eHTMLUnit_ISupports == aValue.GetUnit()) { nsCOMPtr supports(dont_AddRef(aValue.GetISupportsValue())); - if (supports) { - nsCOMPtr cssRule(do_QueryInterface(supports)); + nsCOMPtr cssRule(do_QueryInterface(supports)); - if (cssRule) { - nsCSSDeclaration* declaration = cssRule->GetDeclaration(); + if (cssRule) { + nsCSSDeclaration* declaration = cssRule->GetDeclaration(); - if (declaration) { - hint = declaration->GetStyleImpact(); - } + if (declaration) { + hint = declaration->GetStyleImpact(); } } } @@ -1868,7 +1879,8 @@ nsGenericHTMLElement::SetHTMLAttribute(nsIAtom* aAttribute, nsresult result = NS_OK; PRBool impact = NS_STYLE_HINT_NONE; - GetMappedAttributeImpact(aAttribute, nsIDOMMutationEvent::MODIFICATION, impact); + GetMappedAttributeImpact(aAttribute, nsIDOMMutationEvent::MODIFICATION, + impact); nsCOMPtr sheet; if (mDocument) { PRBool haveListeners = @@ -1981,16 +1993,11 @@ nsGenericHTMLElement::SetHTMLAttribute(nsIAtom* aAttribute, } nsresult -nsGenericHTMLElement::UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRBool aNotify) +nsGenericHTMLElement::UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRBool aNotify) { nsresult result = NS_OK; - if (aNameSpaceID == kNameSpaceID_HTML || - aNameSpaceID == kNameSpaceID_Unknown) { - aNameSpaceID = kNameSpaceID_None; - } - - // Check for event handlers if (aNameSpaceID == kNameSpaceID_None && IsEventName(aAttribute)) { @@ -2095,15 +2102,11 @@ nsGenericHTMLElement::GetAttr(PRInt32 aNameSpaceID, nsIAtom *aAttribute, aPrefix = nsnull; const nsHTMLValue* value; - if ((kNameSpaceID_HTML != aNameSpaceID) && - (kNameSpaceID_None != aNameSpaceID) && - (kNameSpaceID_Unknown != aNameSpaceID)) { + if (aNameSpaceID != kNameSpaceID_None) { rv = mAttributes ? mAttributes->GetAttribute(aAttribute, aNameSpaceID, - aPrefix, - &value) : + aPrefix, &value) : NS_CONTENT_ATTR_NOT_THERE; - } - else { + } else { aNameSpaceID = kNameSpaceID_None; rv = mAttributes ? mAttributes->GetAttribute(aAttribute, &value) : NS_CONTENT_ATTR_NOT_THERE; @@ -2182,9 +2185,6 @@ nsGenericHTMLElement::GetAttr(PRInt32 aNameSpaceID, nsIAtom *aAttribute, NS_IMETHODIMP_(PRBool) nsGenericHTMLElement::HasAttr(PRInt32 aNameSpaceID, nsIAtom* aName) const { - if (aNameSpaceID == kNameSpaceID_HTML || - aNameSpaceID == kNameSpaceID_Unknown) - aNameSpaceID = kNameSpaceID_None; return mAttributes && mAttributes->HasAttribute(aName, aNameSpaceID); } diff --git a/mozilla/content/html/content/src/nsGenericHTMLElement.h b/mozilla/content/html/content/src/nsGenericHTMLElement.h index a31485c57cc..5a053fae4bb 100644 --- a/mozilla/content/html/content/src/nsGenericHTMLElement.h +++ b/mozilla/content/html/content/src/nsGenericHTMLElement.h @@ -45,7 +45,7 @@ #include "nsIContent.h" #include "nsHTMLValue.h" #include "nsVoidArray.h" -#include "nsINameSpaceManager.h" // for kNameSpaceID_HTML +#include "nsINameSpaceManager.h" // for kNameSpaceID_None #include "nsIFormControl.h" #include "nsIStatefulFrame.h" @@ -751,7 +751,7 @@ protected: NS_IMETHODIMP \ _class::Get##_method(nsAString& aValue) \ { \ - nsresult rv = GetAttr(kNameSpaceID_HTML, \ + nsresult rv = GetAttr(kNameSpaceID_None, \ nsHTMLAtoms::_atom, aValue); \ if (rv == NS_CONTENT_ATTR_NOT_THERE) { \ aValue.Assign(NS_LITERAL_STRING(_default)); \ @@ -761,7 +761,7 @@ protected: NS_IMETHODIMP \ _class::Set##_method(const nsAString& aValue) \ { \ - return SetAttr(kNameSpaceID_HTML, nsHTMLAtoms::_atom, aValue, \ + return SetAttr(kNameSpaceID_None, nsHTMLAtoms::_atom, aValue, \ PR_TRUE); \ } @@ -787,7 +787,7 @@ protected: return SetHTMLAttribute(nsHTMLAtoms::_atom, empty, PR_TRUE); \ } \ else { \ - UnsetAttr(kNameSpaceID_HTML, nsHTMLAtoms::_atom, PR_TRUE); \ + UnsetAttr(kNameSpaceID_None, nsHTMLAtoms::_atom, PR_TRUE); \ return NS_OK; \ } \ } diff --git a/mozilla/content/html/content/src/nsHTMLAnchorElement.cpp b/mozilla/content/html/content/src/nsHTMLAnchorElement.cpp index a5f0e71b9b6..0851db290e4 100644 --- a/mozilla/content/html/content/src/nsHTMLAnchorElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLAnchorElement.cpp @@ -161,7 +161,7 @@ NS_NewHTMLAnchorElement(nsIHTMLContent** aInstancePtrResult, return rv; } - *aInstancePtrResult = NS_STATIC_CAST(nsIHTMLContent *, it); + *aInstancePtrResult = it; NS_ADDREF(*aInstancePtrResult); return NS_OK; @@ -214,7 +214,7 @@ nsHTMLAnchorElement::CloneNode(PRBool aDeep, nsIDOMNode** aReturn) CopyInnerTo(this, it, aDeep); - *aReturn = NS_STATIC_CAST(nsIDOMNode *, it); + *aReturn = it; NS_ADDREF(*aReturn); @@ -236,9 +236,7 @@ NS_IMPL_STRING_ATTR(nsHTMLAnchorElement, Type, type) NS_IMETHODIMP nsHTMLAnchorElement::GetAccessKey(nsAString& aValue) { - NS_STATIC_CAST(nsIHTMLContent *, this)->GetAttr(kNameSpaceID_None, - nsHTMLAtoms::accesskey, - aValue); + GetAttr(kNameSpaceID_None, nsHTMLAtoms::accesskey, aValue); return NS_OK; } @@ -247,11 +245,8 @@ nsHTMLAnchorElement::SetAccessKey(const nsAString& aValue) { RegUnRegAccessKey(PR_FALSE); - nsresult rv = NS_STATIC_CAST(nsIHTMLContent *, - this)->SetAttr(kNameSpaceID_None, - nsHTMLAtoms::accesskey, - aValue, - PR_TRUE); + nsresult rv = SetAttr(kNameSpaceID_None, nsHTMLAtoms::accesskey, aValue, + PR_TRUE); if (!aValue.IsEmpty()) { RegUnRegAccessKey(PR_TRUE); @@ -270,9 +265,7 @@ nsresult nsHTMLAnchorElement::RegUnRegAccessKey(PRBool aDoReg) nsAutoString accessKey; nsresult rv; - rv = NS_STATIC_CAST(nsIContent *, this)->GetAttr(kNameSpaceID_None, - nsHTMLAtoms::accesskey, - accessKey); + rv = GetAttr(kNameSpaceID_None, nsHTMLAtoms::accesskey, accessKey); if (NS_CONTENT_ATTR_NOT_THERE != rv) { nsCOMPtr presContext; @@ -451,9 +444,7 @@ nsHTMLAnchorElement::SetHref(const nsAString& aValue) // somebody asks for it. mLinkState = eLinkState_Unknown; - return NS_STATIC_CAST(nsIContent *, this)->SetAttr(kNameSpaceID_HTML, - nsHTMLAtoms::href, - aValue, PR_TRUE); + return SetAttr(kNameSpaceID_None, nsHTMLAtoms::href, aValue, PR_TRUE); } NS_IMETHODIMP @@ -462,9 +453,7 @@ nsHTMLAnchorElement::GetTarget(nsAString& aValue) aValue.Truncate(); nsresult rv; - rv = NS_STATIC_CAST(nsIContent *, this)->GetAttr(kNameSpaceID_HTML, - nsHTMLAtoms::target, - aValue); + rv = GetAttr(kNameSpaceID_None, nsHTMLAtoms::target, aValue); if (rv == NS_CONTENT_ATTR_NOT_THERE && mDocument) { rv = mDocument->GetBaseTarget(aValue); NS_ENSURE_SUCCESS(rv, rv); @@ -475,9 +464,7 @@ nsHTMLAnchorElement::GetTarget(nsAString& aValue) NS_IMETHODIMP nsHTMLAnchorElement::SetTarget(const nsAString& aValue) { - return NS_STATIC_CAST(nsIContent *, this)->SetAttr(kNameSpaceID_HTML, - nsHTMLAtoms::target, - aValue, PR_TRUE); + return SetAttr(kNameSpaceID_None, nsHTMLAtoms::target, aValue, PR_TRUE); } #ifdef DEBUG @@ -764,9 +751,7 @@ nsHTMLAnchorElement::GetHrefCString(char* &aBuf) nsAutoString relURLSpec; if (NS_CONTENT_ATTR_HAS_VALUE == - NS_STATIC_CAST(nsIContent *, this)->GetAttr(kNameSpaceID_HTML, - nsHTMLAtoms::href, - relURLSpec)) { + GetAttr(kNameSpaceID_None, nsHTMLAtoms::href, relURLSpec)) { // Clean up any leading or trailing whitespace relURLSpec.Trim(" \t\n\r"); diff --git a/mozilla/content/html/content/src/nsHTMLAreaElement.cpp b/mozilla/content/html/content/src/nsHTMLAreaElement.cpp index 4db85ff5661..d6fa4fdcad9 100644 --- a/mozilla/content/html/content/src/nsHTMLAreaElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLAreaElement.cpp @@ -123,7 +123,7 @@ NS_NewHTMLAreaElement(nsIHTMLContent** aInstancePtrResult, return rv; } - *aInstancePtrResult = NS_STATIC_CAST(nsIHTMLContent *, it); + *aInstancePtrResult = it; NS_ADDREF(*aInstancePtrResult); return NS_OK; @@ -176,7 +176,7 @@ nsHTMLAreaElement::CloneNode(PRBool aDeep, nsIDOMNode** aReturn) CopyInnerTo(this, it, aDeep); - *aReturn = NS_STATIC_CAST(nsIDOMNode *, it); + *aReturn = it; NS_ADDREF(*aReturn); @@ -267,9 +267,7 @@ nsHTMLAreaElement::SetHref(const nsAString& aValue) // asks for it. mLinkState = eLinkState_Unknown; - return NS_STATIC_CAST(nsIContent *, this)->SetAttr(kNameSpaceID_HTML, - nsHTMLAtoms::href, - aValue, PR_TRUE); + return SetAttr(kNameSpaceID_None, nsHTMLAtoms::href, aValue, PR_TRUE); } #ifdef DEBUG @@ -503,10 +501,8 @@ nsHTMLAreaElement::GetHrefCString(char* &aBuf) // Get href= attribute (relative URL). nsAutoString relURLSpec; - if (NS_CONTENT_ATTR_HAS_VALUE == - NS_STATIC_CAST(nsIContent *, this)->GetAttr(kNameSpaceID_HTML, - nsHTMLAtoms::href, - relURLSpec)) { + if (GetAttr(kNameSpaceID_None, nsHTMLAtoms::href, relURLSpec) == + NS_CONTENT_ATTR_HAS_VALUE) { // Clean up any leading or trailing whitespace relURLSpec.Trim(" \t\n\r"); diff --git a/mozilla/content/html/content/src/nsHTMLButtonElement.cpp b/mozilla/content/html/content/src/nsHTMLButtonElement.cpp index c7cf6636074..2a767b33daf 100644 --- a/mozilla/content/html/content/src/nsHTMLButtonElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLButtonElement.cpp @@ -329,7 +329,7 @@ nsHTMLButtonElement::SetFocus(nsIPresContext* aPresContext) NS_ENSURE_ARG_POINTER(aPresContext); // first see if we are disabled or not. If disabled then do nothing. nsAutoString disabled; - if (NS_CONTENT_ATTR_HAS_VALUE == GetAttribute(kNameSpaceID_HTML, + if (NS_CONTENT_ATTR_HAS_VALUE == GetAttribute(kNameSpaceID_None, nsHTMLAtoms::disabled, disabled)) { return NS_OK; @@ -616,13 +616,13 @@ nsHTMLButtonElement::SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const nsresult nsHTMLButtonElement::GetDefaultValue(nsAString& aDefaultValue) { - return GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::value, aDefaultValue); + return GetAttr(kNameSpaceID_None, nsHTMLAtoms::value, aDefaultValue); } nsresult nsHTMLButtonElement::SetDefaultValue(const nsAString& aDefaultValue) { - return SetAttr(kNameSpaceID_HTML, nsHTMLAtoms::value, aDefaultValue, PR_TRUE); + return SetAttr(kNameSpaceID_None, nsHTMLAtoms::value, aDefaultValue, PR_TRUE); } NS_IMETHODIMP diff --git a/mozilla/content/html/content/src/nsHTMLFormElement.cpp b/mozilla/content/html/content/src/nsHTMLFormElement.cpp index cc36cc14021..d372bc4b377 100644 --- a/mozilla/content/html/content/src/nsHTMLFormElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLFormElement.cpp @@ -449,7 +449,7 @@ nsHTMLFormElement::GetElements(nsIDOMHTMLCollection** aElements) NS_IMETHODIMP nsHTMLFormElement::GetName(nsAString& aValue) { - return nsGenericHTMLContainerElement::GetAttr(kNameSpaceID_HTML, + return nsGenericHTMLContainerElement::GetAttr(kNameSpaceID_None, nsHTMLAtoms::name, aValue); } @@ -457,7 +457,7 @@ nsHTMLFormElement::GetName(nsAString& aValue) NS_IMETHODIMP nsHTMLFormElement::SetName(const nsAString& aValue) { - return nsGenericHTMLContainerElement::SetAttr(kNameSpaceID_HTML, + return nsGenericHTMLContainerElement::SetAttr(kNameSpaceID_None, nsHTMLAtoms::name, aValue, PR_TRUE); } @@ -471,7 +471,7 @@ NS_IMETHODIMP nsHTMLFormElement::GetTarget(nsAString& aValue) { aValue.Truncate(); - nsresult rv = nsGenericHTMLContainerElement::GetAttr(kNameSpaceID_HTML, + nsresult rv = nsGenericHTMLContainerElement::GetAttr(kNameSpaceID_None, nsHTMLAtoms::target, aValue); if (rv == NS_CONTENT_ATTR_NOT_THERE) { @@ -483,7 +483,7 @@ nsHTMLFormElement::GetTarget(nsAString& aValue) NS_IMETHODIMP nsHTMLFormElement::SetTarget(const nsAString& aValue) { - return nsGenericHTMLContainerElement::SetAttr(kNameSpaceID_HTML, + return nsGenericHTMLContainerElement::SetAttr(kNameSpaceID_None, nsHTMLAtoms::target, aValue, PR_TRUE); } diff --git a/mozilla/content/html/content/src/nsHTMLImageElement.cpp b/mozilla/content/html/content/src/nsHTMLImageElement.cpp index f29ca429974..8d87e9b4b65 100644 --- a/mozilla/content/html/content/src/nsHTMLImageElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLImageElement.cpp @@ -752,7 +752,7 @@ nsHTMLImageElement::GetSrc(nsAString& aSrc) GetBaseURL(*getter_AddRefs(baseURL)); // Get href= attribute (relative URL). - nsGenericHTMLLeafElement::GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::src, + nsGenericHTMLLeafElement::GetAttr(kNameSpaceID_None, nsHTMLAtoms::src, relURLSpec); relURLSpec.Trim(" \t\n\r"); @@ -864,7 +864,7 @@ nsresult nsHTMLImageElement::SetSrcInner(nsIURI* aBaseURL, const nsAString& aSrc) { - nsresult result = SetAttr(kNameSpaceID_HTML, nsHTMLAtoms::src, aSrc, + nsresult result = SetAttr(kNameSpaceID_None, nsHTMLAtoms::src, aSrc, PR_TRUE); if (NS_SUCCEEDED(result) && !mDocument) { diff --git a/mozilla/content/html/content/src/nsHTMLInputElement.cpp b/mozilla/content/html/content/src/nsHTMLInputElement.cpp index 97e2e3feba1..e4f557ac865 100644 --- a/mozilla/content/html/content/src/nsHTMLInputElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLInputElement.cpp @@ -257,7 +257,7 @@ protected: { nsAutoString tmp; - GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::type, tmp); + GetAttr(kNameSpaceID_None, nsHTMLAtoms::type, tmp); return tmp.EqualsIgnoreCase("image"); } @@ -482,13 +482,13 @@ nsHTMLInputElement::GetForm(nsIDOMHTMLFormElement** aForm) NS_IMETHODIMP nsHTMLInputElement::GetDefaultValue(nsAString& aDefaultValue) { - return GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::value, aDefaultValue); + return GetAttr(kNameSpaceID_None, nsHTMLAtoms::value, aDefaultValue); } NS_IMETHODIMP nsHTMLInputElement::SetDefaultValue(const nsAString& aDefaultValue) { - return SetAttr(kNameSpaceID_HTML, nsHTMLAtoms::value, aDefaultValue, + return SetAttr(kNameSpaceID_None, nsHTMLAtoms::value, aDefaultValue, PR_TRUE); } @@ -510,10 +510,10 @@ nsHTMLInputElement::SetDefaultChecked(PRBool aDefaultChecked) nsresult rv; if (aDefaultChecked) { - rv = SetAttr(kNameSpaceID_HTML, nsHTMLAtoms::checked, + rv = SetAttr(kNameSpaceID_None, nsHTMLAtoms::checked, NS_LITERAL_STRING(""), PR_TRUE); } else { - rv = UnsetAttr(kNameSpaceID_HTML, nsHTMLAtoms::checked, PR_TRUE); + rv = UnsetAttr(kNameSpaceID_None, nsHTMLAtoms::checked, PR_TRUE); } return rv; @@ -539,7 +539,7 @@ NS_IMPL_STRING_ATTR(nsHTMLInputElement, UseMap, usemap) NS_IMETHODIMP nsHTMLInputElement::GetType(nsAString& aValue) { - nsresult rv = GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::type, aValue); + nsresult rv = GetAttr(kNameSpaceID_None, nsHTMLAtoms::type, aValue); if (rv == NS_CONTENT_ATTR_NOT_THERE) aValue.Assign(NS_LITERAL_STRING("text")); @@ -550,7 +550,7 @@ nsHTMLInputElement::GetType(nsAString& aValue) NS_IMETHODIMP nsHTMLInputElement::SetType(const nsAString& aValue) { - return nsGenericHTMLLeafFormElement::SetAttr(kNameSpaceID_HTML, + return nsGenericHTMLLeafFormElement::SetAttr(kNameSpaceID_None, nsHTMLAtoms::type, aValue, PR_TRUE); } @@ -595,7 +595,7 @@ nsHTMLInputElement::GetValue(nsAString& aValue) } // Treat value == defaultValue for other input elements - nsresult rv = GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::value, aValue); + nsresult rv = GetAttr(kNameSpaceID_None, nsHTMLAtoms::value, aValue); if (rv == NS_CONTENT_ATTR_NOT_THERE && (type == NS_FORM_INPUT_RADIO || type == NS_FORM_INPUT_CHECKBOX)) { @@ -693,7 +693,7 @@ nsHTMLInputElement::SetValueSecure(const nsAString& aValue, } // Treat value == defaultValue for other input elements. - return nsGenericHTMLLeafFormElement::SetAttr(kNameSpaceID_HTML, + return nsGenericHTMLLeafFormElement::SetAttr(kNameSpaceID_None, nsHTMLAtoms::value, aValue, PR_TRUE); } @@ -936,7 +936,7 @@ nsHTMLInputElement::SetFocus(nsIPresContext* aPresContext) // first see if we are disabled or not. If disabled then do nothing. nsAutoString disabled; - if (NS_CONTENT_ATTR_HAS_VALUE == GetAttr(kNameSpaceID_HTML, + if (NS_CONTENT_ATTR_HAS_VALUE == GetAttr(kNameSpaceID_None, nsHTMLAtoms::disabled, disabled)) { return NS_OK; } @@ -1020,7 +1020,7 @@ nsHTMLInputElement::Select() // first see if we are disabled or not. If disabled then do nothing. nsAutoString disabled; - if (NS_CONTENT_ATTR_HAS_VALUE == GetAttr(kNameSpaceID_HTML, + if (NS_CONTENT_ATTR_HAS_VALUE == GetAttr(kNameSpaceID_None, nsHTMLAtoms::disabled, disabled)) { return rv; } @@ -1118,7 +1118,7 @@ nsHTMLInputElement::Click() // first see if we are disabled or not. If disabled then do nothing. nsAutoString disabled; - if (NS_CONTENT_ATTR_HAS_VALUE == GetAttr(kNameSpaceID_HTML, + if (NS_CONTENT_ATTR_HAS_VALUE == GetAttr(kNameSpaceID_None, nsHTMLAtoms::disabled, disabled)) { return rv; } diff --git a/mozilla/content/html/content/src/nsHTMLLabelElement.cpp b/mozilla/content/html/content/src/nsHTMLLabelElement.cpp index e45965fed36..3ec81a813b9 100644 --- a/mozilla/content/html/content/src/nsHTMLLabelElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLLabelElement.cpp @@ -291,7 +291,7 @@ NS_IMPL_STRING_ATTR(nsHTMLLabelElement, AccessKey, accesskey) NS_IMETHODIMP nsHTMLLabelElement::GetHtmlFor(nsAString& aValue) { - nsGenericHTMLContainerFormElement::GetAttr(kNameSpaceID_HTML, + nsGenericHTMLContainerFormElement::GetAttr(kNameSpaceID_None, nsHTMLAtoms::_for, aValue); return NS_OK; } @@ -303,7 +303,7 @@ nsHTMLLabelElement::SetHtmlFor(const nsAString& aValue) static char whitespace[] = " \r\n\t"; nsAutoString value(aValue); value.Trim(whitespace, PR_TRUE, PR_TRUE); - return nsGenericHTMLContainerFormElement::SetAttr(kNameSpaceID_HTML, + return nsGenericHTMLContainerFormElement::SetAttr(kNameSpaceID_None, nsHTMLAtoms::_for, value, PR_TRUE); } diff --git a/mozilla/content/html/content/src/nsHTMLLinkElement.cpp b/mozilla/content/html/content/src/nsHTMLLinkElement.cpp index 9a32a7966fb..ee9c07ce563 100644 --- a/mozilla/content/html/content/src/nsHTMLLinkElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLLinkElement.cpp @@ -344,9 +344,8 @@ nsHTMLLinkElement::SetHref(const nsAString& aValue) // somebody asks for it. mLinkState = eLinkState_Unknown; - nsresult rv = nsGenericHTMLLeafElement::SetAttr(kNameSpaceID_HTML, - nsHTMLAtoms::href, - aValue, + nsresult rv = nsGenericHTMLLeafElement::SetAttr(kNameSpaceID_None, + nsHTMLAtoms::href, aValue, PR_TRUE); if (NS_SUCCEEDED(rv)) { UpdateStyleSheet(); diff --git a/mozilla/content/html/content/src/nsHTMLOptionElement.cpp b/mozilla/content/html/content/src/nsHTMLOptionElement.cpp index 6f144ec0088..9c34060b012 100644 --- a/mozilla/content/html/content/src/nsHTMLOptionElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLOptionElement.cpp @@ -361,7 +361,7 @@ nsHTMLOptionElement::SetDisabled(PRBool aDisabled) if (aDisabled) { rv = SetHTMLAttribute(nsHTMLAtoms::disabled, empty, PR_TRUE); } else { - rv = UnsetAttr(kNameSpaceID_HTML, nsHTMLAtoms::disabled, PR_TRUE); + rv = UnsetAttr(kNameSpaceID_None, nsHTMLAtoms::disabled, PR_TRUE); } return NS_OK; @@ -370,7 +370,7 @@ nsHTMLOptionElement::SetDisabled(PRBool aDisabled) NS_IMETHODIMP nsHTMLOptionElement::GetLabel(nsAString& aValue) { - nsGenericHTMLContainerElement::GetAttr(kNameSpaceID_HTML, + nsGenericHTMLContainerElement::GetAttr(kNameSpaceID_None, nsHTMLAtoms::label, aValue); return NS_OK; } @@ -380,7 +380,7 @@ nsHTMLOptionElement::SetLabel(const nsAString& aValue) { nsresult result; - result = nsGenericHTMLContainerElement::SetAttr(kNameSpaceID_HTML, + result = nsGenericHTMLContainerElement::SetAttr(kNameSpaceID_None, nsHTMLAtoms::label, aValue, PR_TRUE); // XXX Why does this only happen to the combobox? and what about @@ -412,7 +412,7 @@ nsHTMLOptionElement::SetDefaultSelected(PRBool aDefaultSelected) if (aDefaultSelected) { rv = SetHTMLAttribute(nsHTMLAtoms::selected, empty, PR_TRUE); } else { - rv = UnsetAttr(kNameSpaceID_HTML, nsHTMLAtoms::selected, PR_TRUE); + rv = UnsetAttr(kNameSpaceID_None, nsHTMLAtoms::selected, PR_TRUE); } return rv; @@ -764,7 +764,7 @@ nsHTMLOptionElement::Initialize(JSContext* aContext, nsAutoString value(NS_REINTERPRET_CAST(const PRUnichar*, JS_GetStringChars(jsstr))); - result = nsGenericHTMLContainerElement::SetAttr(kNameSpaceID_HTML, + result = nsGenericHTMLContainerElement::SetAttr(kNameSpaceID_None, nsHTMLAtoms::value, value, PR_FALSE); if (NS_FAILED(result)) { diff --git a/mozilla/content/html/content/src/nsHTMLSelectElement.cpp b/mozilla/content/html/content/src/nsHTMLSelectElement.cpp index 93968b9dcaa..223ddb899b5 100644 --- a/mozilla/content/html/content/src/nsHTMLSelectElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLSelectElement.cpp @@ -1521,7 +1521,7 @@ nsHTMLSelectElement::SetFocus(nsIPresContext* aPresContext) nsAutoString disabled; if (NS_CONTENT_ATTR_HAS_VALUE == - nsGenericHTMLContainerFormElement::GetAttr(kNameSpaceID_HTML, + nsGenericHTMLContainerFormElement::GetAttr(kNameSpaceID_None, nsHTMLAtoms::disabled, disabled)) { return NS_OK; @@ -2251,12 +2251,12 @@ nsHTMLOptionCollection::NamedItem(const nsAString& aName, if (content) { nsAutoString name; - if (((content->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::name, + if (((content->GetAttr(kNameSpaceID_None, nsHTMLAtoms::name, name) == NS_CONTENT_ATTR_HAS_VALUE) && - (aName.Equals(name))) || - ((content->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::id, + aName.Equals(name)) || + ((content->GetAttr(kNameSpaceID_None, nsHTMLAtoms::id, name) == NS_CONTENT_ATTR_HAS_VALUE) && - (aName.Equals(name)))) { + aName.Equals(name))) { rv = CallQueryInterface(content, aReturn); } } diff --git a/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp b/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp index 56fea01cbca..51bc6c3e03e 100644 --- a/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp @@ -276,7 +276,7 @@ nsHTMLTextAreaElement::SetFocus(nsIPresContext* aPresContext) nsAutoString disabled; if (NS_CONTENT_ATTR_HAS_VALUE == - nsGenericHTMLContainerFormElement::GetAttr(kNameSpaceID_HTML, + nsGenericHTMLContainerFormElement::GetAttr(kNameSpaceID_None, nsHTMLAtoms::disabled, disabled)) { return NS_OK; @@ -341,7 +341,7 @@ nsHTMLTextAreaElement::Select() // first see if we are disabled or not. If disabled then do nothing. nsAutoString disabled; if (NS_CONTENT_ATTR_HAS_VALUE == - nsGenericHTMLContainerFormElement::GetAttr(kNameSpaceID_HTML, + nsGenericHTMLContainerFormElement::GetAttr(kNameSpaceID_None, nsHTMLAtoms::disabled, disabled)) { return rv; diff --git a/mozilla/content/html/content/src/nsHTMLUnknownElement.cpp b/mozilla/content/html/content/src/nsHTMLUnknownElement.cpp index 30c60b1a88b..f4cb3df05ea 100644 --- a/mozilla/content/html/content/src/nsHTMLUnknownElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLUnknownElement.cpp @@ -175,51 +175,9 @@ nsHTMLUnknownElement::SetAttribute(PRInt32 aNameSpaceID, PRBool aNotify) { nsresult result = NS_OK; - NS_ASSERTION((kNameSpaceID_HTML == aNameSpaceID) || - (kNameSpaceID_None == aNameSpaceID) || - (kNameSpaceID_Unknown == aNameSpaceID), - "html content only holds HTML attributes"); - - if ((kNameSpaceID_HTML != aNameSpaceID) && - (kNameSpaceID_None != aNameSpaceID) && - (kNameSpaceID_Unknown != aNameSpaceID)) { - return NS_ERROR_ILLEGAL_VALUE; - } // Check for event handlers - if (nsLayoutAtoms::onclick == aAttribute || - nsLayoutAtoms::ondblclick == aAttribute || - nsLayoutAtoms::onmousedown == aAttribute || - nsLayoutAtoms::onmouseup == aAttribute || - nsLayoutAtoms::onmouseover == aAttribute || - nsLayoutAtoms::onmouseout == aAttribute || - nsLayoutAtoms::onkeydown == aAttribute || - nsLayoutAtoms::onkeyup == aAttribute || - nsLayoutAtoms::onkeypress == aAttribute || - nsLayoutAtoms::onmousemove == aAttribute || - nsLayoutAtoms::onload == aAttribute || - nsLayoutAtoms::onunload == aAttribute || - nsLayoutAtoms::onabort == aAttribute || - nsLayoutAtoms::onerror == aAttribute || - nsLayoutAtoms::onfocus == aAttribute || - nsLayoutAtoms::onblur == aAttribute || - nsLayoutAtoms::onsubmit == aAttribute || - nsLayoutAtoms::onreset == aAttribute || - nsLayoutAtoms::onchange == aAttribute || - nsLayoutAtoms::onselect == aAttribute || - nsLayoutAtoms::onpaint == aAttribute || - nsLayoutAtoms::onresize == aAttribute || - nsLayoutAtoms::onscroll == aAttribute || - nsLayoutAtoms::oninput == aAttribute || - nsLayoutAtoms::oncontextmenu == aAttribute || - nsLayoutAtoms::onDOMAttrModified == aAttribute || - nsLayoutAtoms::onDOMCharacterDataModified == aAttribute || - nsLayoutAtoms::onDOMSubtreeModified == aAttribute || - nsLayoutAtoms::onDOMNodeInsertedIntoDocument == aAttribute || - nsLayoutAtoms::onDOMNodeRemovedFromDocument == aAttribute || - nsLayoutAtoms::onDOMNodeInserted == aAttribute || - nsLayoutAtoms::onDOMNodeRemoved == aAttribute - ) { + if (aNameSpaceID == kNameSpaceID_None && IsEventName(aAttribute)) { AddScriptEventListener(aAttribute, aValue); } diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp index abfdb2e30d7..23c433ecfa6 100644 --- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp +++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp @@ -787,10 +787,10 @@ HTMLContentSink::AddAttributes(const nsIParserNode& aNode, cname.get()))); // Add attribute to content - aContent->SetAttr(kNameSpaceID_HTML, keyAtom, uv, aNotify); + aContent->SetAttr(kNameSpaceID_None, keyAtom, uv, aNotify); } else { // Add attribute to content - aContent->SetAttr(kNameSpaceID_HTML, keyAtom, v, aNotify); + aContent->SetAttr(kNameSpaceID_None, keyAtom, v, aNotify); } } } @@ -3964,10 +3964,12 @@ void HTMLContentSink::AddBaseTagInfo(nsIHTMLContent* aContent) { if (!mBaseHREF.IsEmpty()) { - aContent->SetAttr(kNameSpaceID_HTML, nsHTMLAtoms::_baseHref, mBaseHREF, PR_FALSE); + aContent->SetAttr(kNameSpaceID_None, nsHTMLAtoms::_baseHref, mBaseHREF, + PR_FALSE); } if (!mBaseTarget.IsEmpty()) { - aContent->SetAttr(kNameSpaceID_HTML, nsHTMLAtoms::_baseTarget, mBaseTarget, PR_FALSE); + aContent->SetAttr(kNameSpaceID_None, nsHTMLAtoms::_baseTarget, + mBaseTarget, PR_FALSE); } } @@ -4104,10 +4106,12 @@ HTMLContentSink::ProcessBASETag(const nsIParserNode& aNode) parent->AppendChildTo(element, PR_FALSE, PR_FALSE); if (!mInsideNoXXXTag) { nsAutoString value; - if (NS_CONTENT_ATTR_HAS_VALUE == element->GetAttr(kNameSpaceID_None, nsHTMLAtoms::href, value)) { + if (element->GetAttr(kNameSpaceID_None, nsHTMLAtoms::href, + value) == NS_CONTENT_ATTR_HAS_VALUE) { ProcessBaseHref(value); } - if (NS_CONTENT_ATTR_HAS_VALUE == element->GetAttr(kNameSpaceID_None, nsHTMLAtoms::target, value)) { + if (element->GetAttr(kNameSpaceID_None, nsHTMLAtoms::target, + value) == NS_CONTENT_ATTR_HAS_VALUE) { ProcessBaseTarget(value); } } @@ -4354,7 +4358,8 @@ HTMLContentSink::ProcessStyleLink(nsIHTMLContent* aElement, */ PRBool doneLoading; - result = mCSSLoader->LoadStyleLink(aElement, url, aTitle, aMedia, kNameSpaceID_Unknown, + result = mCSSLoader->LoadStyleLink(aElement, url, aTitle, aMedia, + kNameSpaceID_Unknown, mStyleSheetCount++, ((blockParser) ? mParser : nsnull), doneLoading, @@ -4382,7 +4387,7 @@ HTMLContentSink::ProcessLINKTag(const nsIParserNode& aNode) // Create content object nsCOMPtr element; nsCOMPtr nodeInfo; - mNodeInfoManager->GetNodeInfo(nsHTMLAtoms::link, nsnull, kNameSpaceID_HTML, + mNodeInfoManager->GetNodeInfo(nsHTMLAtoms::link, nsnull, kNameSpaceID_None, *getter_AddRefs(nodeInfo)); result = NS_CreateHTMLElement(getter_AddRefs(element), nodeInfo, PR_FALSE); diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp index bd072732d75..1b90ef84821 100644 --- a/mozilla/content/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp @@ -111,6 +111,7 @@ #include "nsISelectElement.h" #include "nsIFrameSelection.h" #include "nsISelectionPrivate.h"//for toStringwithformat code +#include "nsIElementFactory.h" #include "nsICharsetDetector.h" #include "nsICharsetDetectionAdaptor.h" @@ -1562,14 +1563,16 @@ nsHTMLDocument::CreateElementNS(const nsAString& aNamespaceURI, PRInt32 namespaceID; nodeInfo->GetNamespaceID(namespaceID); - nsCOMPtr content; - if (namespaceID == kNameSpaceID_HTML) { - nsCOMPtr htmlContent; + nsCOMPtr elementFactory; + mNameSpaceManager->GetElementFactory(namespaceID, + getter_AddRefs(elementFactory)); - rv = NS_CreateHTMLElement(getter_AddRefs(htmlContent), nodeInfo, PR_FALSE); - content = do_QueryInterface(htmlContent); - } - else { + nsCOMPtr content; + + if (elementFactory) { + rv = elementFactory->CreateInstanceByTag(nodeInfo, + getter_AddRefs(content)); + } else { rv = NS_NewXMLElement(getter_AddRefs(content), nodeInfo); } @@ -1577,7 +1580,7 @@ nsHTMLDocument::CreateElementNS(const nsAString& aNamespaceURI, content->SetContentID(mNextContentID++); - return content->QueryInterface(NS_GET_IID(nsIDOMElement), (void**)aReturn); + return CallQueryInterface(content, aReturn); } @@ -2115,16 +2118,16 @@ nsHTMLDocument::SetBody(nsIDOMHTMLElement* aBody) NS_IMETHODIMP nsHTMLDocument::GetImages(nsIDOMHTMLCollection** aImages) { - if (nsnull == mImages) { + if (!mImages) { mImages = new nsContentList(this, nsHTMLAtoms::img, kNameSpaceID_Unknown); - if (nsnull == mImages) { + if (!mImages) { return NS_ERROR_OUT_OF_MEMORY; } NS_ADDREF(mImages); } *aImages = (nsIDOMHTMLCollection *)mImages; - NS_ADDREF(mImages); + NS_ADDREF(*aImages); return NS_OK; } @@ -2132,16 +2135,17 @@ nsHTMLDocument::GetImages(nsIDOMHTMLCollection** aImages) NS_IMETHODIMP nsHTMLDocument::GetApplets(nsIDOMHTMLCollection** aApplets) { - if (nsnull == mApplets) { - mApplets = new nsContentList(this, nsHTMLAtoms::applet, kNameSpaceID_Unknown); - if (nsnull == mApplets) { + if (!mApplets) { + mApplets = new nsContentList(this, nsHTMLAtoms::applet, + kNameSpaceID_None); + if (!mApplets) { return NS_ERROR_OUT_OF_MEMORY; } NS_ADDREF(mApplets); } *aApplets = (nsIDOMHTMLCollection *)mApplets; - NS_ADDREF(mApplets); + NS_ADDREF(*aApplets); return NS_OK; } @@ -2149,19 +2153,14 @@ nsHTMLDocument::GetApplets(nsIDOMHTMLCollection** aApplets) PRBool nsHTMLDocument::MatchLinks(nsIContent *aContent, nsString* aData) { - nsIAtom *name; - aContent->GetTag(name); - nsAutoString attr; - PRBool result = PR_FALSE; - - if ((nsnull != name) && - ((nsHTMLAtoms::area == name) || (nsHTMLAtoms::a == name)) && - (NS_CONTENT_ATTR_HAS_VALUE == aContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::href, attr))) { - result = PR_TRUE; + nsCOMPtr name; + aContent->GetTag(*getter_AddRefs(name)); + + if (name == nsHTMLAtoms::area || name == nsHTMLAtoms::a) { + return aContent->HasAttr(kNameSpaceID_None, nsHTMLAtoms::href); } - NS_IF_RELEASE(name); - return result; + return PR_FALSE; } NS_IMETHODIMP @@ -2184,19 +2183,14 @@ nsHTMLDocument::GetLinks(nsIDOMHTMLCollection** aLinks) PRBool nsHTMLDocument::MatchAnchors(nsIContent *aContent, nsString* aData) { - nsIAtom *name; - aContent->GetTag(name); - nsAutoString attr; - PRBool result = PR_FALSE; - - if ((nsnull != name) && - (nsHTMLAtoms::a == name) && - (NS_CONTENT_ATTR_HAS_VALUE == aContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::name, attr))) { - result = PR_TRUE; + nsCOMPtr name; + aContent->GetTag(*getter_AddRefs(name)); + + if (name == nsHTMLAtoms::a) { + return aContent->HasAttr(kNameSpaceID_None, nsHTMLAtoms::name); } - NS_IF_RELEASE(name); - return result; + return PR_FALSE; } NS_IMETHODIMP @@ -2751,20 +2745,24 @@ nsHTMLDocument::Writeln() nsIContent * nsHTMLDocument::MatchId(nsIContent *aContent, const nsAString& aId) { - nsAutoString value; + // Most elements don't have an id, so lets call the faster HasAttr() + // method before we create a string object and call GetAttr(). - nsresult rv = aContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::id, - value); + if (aContent->HasAttr(kNameSpaceID_None, nsHTMLAtoms::id)) { + nsAutoString value; - if (rv == NS_CONTENT_ATTR_HAS_VALUE && aId.Equals(value)) { - return aContent; + nsresult rv = aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::id, value); + + if (rv == NS_CONTENT_ATTR_HAS_VALUE && aId.Equals(value)) { + return aContent; + } } - + nsIContent *result = nsnull; PRInt32 i, count; aContent->ChildCount(count); - for (i = 0; i < count && result == nsnull; i++) { + for (i = 0; i < count && !result; i++) { nsIContent *child; aContent->ChildAt(i, child); result = MatchId(child, aId); @@ -2849,17 +2847,23 @@ nsHTMLDocument::GetElementsByTagNameNS(const nsAString& aNamespaceURI, PRBool nsHTMLDocument::MatchNameAttribute(nsIContent* aContent, nsString* aData) { - nsAutoString name; + // Most elements don't have a name attribute, so lets call the + // faster HasAttr() method before we create a string object and call + // GetAttr(). - nsresult rv = aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::name, - name); - - if (NS_SUCCEEDED(rv) && aData && name.Equals(*aData)) { - return PR_TRUE; - } - else { + if (!aContent->HasAttr(kNameSpaceID_None, nsHTMLAtoms::name) || !aData) { return PR_FALSE; } + + nsAutoString name; + + nsresult rv = aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::name, name); + + if (NS_SUCCEEDED(rv) && name.Equals(*aData)) { + return PR_TRUE; + } + + return PR_FALSE; } NS_IMETHODIMP @@ -3862,15 +3866,15 @@ nsHTMLDocument::GetBodyContent() root->ChildAt(i, *getter_AddRefs(child)); NS_ENSURE_TRUE(child, NS_ERROR_UNEXPECTED); - nsCOMPtr ni; - child->GetNodeInfo(*getter_AddRefs(ni)); + if (child->IsContentOfType(nsIContent::eHTML)) { + nsCOMPtr ni; + child->GetNodeInfo(*getter_AddRefs(ni)); - if (ni && ni->Equals(nsHTMLAtoms::body) && - (ni->NamespaceEquals(kNameSpaceID_None) || - ni->NamespaceEquals(kNameSpaceID_HTML))) { - mBodyContent = do_QueryInterface(child); + if (ni->Equals(nsHTMLAtoms::body)) { + mBodyContent = do_QueryInterface(child); - return PR_TRUE; + return PR_TRUE; + } } } diff --git a/mozilla/content/html/document/src/nsHTMLFragmentContentSink.cpp b/mozilla/content/html/document/src/nsHTMLFragmentContentSink.cpp index 0412197ed9a..0c05cc23b0c 100644 --- a/mozilla/content/html/document/src/nsHTMLFragmentContentSink.cpp +++ b/mozilla/content/html/document/src/nsHTMLFragmentContentSink.cpp @@ -920,12 +920,12 @@ nsHTMLFragmentContentSink::AddAttributes(const nsIParserNode& aNode, nsIAtom* keyAtom = NS_NewAtom(k); if (NS_CONTENT_ATTR_NOT_THERE == - aContent->GetAttr(kNameSpaceID_HTML, keyAtom, v)) { + aContent->GetAttr(kNameSpaceID_None, keyAtom, v)) { // Get value and remove mandatory quotes GetAttributeValueAt(aNode, i, v); // Add attribute to content - aContent->SetAttr(kNameSpaceID_HTML, keyAtom, v, PR_FALSE); + aContent->SetAttr(kNameSpaceID_None, keyAtom, v, PR_FALSE); } NS_RELEASE(keyAtom); } diff --git a/mozilla/content/html/style/src/nsCSSParser.cpp b/mozilla/content/html/style/src/nsCSSParser.cpp index 3e185b76cf6..afec891505f 100644 --- a/mozilla/content/html/style/src/nsCSSParser.cpp +++ b/mozilla/content/html/style/src/nsCSSParser.cpp @@ -2109,7 +2109,8 @@ void CSSParserImpl::ParseAttributeSelector(PRInt32& aDataMask, } if (mToken.IsSymbol(']')) { PRBool isCaseSensitive = mCaseSensitive; - if (nameSpaceID == kNameSpaceID_None || nameSpaceID == kNameSpaceID_HTML) { + if (nameSpaceID == kNameSpaceID_None || + nameSpaceID == kNameSpaceID_XHTML) { static const char* caseSensitiveHTMLAttribute[] = { // list based on http://www.w3.org/TR/REC-html40/index/attributes.html "abbr", "alt", "label", diff --git a/mozilla/content/xml/document/src/nsXMLContentSink.cpp b/mozilla/content/xml/document/src/nsXMLContentSink.cpp index 9d7f1389489..3f33f48ea11 100644 --- a/mozilla/content/xml/document/src/nsXMLContentSink.cpp +++ b/mozilla/content/xml/document/src/nsXMLContentSink.cpp @@ -110,7 +110,6 @@ #include "nsHTMLTokens.h" static char kNameSpaceSeparator = ':'; -static char kStyleSheetPI[] = "xml-stylesheet"; #define kXSLType "text/xsl" static NS_DEFINE_CID(kNameSpaceManagerCID, NS_NAMESPACEMANAGER_CID); @@ -156,9 +155,13 @@ nsXMLContentSink::nsXMLContentSink() NS_INIT_REFCNT(); gRefCnt++; if (gRefCnt == 1) { - nsresult rv = nsServiceManager::GetService(kNameSpaceManagerCID, - NS_GET_IID(nsINameSpaceManager), - (nsISupports**) &gNameSpaceManager); +#ifdef DEBUG + nsresult rv = +#endif + nsServiceManager::GetService(kNameSpaceManagerCID, + NS_GET_IID(nsINameSpaceManager), + (nsISupports**) &gNameSpaceManager); + NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get namespace manager"); } @@ -650,23 +653,6 @@ nsXMLContentSink::AddContentAsLeaf(nsIContent *aContent) return result; } -static void -ParseProcessingInstruction(const nsString& aText, - nsString& aTarget, - nsString& aData) -{ - PRInt32 offset; - - aTarget.Truncate(); - aData.Truncate(); - - offset = aText.FindCharInSet(" \n\r\t"); - if (-1 != offset) { - aText.Mid(aTarget, 2, offset-2); - aText.Mid(aData, offset+1, aText.Length()-offset-3); - } -} - // Create an XML parser and an XSL content sink and start parsing // the XSL stylesheet located at the given URL. nsresult @@ -1196,12 +1182,6 @@ nsXMLContentSink::PopNameSpaces() return nsnull; } -PRBool -nsXMLContentSink::IsHTMLNameSpace(PRInt32 aID) -{ - return PRBool(kNameSpaceID_HTML == aID); -} - nsIContent* nsXMLContentSink::GetCurrentContent() { @@ -1608,7 +1588,6 @@ nsXMLContentSink::HandleStartElement(const PRUnichar *aName, PRUint32 aLineNumber) { nsresult result = NS_OK; - PRBool isHTML = PR_FALSE; PRBool appendContent = PR_TRUE; nsCOMPtr content; @@ -1643,9 +1622,9 @@ nsXMLContentSink::HandleStartElement(const PRUnichar *aName, mNodeInfoManager->GetNodeInfo(tagAtom, nameSpacePrefix, nameSpaceID, *getter_AddRefs(nodeInfo)); - isHTML = IsHTMLNameSpace(nameSpaceID); + const PRBool isXHTML = nameSpaceID == kNameSpaceID_XHTML; - if (isHTML) { + if (isXHTML) { if (tagAtom.get() == nsHTMLAtoms::script) { result = ProcessStartSCRIPTTag(aLineNumber); // Don't append the content to the tree until we're all @@ -1678,7 +1657,7 @@ nsXMLContentSink::HandleStartElement(const PRUnichar *aName, mDocument->GetAndIncrementContentID(&id); content->SetContentID(id); - if (isHTML && + if (isXHTML && ((tagAtom == nsHTMLAtoms::link) || (tagAtom == nsHTMLAtoms::style))) { nsCOMPtr ssle(do_QueryInterface(content)); @@ -1692,7 +1671,7 @@ nsXMLContentSink::HandleStartElement(const PRUnichar *aName, content->SetDocument(mDocument, PR_FALSE, PR_TRUE); // Set the attributes on the new content element - result = AddAttributes(aAtts, content, isHTML); + result = AddAttributes(aAtts, content, isXHTML); if (NS_OK == result) { // If this is the document element @@ -1715,9 +1694,11 @@ nsXMLContentSink::HandleStartElement(const PRUnichar *aName, } // Set the ID attribute atom on the node info object for this node - if (aIndex != -1) { - nsCOMPtr IDAttr = dont_AddRef(NS_NewAtom((const PRUnichar *) aAtts[aIndex])); - if (IDAttr && NS_SUCCEEDED(result)) { + if ((aIndex != (PRUint32)-1) && NS_SUCCEEDED(result)) { + nsCOMPtr IDAttr = + dont_AddRef(NS_NewAtom((const PRUnichar *)aAtts[aIndex])); + + if (IDAttr) { result = nodeInfo->SetIDAttributeAtom(IDAttr); } } @@ -1960,7 +1941,6 @@ nsXMLContentSink::HandleProcessingInstruction(const PRUnichar *aTarget, nsCOMPtr node; - // ParseProcessingInstruction(text, target, data); result = NS_NewXMLProcessingInstruction(getter_AddRefs(node), target, data); if (NS_OK == result) { nsCOMPtr ssle(do_QueryInterface(node)); @@ -2055,14 +2035,16 @@ nsXMLContentSink::ReportError(const PRUnichar* aErrorText, const PRUnichar* atts[] = {name.get(), value.get(), nsnull}; - rv = HandleStartElement(NS_LITERAL_STRING("parsererror").get(), atts, 1, -1, -1); + rv = HandleStartElement(NS_LITERAL_STRING("parsererror").get(), atts, 1, + (PRUint32)-1, (PRUint32)-1); NS_ENSURE_SUCCESS(rv,rv); rv = HandleCharacterData(aErrorText, nsCRT::strlen(aErrorText)); NS_ENSURE_SUCCESS(rv,rv); const PRUnichar* noAtts[] = {0, 0}; - rv = HandleStartElement(NS_LITERAL_STRING("sourcetext").get(), noAtts, 0, -1, -1); + rv = HandleStartElement(NS_LITERAL_STRING("sourcetext").get(), noAtts, 0, + (PRUint32)-1, (PRUint32)-1); NS_ENSURE_SUCCESS(rv,rv); rv = HandleCharacterData(aSourceText, nsCRT::strlen(aSourceText)); diff --git a/mozilla/content/xml/document/src/nsXMLContentSink.h b/mozilla/content/xml/document/src/nsXMLContentSink.h index 9a8477b1bfd..41e7d5f2f4a 100644 --- a/mozilla/content/xml/document/src/nsXMLContentSink.h +++ b/mozilla/content/xml/document/src/nsXMLContentSink.h @@ -147,7 +147,6 @@ protected: nsIAtom **aTagName); PRInt32 GetNameSpaceId(nsIAtom* aPrefix); nsINameSpace* PopNameSpaces(); - PRBool IsHTMLNameSpace(PRInt32 aId); nsIContent* GetCurrentContent(); PRInt32 PushContent(nsIContent *aContent); diff --git a/mozilla/content/xml/document/src/nsXMLDocument.cpp b/mozilla/content/xml/document/src/nsXMLDocument.cpp index 6f6b86b50c1..5e0a3178e72 100644 --- a/mozilla/content/xml/document/src/nsXMLDocument.cpp +++ b/mozilla/content/xml/document/src/nsXMLDocument.cpp @@ -938,7 +938,7 @@ MatchId(nsIContent *aContent, const nsAString& aName) PRInt32 ns; aContent->GetNameSpaceID(ns); - if (kNameSpaceID_HTML == ns) { + if (kNameSpaceID_XHTML == ns) { if ((NS_CONTENT_ATTR_HAS_VALUE == aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::id, value)) && aName.Equals(value)) { return aContent; @@ -1067,7 +1067,6 @@ nsXMLDocument::CreateElement(nsINodeInfo *aNodeInfo, nsIDOMElement** aResult) aNodeInfo->GetNamespaceID(namespaceID); nsCOMPtr elementFactory; - mNameSpaceManager->GetElementFactory(namespaceID, getter_AddRefs(elementFactory)); diff --git a/mozilla/content/xul/document/src/nsXULContentSink.cpp b/mozilla/content/xul/document/src/nsXULContentSink.cpp index 4efbab66fa3..a0eb6249d9a 100644 --- a/mozilla/content/xul/document/src/nsXULContentSink.cpp +++ b/mozilla/content/xul/document/src/nsXULContentSink.cpp @@ -1315,7 +1315,7 @@ XULContentSinkImpl::OpenRoot(const PRUnichar** aAttributes, nsresult rv; - if (aNodeInfo->Equals(kScriptAtom, kNameSpaceID_HTML) || + if (aNodeInfo->Equals(kScriptAtom, kNameSpaceID_XHTML) || aNodeInfo->Equals(kScriptAtom, kNameSpaceID_XUL)) { PR_LOG(gLog, PR_LOG_ALWAYS, ("xul: script tag not allowed as root content element")); @@ -1395,7 +1395,7 @@ XULContentSinkImpl::OpenTag(const PRUnichar** aAttributes, children->AppendElement(element); - if (aNodeInfo->Equals(kScriptAtom, kNameSpaceID_HTML) || + if (aNodeInfo->Equals(kScriptAtom, kNameSpaceID_XHTML) || aNodeInfo->Equals(kScriptAtom, kNameSpaceID_XUL)) { // Do scripty things now. OpenScript will push the // nsPrototypeScriptElement onto the stack, so we're done after this. diff --git a/mozilla/content/xul/document/src/nsXULDocument.cpp b/mozilla/content/xul/document/src/nsXULDocument.cpp index efe7b2f2741..b8b51d720db 100644 --- a/mozilla/content/xul/document/src/nsXULDocument.cpp +++ b/mozilla/content/xul/document/src/nsXULDocument.cpp @@ -6001,7 +6001,7 @@ nsXULDocument::CreateElement(nsXULPrototypeElement* aPrototype, nsIContent** aRe nsCOMPtr result; - if (aPrototype->mNodeInfo->NamespaceEquals(kNameSpaceID_HTML)) { + if (aPrototype->mNodeInfo->NamespaceEquals(kNameSpaceID_XHTML)) { // If it's an HTML element, it's gonna be heavyweight no matter // what. So we need to copy everything out of the prototype // into the element. diff --git a/mozilla/content/xul/templates/src/nsXULContentBuilder.cpp b/mozilla/content/xul/templates/src/nsXULContentBuilder.cpp index 4c763016615..12b6a0a4756 100644 --- a/mozilla/content/xul/templates/src/nsXULContentBuilder.cpp +++ b/mozilla/content/xul/templates/src/nsXULContentBuilder.cpp @@ -1593,7 +1593,7 @@ nsXULContentBuilder::CreateElement(PRInt32 aNameSpaceID, rv = nsXULElement::Create(nodeInfo, getter_AddRefs(result)); if (NS_FAILED(rv)) return rv; } - else if (aNameSpaceID == kNameSpaceID_HTML) { + else if (aNameSpaceID == kNameSpaceID_XHTML) { rv = gHTMLElementFactory->CreateInstanceByTag(nodeInfo, getter_AddRefs(result)); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp index 51bba8a25df..afd2452b46d 100644 --- a/mozilla/layout/base/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp @@ -1603,7 +1603,7 @@ nsCSSFrameConstructor::CreateInputFrame(nsIPresShell *aPresShell, { // Figure out which type of input frame to create nsAutoString val; - if (NS_OK == aContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::type, val)) { + if (NS_OK == aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::type, val)) { if (val.EqualsIgnoreCase("submit") || val.EqualsIgnoreCase("reset") || val.EqualsIgnoreCase("button")) { @@ -3364,8 +3364,7 @@ nsCSSFrameConstructor::ConstructDocElementFrame(nsIPresShell* aPresShell, PRInt32 nameSpaceID; #endif #ifdef INCLUDE_XUL - if (NS_SUCCEEDED(aDocElement->GetNameSpaceID(nameSpaceID)) && - nameSpaceID == nsXULAtoms::nameSpaceID) { + if (aDocElement->IsContentOfType(nsIContent::eXUL)) { rv = NS_NewDocElementBoxFrame(aPresShell, &contentFrame); if (NS_FAILED(rv)) { return rv; @@ -3581,9 +3580,7 @@ nsCSSFrameConstructor::ConstructRootFrame(nsIPresShell* aPresShell, if (!isPaginated) { #ifdef INCLUDE_XUL - PRInt32 nameSpaceID; - if (NS_SUCCEEDED(aDocElement->GetNameSpaceID(nameSpaceID)) && - nameSpaceID == nsXULAtoms::nameSpaceID) + if (aDocElement->IsContentOfType(nsIContent::eXUL)) { NS_NewRootBoxFrame(aPresShell, &rootFrame); } else @@ -3623,11 +3620,12 @@ nsCSSFrameConstructor::ConstructRootFrame(nsIPresShell* aPresShell, // Currently OVERFLOW_SCROLL isn't honored, as // scrollportview::SetScrollPref is not implemented. - PRInt32 nameSpaceID; - aDocElement->GetNameSpaceID(nameSpaceID); + PRBool isHTML = aDocElement->IsContentOfType(nsIContent::eHTML); + PRBool isXUL = PR_FALSE; - PRBool isHTML = (nameSpaceID == kNameSpaceID_HTML); - PRBool isXUL = (nameSpaceID == nsXULAtoms::nameSpaceID); + if (!isHTML) { + isXUL = aDocElement->IsContentOfType(nsIContent::eXUL); + } // Never create scrollbars for XUL documents #ifdef INCLUDE_XUL @@ -4618,8 +4616,9 @@ nsCSSFrameConstructor::ConstructHTMLFrame(nsIPresShell* aPresShell, nsFrameItems& aFrameItems) { // Ignore the tag if it's not HTML content - if (aNameSpaceID != kNameSpaceID_HTML) + if (!aContent->IsContentOfType(nsIContent::eHTML)) { return NS_OK; + } PRBool processChildren = PR_FALSE; // whether we should process child content PRBool isAbsolutelyPositioned = PR_FALSE; diff --git a/mozilla/layout/base/nsFrameManager.cpp b/mozilla/layout/base/nsFrameManager.cpp index 6ea022bb9c1..32efdf9ce68 100644 --- a/mozilla/layout/base/nsFrameManager.cpp +++ b/mozilla/layout/base/nsFrameManager.cpp @@ -2171,7 +2171,7 @@ FrameManager::GenerateStateKey(nsIContent* aContent, KeyAppendAtom(tag, aKey); nsAutoString name; - aContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::name, name); + aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::name, name); KeyAppendString(name, aKey); } diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp index 27b5391860e..f51917be999 100644 --- a/mozilla/layout/base/nsPresShell.cpp +++ b/mozilla/layout/base/nsPresShell.cpp @@ -2284,7 +2284,7 @@ nsresult PresShell::CreatePreferenceStyleSheet(void) NS_ASSERTION(uri, "null but no error"); result = mPrefStyleSheet->Init(uri); if (NS_SUCCEEDED(result)) { - mPrefStyleSheet->SetDefaultNameSpaceID(kNameSpaceID_HTML); + mPrefStyleSheet->SetDefaultNameSpaceID(kNameSpaceID_XHTML); mStyleSet->InsertUserStyleSheetBefore(mPrefStyleSheet, nsnull); } } diff --git a/mozilla/layout/forms/nsButtonFrameRenderer.cpp b/mozilla/layout/forms/nsButtonFrameRenderer.cpp index 7240a224c5e..3efa0ad742f 100644 --- a/mozilla/layout/forms/nsButtonFrameRenderer.cpp +++ b/mozilla/layout/forms/nsButtonFrameRenderer.cpp @@ -52,7 +52,6 @@ MOZ_DECL_CTOR_COUNTER(nsButtonFrameRenderer) nsButtonFrameRenderer::nsButtonFrameRenderer() { MOZ_COUNT_CTOR(nsButtonFrameRenderer); - mNameSpace = kNameSpaceID_HTML; } nsButtonFrameRenderer::~nsButtonFrameRenderer() @@ -60,12 +59,6 @@ nsButtonFrameRenderer::~nsButtonFrameRenderer() MOZ_COUNT_DTOR(nsButtonFrameRenderer); } -void -nsButtonFrameRenderer::SetNameSpace(PRInt32 aNameSpace) -{ - mNameSpace = aNameSpace; -} - void nsButtonFrameRenderer::SetFrame(nsFrame* aFrame, nsIPresContext* aPresContext) { @@ -79,12 +72,6 @@ nsButtonFrameRenderer::GetFrame() return mFrame; } -PRInt32 -nsButtonFrameRenderer::GetNameSpace() -{ - return mNameSpace; -} - void nsButtonFrameRenderer::SetDisabled(PRBool aDisabled, PRBool notify) { @@ -93,9 +80,10 @@ nsButtonFrameRenderer::SetDisabled(PRBool aDisabled, PRBool notify) mFrame->GetContent(getter_AddRefs(content)); if (aDisabled) - content->SetAttr(mNameSpace, nsHTMLAtoms::disabled, nsAutoString(), notify); + content->SetAttr(kNameSpaceID_None, nsHTMLAtoms::disabled, nsString(), + notify); else - content->UnsetAttr(mNameSpace, nsHTMLAtoms::disabled, notify); + content->UnsetAttr(kNameSpaceID_None, nsHTMLAtoms::disabled, notify); } @@ -106,7 +94,7 @@ nsButtonFrameRenderer::isDisabled() nsCOMPtr content; mFrame->GetContent(getter_AddRefs(content)); nsAutoString value; - if (NS_CONTENT_ATTR_HAS_VALUE == content->GetAttr(mNameSpace, nsHTMLAtoms::disabled, value)) + if (NS_CONTENT_ATTR_HAS_VALUE == content->GetAttr(kNameSpaceID_None, nsHTMLAtoms::disabled, value)) return PR_TRUE; return PR_FALSE; diff --git a/mozilla/layout/forms/nsButtonFrameRenderer.h b/mozilla/layout/forms/nsButtonFrameRenderer.h index d2ba04ca536..a5878958bfc 100644 --- a/mozilla/layout/forms/nsButtonFrameRenderer.h +++ b/mozilla/layout/forms/nsButtonFrameRenderer.h @@ -78,7 +78,6 @@ public: const nsRect& aDirtyRect, const nsRect& aRect); - virtual void SetNameSpace(PRInt32 aNameSpace); virtual void SetFrame(nsFrame* aFrame, nsIPresContext* aPresContext); virtual void SetDisabled(PRBool aDisabled, PRBool notify); @@ -106,7 +105,6 @@ public: virtual void Redraw(nsIPresContext* aPresContext); virtual nsIFrame* GetFrame(); - virtual PRInt32 GetNameSpace(); protected: @@ -117,7 +115,6 @@ private: nsCOMPtr mInnerFocusStyle; nsCOMPtr mOuterFocusStyle; - PRInt32 mNameSpace; nsFrame* mFrame; nsRect mOutlineRect; diff --git a/mozilla/layout/forms/nsFormControlHelper.cpp b/mozilla/layout/forms/nsFormControlHelper.cpp index 35a8406481a..597664212bd 100644 --- a/mozilla/layout/forms/nsFormControlHelper.cpp +++ b/mozilla/layout/forms/nsFormControlHelper.cpp @@ -418,7 +418,8 @@ nsFormControlHelper::CalculateSize (nsIPresContext* aPresContext, nsAutoString valAttr; nsresult valStatus = NS_CONTENT_ATTR_NOT_THERE; if (nsnull != aSpec.mColValueAttr) { - valStatus = hContent->GetAttr(kNameSpaceID_HTML, aSpec.mColValueAttr, valAttr); + valStatus = hContent->GetAttr(kNameSpaceID_None, aSpec.mColValueAttr, + valAttr); } nsHTMLValue colAttr; nsresult colStatus = NS_CONTENT_ATTR_NOT_THERE; diff --git a/mozilla/layout/forms/nsGfxButtonControlFrame.cpp b/mozilla/layout/forms/nsGfxButtonControlFrame.cpp index 0dbcae747c6..e7d93286b76 100644 --- a/mozilla/layout/forms/nsGfxButtonControlFrame.cpp +++ b/mozilla/layout/forms/nsGfxButtonControlFrame.cpp @@ -60,7 +60,6 @@ const nscoord kSuggestedNotSet = -1; nsGfxButtonControlFrame::nsGfxButtonControlFrame() { - mRenderer.SetNameSpace(kNameSpaceID_None); mSuggestedWidth = kSuggestedNotSet; mSuggestedHeight = kSuggestedNotSet; mDefaultValueWasChanged = PR_FALSE; diff --git a/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp b/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp index 439fe428f5b..886b31fc5ed 100644 --- a/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp +++ b/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp @@ -100,7 +100,6 @@ nsHTMLButtonControlFrame::nsHTMLButtonControlFrame() mPreviousCursor = eCursor_standard; mTranslatedRect = nsRect(0,0,0,0); mDidInit = PR_FALSE; - mRenderer.SetNameSpace(kNameSpaceID_None); mCacheSize.width = -1; mCacheSize.height = -1; diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp index 54fe277677e..732bb51dc88 100644 --- a/mozilla/layout/generic/nsImageFrame.cpp +++ b/mozilla/layout/generic/nsImageFrame.cpp @@ -303,7 +303,7 @@ nsImageFrame::Init(nsIPresContext* aPresContext, // See if we have a SRC attribute nsAutoString src; nsresult ca; - ca = mContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::src, src); + ca = mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::src, src); if ((NS_CONTENT_ATTR_HAS_VALUE != ca) || (src.Length() == 0)) { // Let's see if this is an object tag and we have a DATA attribute @@ -311,7 +311,7 @@ nsImageFrame::Init(nsIPresContext* aPresContext, mContent->GetTag(tag); if(tag == nsHTMLAtoms::object) - mContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::data, src); + mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::data, src); NS_IF_RELEASE(tag); } @@ -656,7 +656,7 @@ NS_IMETHODIMP nsImageFrame::OnStopDecode(imgIRequest *aRequest, nsIPresContext * if (mFailureReplace) { // first check for image map nsAutoString usemap; - mContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::usemap, usemap); + mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::usemap, usemap); if (usemap.IsEmpty()) { // check if we want to honor the ALT text in the IMG frame, or let the preShell make it into inline text // - if QuirksMode, and the IMG has a size, then render the ALT text in the IMG frame @@ -1459,7 +1459,7 @@ nsImageFrame::GetImageMap(nsIPresContext* aPresContext) } nsAutoString usemap; - mContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::usemap, usemap); + mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::usemap, usemap); nsCOMPtr map; if (NS_SUCCEEDED(nsImageMapUtils::FindImageMap(doc,usemap,getter_AddRefs(map))) && map) { @@ -1529,7 +1529,7 @@ nsImageFrame::IsServerImageMap() { nsAutoString ismap; return NS_CONTENT_ATTR_HAS_VALUE == - mContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::ismap, ismap); + mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::ismap, ismap); } PRIntn @@ -1537,7 +1537,7 @@ nsImageFrame::GetSuppress() { nsAutoString s; if (NS_CONTENT_ATTR_HAS_VALUE == - mContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::suppress, s)) { + mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::suppress, s)) { if (s.EqualsIgnoreCase("true")) { return SUPPRESS; } else if (s.EqualsIgnoreCase("false")) { diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp index 8f243138d84..1ccba8cf844 100644 --- a/mozilla/layout/generic/nsObjectFrame.cpp +++ b/mozilla/layout/generic/nsObjectFrame.cpp @@ -461,7 +461,7 @@ void nsObjectFrame::IsSupportedImage(nsIContent* aContent, PRBool* aImage) return; nsAutoString type; - nsresult rv = aContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::type, type); + nsresult rv = aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::type, type); if((rv == NS_CONTENT_ATTR_HAS_VALUE) && (type.Length() > 0)) { nsCOMPtr loader(do_GetService("@mozilla.org/image/loader;1")); @@ -470,13 +470,13 @@ void nsObjectFrame::IsSupportedImage(nsIContent* aContent, PRBool* aImage) } nsAutoString data; - rv = aContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::data, data); + rv = aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::data, data); PRBool havedata = (rv == NS_CONTENT_ATTR_HAS_VALUE) && (data.Length() > 0); if(!havedata) {// try it once more for SRC attrubute - rv = aContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::src, data); + rv = aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::src, data); havedata = (rv == NS_CONTENT_ATTR_HAS_VALUE) && (data.Length() > 0); } @@ -521,7 +521,7 @@ void nsObjectFrame::IsSupportedDocument(nsIContent* aContent, PRBool* aDoc) if (NS_FAILED(rv)) return; nsAutoString type; - rv = aContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::type, type); + rv = aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::type, type); if((rv == NS_CONTENT_ATTR_HAS_VALUE) && (type.Length() > 0)) { nsXPIDLCString value; @@ -536,7 +536,7 @@ void nsObjectFrame::IsSupportedDocument(nsIContent* aContent, PRBool* aDoc) // if we don't have a TYPE= try getting the mime-type via the DATA= url nsAutoString data; - rv = aContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::data, data); + rv = aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::data, data); if((rv == NS_CONTENT_ATTR_HAS_VALUE) && (data.Length() > 0)) { nsCOMPtr uri; @@ -980,7 +980,7 @@ nsObjectFrame::Reflow(nsIPresContext* aPresContext, if (NS_SUCCEEDED(rv = GetBaseURL(*getter_AddRefs(baseURL)))) { nsAutoString codeBase; if ((NS_CONTENT_ATTR_HAS_VALUE == - mContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::codebase, codeBase)) && + mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::codebase, codeBase)) && !codeBase.IsEmpty()) { nsCOMPtr codeBaseURL; rv = MakeAbsoluteURL(getter_AddRefs(codeBaseURL), codeBase, baseURL); @@ -1062,7 +1062,7 @@ nsObjectFrame::Reflow(nsIPresContext* aPresContext, nsCOMPtr tag; mContent->GetTag(*getter_AddRefs(tag)); if (tag.get() == nsHTMLAtoms::applet) { - if (NS_CONTENT_ATTR_HAS_VALUE == mContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::code, src)) { + if (NS_CONTENT_ATTR_HAS_VALUE == mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::code, src)) { // Create an absolute URL rv = MakeAbsoluteURL(getter_AddRefs(fullURL), src, baseURL); } @@ -1074,16 +1074,16 @@ nsObjectFrame::Reflow(nsIPresContext* aPresContext, } else { // traditional plugin nsXPIDLCString mimeTypeStr; nsAutoString type; - mContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::type, type); + mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::type, type); if (type.Length()) { mimeTypeStr.Adopt(ToNewCString(type)); } //stream in the object source if there is one... if (NS_CONTENT_ATTR_HAS_VALUE == - mContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::src, src) || + mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::src, src) || NS_CONTENT_ATTR_HAS_VALUE == - mContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::data, src)) { + mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::data, src)) { // Create an absolute URL rv = MakeAbsoluteURL(getter_AddRefs(fullURL), src, baseURL); if (NS_FAILED(rv)) { diff --git a/mozilla/layout/generic/nsSpacerFrame.cpp b/mozilla/layout/generic/nsSpacerFrame.cpp index a215c2b707a..fe0f7d9b4d3 100644 --- a/mozilla/layout/generic/nsSpacerFrame.cpp +++ b/mozilla/layout/generic/nsSpacerFrame.cpp @@ -176,7 +176,7 @@ SpacerFrame::GetType() PRUint8 type = TYPE_WORD; nsAutoString value; if (NS_CONTENT_ATTR_HAS_VALUE == - mContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::type, value)) { + mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::type, value)) { if (value.EqualsIgnoreCase("line") || value.EqualsIgnoreCase("vert") || value.EqualsIgnoreCase("vertical")) { diff --git a/mozilla/layout/html/base/src/nsFrameManager.cpp b/mozilla/layout/html/base/src/nsFrameManager.cpp index 6ea022bb9c1..32efdf9ce68 100644 --- a/mozilla/layout/html/base/src/nsFrameManager.cpp +++ b/mozilla/layout/html/base/src/nsFrameManager.cpp @@ -2171,7 +2171,7 @@ FrameManager::GenerateStateKey(nsIContent* aContent, KeyAppendAtom(tag, aKey); nsAutoString name; - aContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::name, name); + aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::name, name); KeyAppendString(name, aKey); } diff --git a/mozilla/layout/html/base/src/nsImageFrame.cpp b/mozilla/layout/html/base/src/nsImageFrame.cpp index 54fe277677e..732bb51dc88 100644 --- a/mozilla/layout/html/base/src/nsImageFrame.cpp +++ b/mozilla/layout/html/base/src/nsImageFrame.cpp @@ -303,7 +303,7 @@ nsImageFrame::Init(nsIPresContext* aPresContext, // See if we have a SRC attribute nsAutoString src; nsresult ca; - ca = mContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::src, src); + ca = mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::src, src); if ((NS_CONTENT_ATTR_HAS_VALUE != ca) || (src.Length() == 0)) { // Let's see if this is an object tag and we have a DATA attribute @@ -311,7 +311,7 @@ nsImageFrame::Init(nsIPresContext* aPresContext, mContent->GetTag(tag); if(tag == nsHTMLAtoms::object) - mContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::data, src); + mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::data, src); NS_IF_RELEASE(tag); } @@ -656,7 +656,7 @@ NS_IMETHODIMP nsImageFrame::OnStopDecode(imgIRequest *aRequest, nsIPresContext * if (mFailureReplace) { // first check for image map nsAutoString usemap; - mContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::usemap, usemap); + mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::usemap, usemap); if (usemap.IsEmpty()) { // check if we want to honor the ALT text in the IMG frame, or let the preShell make it into inline text // - if QuirksMode, and the IMG has a size, then render the ALT text in the IMG frame @@ -1459,7 +1459,7 @@ nsImageFrame::GetImageMap(nsIPresContext* aPresContext) } nsAutoString usemap; - mContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::usemap, usemap); + mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::usemap, usemap); nsCOMPtr map; if (NS_SUCCEEDED(nsImageMapUtils::FindImageMap(doc,usemap,getter_AddRefs(map))) && map) { @@ -1529,7 +1529,7 @@ nsImageFrame::IsServerImageMap() { nsAutoString ismap; return NS_CONTENT_ATTR_HAS_VALUE == - mContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::ismap, ismap); + mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::ismap, ismap); } PRIntn @@ -1537,7 +1537,7 @@ nsImageFrame::GetSuppress() { nsAutoString s; if (NS_CONTENT_ATTR_HAS_VALUE == - mContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::suppress, s)) { + mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::suppress, s)) { if (s.EqualsIgnoreCase("true")) { return SUPPRESS; } else if (s.EqualsIgnoreCase("false")) { diff --git a/mozilla/layout/html/base/src/nsObjectFrame.cpp b/mozilla/layout/html/base/src/nsObjectFrame.cpp index 8f243138d84..1ccba8cf844 100644 --- a/mozilla/layout/html/base/src/nsObjectFrame.cpp +++ b/mozilla/layout/html/base/src/nsObjectFrame.cpp @@ -461,7 +461,7 @@ void nsObjectFrame::IsSupportedImage(nsIContent* aContent, PRBool* aImage) return; nsAutoString type; - nsresult rv = aContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::type, type); + nsresult rv = aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::type, type); if((rv == NS_CONTENT_ATTR_HAS_VALUE) && (type.Length() > 0)) { nsCOMPtr loader(do_GetService("@mozilla.org/image/loader;1")); @@ -470,13 +470,13 @@ void nsObjectFrame::IsSupportedImage(nsIContent* aContent, PRBool* aImage) } nsAutoString data; - rv = aContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::data, data); + rv = aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::data, data); PRBool havedata = (rv == NS_CONTENT_ATTR_HAS_VALUE) && (data.Length() > 0); if(!havedata) {// try it once more for SRC attrubute - rv = aContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::src, data); + rv = aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::src, data); havedata = (rv == NS_CONTENT_ATTR_HAS_VALUE) && (data.Length() > 0); } @@ -521,7 +521,7 @@ void nsObjectFrame::IsSupportedDocument(nsIContent* aContent, PRBool* aDoc) if (NS_FAILED(rv)) return; nsAutoString type; - rv = aContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::type, type); + rv = aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::type, type); if((rv == NS_CONTENT_ATTR_HAS_VALUE) && (type.Length() > 0)) { nsXPIDLCString value; @@ -536,7 +536,7 @@ void nsObjectFrame::IsSupportedDocument(nsIContent* aContent, PRBool* aDoc) // if we don't have a TYPE= try getting the mime-type via the DATA= url nsAutoString data; - rv = aContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::data, data); + rv = aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::data, data); if((rv == NS_CONTENT_ATTR_HAS_VALUE) && (data.Length() > 0)) { nsCOMPtr uri; @@ -980,7 +980,7 @@ nsObjectFrame::Reflow(nsIPresContext* aPresContext, if (NS_SUCCEEDED(rv = GetBaseURL(*getter_AddRefs(baseURL)))) { nsAutoString codeBase; if ((NS_CONTENT_ATTR_HAS_VALUE == - mContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::codebase, codeBase)) && + mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::codebase, codeBase)) && !codeBase.IsEmpty()) { nsCOMPtr codeBaseURL; rv = MakeAbsoluteURL(getter_AddRefs(codeBaseURL), codeBase, baseURL); @@ -1062,7 +1062,7 @@ nsObjectFrame::Reflow(nsIPresContext* aPresContext, nsCOMPtr tag; mContent->GetTag(*getter_AddRefs(tag)); if (tag.get() == nsHTMLAtoms::applet) { - if (NS_CONTENT_ATTR_HAS_VALUE == mContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::code, src)) { + if (NS_CONTENT_ATTR_HAS_VALUE == mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::code, src)) { // Create an absolute URL rv = MakeAbsoluteURL(getter_AddRefs(fullURL), src, baseURL); } @@ -1074,16 +1074,16 @@ nsObjectFrame::Reflow(nsIPresContext* aPresContext, } else { // traditional plugin nsXPIDLCString mimeTypeStr; nsAutoString type; - mContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::type, type); + mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::type, type); if (type.Length()) { mimeTypeStr.Adopt(ToNewCString(type)); } //stream in the object source if there is one... if (NS_CONTENT_ATTR_HAS_VALUE == - mContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::src, src) || + mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::src, src) || NS_CONTENT_ATTR_HAS_VALUE == - mContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::data, src)) { + mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::data, src)) { // Create an absolute URL rv = MakeAbsoluteURL(getter_AddRefs(fullURL), src, baseURL); if (NS_FAILED(rv)) { diff --git a/mozilla/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp index 27b5391860e..f51917be999 100644 --- a/mozilla/layout/html/base/src/nsPresShell.cpp +++ b/mozilla/layout/html/base/src/nsPresShell.cpp @@ -2284,7 +2284,7 @@ nsresult PresShell::CreatePreferenceStyleSheet(void) NS_ASSERTION(uri, "null but no error"); result = mPrefStyleSheet->Init(uri); if (NS_SUCCEEDED(result)) { - mPrefStyleSheet->SetDefaultNameSpaceID(kNameSpaceID_HTML); + mPrefStyleSheet->SetDefaultNameSpaceID(kNameSpaceID_XHTML); mStyleSet->InsertUserStyleSheetBefore(mPrefStyleSheet, nsnull); } } diff --git a/mozilla/layout/html/base/src/nsSpacerFrame.cpp b/mozilla/layout/html/base/src/nsSpacerFrame.cpp index a215c2b707a..fe0f7d9b4d3 100644 --- a/mozilla/layout/html/base/src/nsSpacerFrame.cpp +++ b/mozilla/layout/html/base/src/nsSpacerFrame.cpp @@ -176,7 +176,7 @@ SpacerFrame::GetType() PRUint8 type = TYPE_WORD; nsAutoString value; if (NS_CONTENT_ATTR_HAS_VALUE == - mContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::type, value)) { + mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::type, value)) { if (value.EqualsIgnoreCase("line") || value.EqualsIgnoreCase("vert") || value.EqualsIgnoreCase("vertical")) { diff --git a/mozilla/layout/html/forms/src/nsButtonFrameRenderer.cpp b/mozilla/layout/html/forms/src/nsButtonFrameRenderer.cpp index 7240a224c5e..3efa0ad742f 100644 --- a/mozilla/layout/html/forms/src/nsButtonFrameRenderer.cpp +++ b/mozilla/layout/html/forms/src/nsButtonFrameRenderer.cpp @@ -52,7 +52,6 @@ MOZ_DECL_CTOR_COUNTER(nsButtonFrameRenderer) nsButtonFrameRenderer::nsButtonFrameRenderer() { MOZ_COUNT_CTOR(nsButtonFrameRenderer); - mNameSpace = kNameSpaceID_HTML; } nsButtonFrameRenderer::~nsButtonFrameRenderer() @@ -60,12 +59,6 @@ nsButtonFrameRenderer::~nsButtonFrameRenderer() MOZ_COUNT_DTOR(nsButtonFrameRenderer); } -void -nsButtonFrameRenderer::SetNameSpace(PRInt32 aNameSpace) -{ - mNameSpace = aNameSpace; -} - void nsButtonFrameRenderer::SetFrame(nsFrame* aFrame, nsIPresContext* aPresContext) { @@ -79,12 +72,6 @@ nsButtonFrameRenderer::GetFrame() return mFrame; } -PRInt32 -nsButtonFrameRenderer::GetNameSpace() -{ - return mNameSpace; -} - void nsButtonFrameRenderer::SetDisabled(PRBool aDisabled, PRBool notify) { @@ -93,9 +80,10 @@ nsButtonFrameRenderer::SetDisabled(PRBool aDisabled, PRBool notify) mFrame->GetContent(getter_AddRefs(content)); if (aDisabled) - content->SetAttr(mNameSpace, nsHTMLAtoms::disabled, nsAutoString(), notify); + content->SetAttr(kNameSpaceID_None, nsHTMLAtoms::disabled, nsString(), + notify); else - content->UnsetAttr(mNameSpace, nsHTMLAtoms::disabled, notify); + content->UnsetAttr(kNameSpaceID_None, nsHTMLAtoms::disabled, notify); } @@ -106,7 +94,7 @@ nsButtonFrameRenderer::isDisabled() nsCOMPtr content; mFrame->GetContent(getter_AddRefs(content)); nsAutoString value; - if (NS_CONTENT_ATTR_HAS_VALUE == content->GetAttr(mNameSpace, nsHTMLAtoms::disabled, value)) + if (NS_CONTENT_ATTR_HAS_VALUE == content->GetAttr(kNameSpaceID_None, nsHTMLAtoms::disabled, value)) return PR_TRUE; return PR_FALSE; diff --git a/mozilla/layout/html/forms/src/nsButtonFrameRenderer.h b/mozilla/layout/html/forms/src/nsButtonFrameRenderer.h index d2ba04ca536..a5878958bfc 100644 --- a/mozilla/layout/html/forms/src/nsButtonFrameRenderer.h +++ b/mozilla/layout/html/forms/src/nsButtonFrameRenderer.h @@ -78,7 +78,6 @@ public: const nsRect& aDirtyRect, const nsRect& aRect); - virtual void SetNameSpace(PRInt32 aNameSpace); virtual void SetFrame(nsFrame* aFrame, nsIPresContext* aPresContext); virtual void SetDisabled(PRBool aDisabled, PRBool notify); @@ -106,7 +105,6 @@ public: virtual void Redraw(nsIPresContext* aPresContext); virtual nsIFrame* GetFrame(); - virtual PRInt32 GetNameSpace(); protected: @@ -117,7 +115,6 @@ private: nsCOMPtr mInnerFocusStyle; nsCOMPtr mOuterFocusStyle; - PRInt32 mNameSpace; nsFrame* mFrame; nsRect mOutlineRect; diff --git a/mozilla/layout/html/forms/src/nsFormControlHelper.cpp b/mozilla/layout/html/forms/src/nsFormControlHelper.cpp index 35a8406481a..597664212bd 100644 --- a/mozilla/layout/html/forms/src/nsFormControlHelper.cpp +++ b/mozilla/layout/html/forms/src/nsFormControlHelper.cpp @@ -418,7 +418,8 @@ nsFormControlHelper::CalculateSize (nsIPresContext* aPresContext, nsAutoString valAttr; nsresult valStatus = NS_CONTENT_ATTR_NOT_THERE; if (nsnull != aSpec.mColValueAttr) { - valStatus = hContent->GetAttr(kNameSpaceID_HTML, aSpec.mColValueAttr, valAttr); + valStatus = hContent->GetAttr(kNameSpaceID_None, aSpec.mColValueAttr, + valAttr); } nsHTMLValue colAttr; nsresult colStatus = NS_CONTENT_ATTR_NOT_THERE; diff --git a/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.cpp b/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.cpp index 0dbcae747c6..e7d93286b76 100644 --- a/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.cpp @@ -60,7 +60,6 @@ const nscoord kSuggestedNotSet = -1; nsGfxButtonControlFrame::nsGfxButtonControlFrame() { - mRenderer.SetNameSpace(kNameSpaceID_None); mSuggestedWidth = kSuggestedNotSet; mSuggestedHeight = kSuggestedNotSet; mDefaultValueWasChanged = PR_FALSE; diff --git a/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp b/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp index cf69e44f191..f0fa2111ff3 100644 --- a/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp +++ b/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp @@ -1956,7 +1956,9 @@ nsGfxTextControlFrame2::CreateAnonymousContent(nsIPresContext* aPresContext, NS_ENSURE_TRUE(nodeInfoManager, NS_ERROR_FAILURE); nsCOMPtr nodeInfo; - rv = nodeInfoManager->GetNodeInfo(nsHTMLAtoms::div, nsnull, kNameSpaceID_HTML, *getter_AddRefs(nodeInfo)); + rv = nodeInfoManager->GetNodeInfo(nsHTMLAtoms::div, nsnull, + kNameSpaceID_XHTML, + *getter_AddRefs(nodeInfo)); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp b/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp index 439fe428f5b..886b31fc5ed 100644 --- a/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp @@ -100,7 +100,6 @@ nsHTMLButtonControlFrame::nsHTMLButtonControlFrame() mPreviousCursor = eCursor_standard; mTranslatedRect = nsRect(0,0,0,0); mDidInit = PR_FALSE; - mRenderer.SetNameSpace(kNameSpaceID_None); mCacheSize.width = -1; mCacheSize.height = -1; diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp index 51bba8a25df..afd2452b46d 100644 --- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp @@ -1603,7 +1603,7 @@ nsCSSFrameConstructor::CreateInputFrame(nsIPresShell *aPresShell, { // Figure out which type of input frame to create nsAutoString val; - if (NS_OK == aContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::type, val)) { + if (NS_OK == aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::type, val)) { if (val.EqualsIgnoreCase("submit") || val.EqualsIgnoreCase("reset") || val.EqualsIgnoreCase("button")) { @@ -3364,8 +3364,7 @@ nsCSSFrameConstructor::ConstructDocElementFrame(nsIPresShell* aPresShell, PRInt32 nameSpaceID; #endif #ifdef INCLUDE_XUL - if (NS_SUCCEEDED(aDocElement->GetNameSpaceID(nameSpaceID)) && - nameSpaceID == nsXULAtoms::nameSpaceID) { + if (aDocElement->IsContentOfType(nsIContent::eXUL)) { rv = NS_NewDocElementBoxFrame(aPresShell, &contentFrame); if (NS_FAILED(rv)) { return rv; @@ -3581,9 +3580,7 @@ nsCSSFrameConstructor::ConstructRootFrame(nsIPresShell* aPresShell, if (!isPaginated) { #ifdef INCLUDE_XUL - PRInt32 nameSpaceID; - if (NS_SUCCEEDED(aDocElement->GetNameSpaceID(nameSpaceID)) && - nameSpaceID == nsXULAtoms::nameSpaceID) + if (aDocElement->IsContentOfType(nsIContent::eXUL)) { NS_NewRootBoxFrame(aPresShell, &rootFrame); } else @@ -3623,11 +3620,12 @@ nsCSSFrameConstructor::ConstructRootFrame(nsIPresShell* aPresShell, // Currently OVERFLOW_SCROLL isn't honored, as // scrollportview::SetScrollPref is not implemented. - PRInt32 nameSpaceID; - aDocElement->GetNameSpaceID(nameSpaceID); + PRBool isHTML = aDocElement->IsContentOfType(nsIContent::eHTML); + PRBool isXUL = PR_FALSE; - PRBool isHTML = (nameSpaceID == kNameSpaceID_HTML); - PRBool isXUL = (nameSpaceID == nsXULAtoms::nameSpaceID); + if (!isHTML) { + isXUL = aDocElement->IsContentOfType(nsIContent::eXUL); + } // Never create scrollbars for XUL documents #ifdef INCLUDE_XUL @@ -4618,8 +4616,9 @@ nsCSSFrameConstructor::ConstructHTMLFrame(nsIPresShell* aPresShell, nsFrameItems& aFrameItems) { // Ignore the tag if it's not HTML content - if (aNameSpaceID != kNameSpaceID_HTML) + if (!aContent->IsContentOfType(nsIContent::eHTML)) { return NS_OK; + } PRBool processChildren = PR_FALSE; // whether we should process child content PRBool isAbsolutelyPositioned = PR_FALSE; diff --git a/mozilla/layout/html/tests/TestAttributes.cpp b/mozilla/layout/html/tests/TestAttributes.cpp index a7fb3e9ed36..bee25a15cda 100644 --- a/mozilla/layout/html/tests/TestAttributes.cpp +++ b/mozilla/layout/html/tests/TestAttributes.cpp @@ -63,8 +63,8 @@ void testAttributes(nsIHTMLContent* content) { content->SetHTMLAttribute(sBORDER, nullValue, PR_FALSE); content->SetHTMLAttribute(sWIDTH, nsHTMLValue(5, eHTMLUnit_Pixel), PR_FALSE); - content->SetAttribute(kNameSpaceID_HTML, sHEIGHT, sempty, PR_FALSE); - content->SetAttribute(kNameSpaceID_HTML, sSRC, sfoo_gif, PR_FALSE); + content->SetAttribute(kNameSpaceID_None, sHEIGHT, sempty, PR_FALSE); + content->SetAttribute(kNameSpaceID_None, sSRC, sfoo_gif, PR_FALSE); nsHTMLValue ret; nsresult rv; @@ -83,7 +83,7 @@ void testAttributes(nsIHTMLContent* content) { printf("test 2 failed\n"); } - content->UnsetAttribute(kNameSpaceID_HTML, sWIDTH, PR_FALSE); + content->UnsetAttribute(kNameSpaceID_None, sWIDTH, PR_FALSE); nsISupportsArray* allNames; NS_NewISupportsArray(&allNames); diff --git a/mozilla/layout/style/nsCSSParser.cpp b/mozilla/layout/style/nsCSSParser.cpp index 3e185b76cf6..afec891505f 100644 --- a/mozilla/layout/style/nsCSSParser.cpp +++ b/mozilla/layout/style/nsCSSParser.cpp @@ -2109,7 +2109,8 @@ void CSSParserImpl::ParseAttributeSelector(PRInt32& aDataMask, } if (mToken.IsSymbol(']')) { PRBool isCaseSensitive = mCaseSensitive; - if (nameSpaceID == kNameSpaceID_None || nameSpaceID == kNameSpaceID_HTML) { + if (nameSpaceID == kNameSpaceID_None || + nameSpaceID == kNameSpaceID_XHTML) { static const char* caseSensitiveHTMLAttribute[] = { // list based on http://www.w3.org/TR/REC-html40/index/attributes.html "abbr", "alt", "label", diff --git a/mozilla/webshell/tests/viewer/nsWebCrawler.cpp b/mozilla/webshell/tests/viewer/nsWebCrawler.cpp index f83b583aa81..4c719b4869f 100644 --- a/mozilla/webshell/tests/viewer/nsWebCrawler.cpp +++ b/mozilla/webshell/tests/viewer/nsWebCrawler.cpp @@ -762,10 +762,10 @@ nsWebCrawler::FindURLsIn(nsIDocument* aDocument, nsIContent* aNode) // Get absolute url that tag targets nsAutoString base, src, absURLSpec; if (atom == mLinkTag) { - aNode->GetAttr(kNameSpaceID_HTML, mHrefAttr, src); + aNode->GetAttr(kNameSpaceID_None, mHrefAttr, src); } else { - aNode->GetAttr(kNameSpaceID_HTML, mSrcAttr, src); + aNode->GetAttr(kNameSpaceID_None, mSrcAttr, src); } nsCOMPtr docURL; aDocument->GetDocumentURL(getter_AddRefs(docURL)); diff --git a/mozilla/xpfe/browser/samples/dexparamdialog.xul b/mozilla/xpfe/browser/samples/dexparamdialog.xul index a69b7e31b73..d03dce15022 100644 --- a/mozilla/xpfe/browser/samples/dexparamdialog.xul +++ b/mozilla/xpfe/browser/samples/dexparamdialog.xul @@ -188,13 +188,13 @@ - Give me your money + Give me your money - Remind me + Remind me diff --git a/mozilla/xpfe/browser/src/navigator-test1.xul b/mozilla/xpfe/browser/src/navigator-test1.xul index a45486a281e..18fc5ddd761 100644 --- a/mozilla/xpfe/browser/src/navigator-test1.xul +++ b/mozilla/xpfe/browser/src/navigator-test1.xul @@ -594,8 +594,7 @@ - - +