Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-24 03:19:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make the XUL content sink store the right namespace for "xmlns" attributes.

Browse Source 
Bug 256165, r=peterv, sr=jst
This commit is contained in:
bzbarsky%mit.edu 2004-09-16 18:38:07 +00:00
parent b62d4e1d33
commit f440132946
2 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/xml/document/src/nsXMLContentSink.h
View File

@ -91,6 +91,8 @@ public:
// nsITransformObserver
NS_IMETHOD OnDocumentCreated(nsIDOMDocument *aResultDocument);
NS_IMETHOD OnTransformDone(nsresult aResult, nsIDOMDocument *aResultDocument);
static void SplitXMLName(const nsAFlatString& aString, nsIAtom **aPrefix,
nsIAtom **aTagName);
protected:
void StartLayout();
@ -116,8 +118,6 @@ protected:
nsresult AddContentAsLeaf(nsIContent *aContent);
static void SplitXMLName(const nsAFlatString& aString, nsIAtom **aPrefix,
nsIAtom **aTagName);
PRInt32 GetNameSpaceId(nsIAtom* aPrefix);
already_AddRefed<nsINameSpace> PopNameSpaces();

36
content/xul/document/src/nsXULContentSink.cpp
View File

@ -105,6 +105,8 @@
#include "nsNodeInfoManager.h"
#include "nsContentUtils.h"
#include "nsAttrName.h"
#include "nsXMLContentSink.h"
#include "nsLayoutAtoms.h"
static const char kNameSpaceSeparator = ':';
@ -695,31 +697,18 @@ XULContentSinkImpl::NormalizeAttributeString(const nsAFlatString& aText,
{
PRInt32 nameSpaceID = kNameSpaceID_None;
nsAFlatString::const_iterator start, end;
aText.BeginReading(start);
aText.EndReading(end);
nsCOMPtr<nsIAtom> nameSpacePrefix, nameAtom;
nsAFlatString::const_iterator colon(start);
nsCOMPtr<nsIAtom> prefix;
if (!FindCharInReadable(kNameSpaceSeparator, colon, end)) {
nsCOMPtr<nsIAtom> atom = do_GetAtom(aText);
NS_ENSURE_TRUE(atom, NS_ERROR_OUT_OF_MEMORY);
aName.SetTo(atom);
return NS_OK;
}
if (start != colon) {
prefix = do_GetAtom(Substring(start, colon));
nsXMLContentSink::SplitXMLName(aText,
getter_AddRefs(nameSpacePrefix),
getter_AddRefs(nameAtom));
if (nameSpacePrefix) {
nsCOMPtr<nsINameSpace> ns;
GetTopNameSpace(address_of(ns));
if (ns) {
ns->FindNameSpaceID(prefix, &nameSpaceID);
ns->FindNameSpaceID(nameSpacePrefix, &nameSpaceID);
if (nameSpaceID == kNameSpaceID_Unknown) {
NS_WARNING("Undeclared prefix used in attribute name.");
@ -729,12 +718,13 @@ XULContentSinkImpl::NormalizeAttributeString(const nsAFlatString& aText,
} else {
NS_WARNING("Undeclared prefix used in attribute name.");
}
++colon; // Skip over the ':'
} else if (nameAtom == nsLayoutAtoms::xmlnsNameSpace) {
nameSpaceID = kNameSpaceID_XMLNS;
}
// else use kNameSpaceID_None
nsCOMPtr<nsINodeInfo> ni;
nsresult rv = mNodeInfoManager->GetNodeInfo(Substring(colon, end), prefix,
nsresult rv = mNodeInfoManager->GetNodeInfo(nameAtom, nameSpacePrefix,
nameSpaceID,
getter_AddRefs(ni));
NS_ENSURE_SUCCESS(rv, rv);