corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Bug 570258: Some more atom usage cleanup. r=jst

Browse Source
This commit is contained in:
Jonas Sicking
2010-06-08 16:25:27 -07:00
parent 715898edc1
commit a2f1d080e7
12 changed files with 34 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
content/html/document/src/nsHTMLContentSink.cpp
View File

@@ -529,10 +529,9 @@ HTMLContentSink::CreateContentObject(const nsIParserNode& aNode,
nsCOMPtr<nsINodeInfo> nodeInfo;
if (aNodeType == eHTMLTag_userdefined) {
NS_ConvertUTF16toUTF8 tmp(aNode.GetText());
ToLowerCase(tmp);
nsCOMPtr<nsIAtom> name = do_GetAtom(tmp);
nsAutoString lower;
nsContentUtils::ASCIIToLower(aNode.GetText(), lower);
nsCOMPtr<nsIAtom> name = do_GetAtom(lower);
nodeInfo = mNodeInfoManager->GetNodeInfo(name, nsnull, kNameSpaceID_XHTML);
}
else if (mNodeInfoCache[aNodeType]) {

30
content/html/document/src/nsHTMLFragmentContentSink.cpp
View File

@@ -352,10 +352,9 @@ nsHTMLFragmentContentSink::OpenContainer(const nsIParserNode& aNode)
nsCOMPtr<nsINodeInfo> nodeInfo;
if (nodeType == eHTMLTag_userdefined) {
NS_ConvertUTF16toUTF8 tmp(aNode.GetText());
ToLowerCase(tmp);
nsCOMPtr<nsIAtom> name = do_GetAtom(tmp);
nsAutoString lower;
nsContentUtils::ASCIIToLower(aNode.GetText(), lower);
nsCOMPtr<nsIAtom> name = do_GetAtom(lower);
nodeInfo = mNodeInfoManager->GetNodeInfo(name,
nsnull,
kNameSpaceID_XHTML);
@@ -447,10 +446,9 @@ nsHTMLFragmentContentSink::AddLeaf(const nsIParserNode& aNode)
nsCOMPtr<nsINodeInfo> nodeInfo;
if (nodeType == eHTMLTag_userdefined) {
NS_ConvertUTF16toUTF8 tmp(aNode.GetText());
ToLowerCase(tmp);
nsCOMPtr<nsIAtom> name = do_GetAtom(tmp);
nsAutoString lower;
nsContentUtils::ASCIIToLower(aNode.GetText(), lower);
nsCOMPtr<nsIAtom> name = do_GetAtom(lower);
nodeInfo = mNodeInfoManager->GetNodeInfo(name, nsnull,
kNameSpaceID_XHTML);
NS_ENSURE_TRUE(nodeInfo, NS_ERROR_OUT_OF_MEMORY);
@@ -727,7 +725,7 @@ nsHTMLFragmentContentSink::AddAttributes(const nsIParserNode& aNode,
return NS_OK;
}
nsCAutoString k;
nsAutoString k;
nsHTMLTag nodeType = nsHTMLTag(aNode.GetNodeType());
// The attributes are on the parser node in the order they came in in the
@@ -741,12 +739,7 @@ nsHTMLFragmentContentSink::AddAttributes(const nsIParserNode& aNode,
for (PRInt32 i = ac - 1; i >= 0; i--) {
// Get lower-cased key
const nsAString& key = aNode.GetKeyAt(i);
// Copy up-front to avoid shared-buffer overhead (and convert to UTF-8
// at the same time since that's what the atom table uses).
CopyUTF16toUTF8(key, k);
ToLowerCase(k);
nsContentUtils::ASCIIToLower(aNode.GetKeyAt(i), k);
nsCOMPtr<nsIAtom> keyAtom = do_GetAtom(k);
// Get value and remove mandatory quotes
@@ -938,7 +931,7 @@ nsHTMLParanoidFragmentSink::AddAttributes(const nsIParserNode& aNode,
return NS_OK;
}
nsCAutoString k;
nsAutoString k;
nsHTMLTag nodeType = nsHTMLTag(aNode.GetNodeType());
nsresult rv;
@@ -948,10 +941,7 @@ nsHTMLParanoidFragmentSink::AddAttributes(const nsIParserNode& aNode,
for (PRInt32 i = ac - 1; i >= 0; i--) {
rv = NS_OK;
const nsAString& key = aNode.GetKeyAt(i);
CopyUTF16toUTF8(key, k);
ToLowerCase(k);
nsContentUtils::ASCIIToLower(aNode.GetKeyAt(i), k);
nsCOMPtr<nsIAtom> keyAtom = do_GetAtom(k);
// not an allowed attribute