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

Fixing bug 134278. Die kNameSpaceID_HTML, die! r=sicking@bigfoot.com, sr=heikki@netscape.com

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@121894 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jst%netscape.com
2002-05-20 22:47:02 +00:00
parent 28e004aa7c
commit 7b7411c3ef
57 changed files with 375 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mozilla/content/html/document/src/nsHTMLContentSink.cpp
View File

@@ -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<nsIHTMLContent> element;
nsCOMPtr<nsINodeInfo> 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);