Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 3302. Fixed DOM calls to effect (more or less) the right change on the content model, modulo Bug 3275. This was causing asserts to fire whenever you called SetAttribute().

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@22040 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
waterson%netscape.com
1999-02-26 03:02:19 +00:00
parent d74a10535e
commit 22db265958
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mozilla/content/xul/content/src/nsXULElement.cpp
View File

@@ -1455,14 +1455,14 @@ static char kNameSpaceSeparator[] = ":";
// are built via the content model builders.
//
// Since mNameSpace will _always_ be null, specifying
// kNameSpaceID_Unknown allows us to at least match on the
// kNameSpaceID_None allows us to at least match on the
// tag. You'll start seeing problems when the same name is used in
// different namespaces.
//
// See http://bugzilla.mozilla.org/show_bug.cgi?id=3275 for more
// info.
aNameSpaceID = kNameSpaceID_Unknown; // XXX should be kNameSpaceID_None
aNameSpaceID = kNameSpaceID_None;
if (0 < prefix.Length()) {
nsIAtom* nameSpaceAtom = NS_NewAtom(prefix);
if (mNameSpace) {
@@ -1722,7 +1722,8 @@ done:
for (index = 0; index < count; index++) {
const nsGenericAttribute* attr = (const nsGenericAttribute*)mAttributes->ElementAt(index);
if (((attr->mNameSpaceID == aNameSpaceID) ||
(aNameSpaceID == kNameSpaceID_Unknown)) &&
(aNameSpaceID == kNameSpaceID_Unknown) ||
(aNameSpaceID == kNameSpaceID_None)) &&
(attr->mName == aName)) {
aResult = attr->mValue;
if (0 < aResult.Length()) {

7
mozilla/rdf/content/src/nsRDFElement.cpp
View File

@@ -1455,14 +1455,14 @@ static char kNameSpaceSeparator[] = ":";
// are built via the content model builders.
//
// Since mNameSpace will _always_ be null, specifying
// kNameSpaceID_Unknown allows us to at least match on the
// kNameSpaceID_None allows us to at least match on the
// tag. You'll start seeing problems when the same name is used in
// different namespaces.
//
// See http://bugzilla.mozilla.org/show_bug.cgi?id=3275 for more
// info.
aNameSpaceID = kNameSpaceID_Unknown; // XXX should be kNameSpaceID_None
aNameSpaceID = kNameSpaceID_None;
if (0 < prefix.Length()) {
nsIAtom* nameSpaceAtom = NS_NewAtom(prefix);
if (mNameSpace) {
@@ -1722,7 +1722,8 @@ done:
for (index = 0; index < count; index++) {
const nsGenericAttribute* attr = (const nsGenericAttribute*)mAttributes->ElementAt(index);
if (((attr->mNameSpaceID == aNameSpaceID) ||
(aNameSpaceID == kNameSpaceID_Unknown)) &&
(aNameSpaceID == kNameSpaceID_Unknown) ||
(aNameSpaceID == kNameSpaceID_None)) &&
(attr->mName == aName)) {
aResult = attr->mValue;
if (0 < aResult.Length()) {

2
mozilla/rdf/content/src/nsRDFXULBuilder.cpp
View File

@@ -1787,7 +1787,7 @@ RDFXULBuilderImpl::GetResource(PRInt32 aNameSpaceID,
// XXX check to see if we need to insert a '/' or a '#'
nsAutoString tag(aNameAtom->GetUnicode());
if (uri.Last() != '#' && uri.Last() != '/' && tag.First() != '#')
if (0 < uri.Length() && uri.Last() != '#' && uri.Last() != '/' && tag.First() != '#')
uri.Append('#');
uri.Append(tag);

7
mozilla/rdf/content/src/nsXULElement.cpp
View File

@@ -1455,14 +1455,14 @@ static char kNameSpaceSeparator[] = ":";
// are built via the content model builders.
//
// Since mNameSpace will _always_ be null, specifying
// kNameSpaceID_Unknown allows us to at least match on the
// kNameSpaceID_None allows us to at least match on the
// tag. You'll start seeing problems when the same name is used in
// different namespaces.
//
// See http://bugzilla.mozilla.org/show_bug.cgi?id=3275 for more
// info.
aNameSpaceID = kNameSpaceID_Unknown; // XXX should be kNameSpaceID_None
aNameSpaceID = kNameSpaceID_None;
if (0 < prefix.Length()) {
nsIAtom* nameSpaceAtom = NS_NewAtom(prefix);
if (mNameSpace) {
@@ -1722,7 +1722,8 @@ done:
for (index = 0; index < count; index++) {
const nsGenericAttribute* attr = (const nsGenericAttribute*)mAttributes->ElementAt(index);
if (((attr->mNameSpaceID == aNameSpaceID) ||
(aNameSpaceID == kNameSpaceID_Unknown)) &&
(aNameSpaceID == kNameSpaceID_Unknown) ||
(aNameSpaceID == kNameSpaceID_None)) &&
(attr->mName == aName)) {
aResult = attr->mValue;
if (0 < aResult.Length()) {