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

Bug 209087

Browse Source 
Content interface out-parameters should use ptr-to-ptrs instead of ref-to-ptrs and some small deCOMtamination.
r+sr=jst@netscape.com


git-svn-id: svn://10.0.0.236/trunk@143683 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
caillon%returnzero.com
2003-06-13 20:10:01 +00:00
parent 83bf634c73
commit 0a6d1ae509
310 changed files with 2470 additions and 2523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -922,7 +922,7 @@ HTMLContentSink::CreateContentObject(const nsIParserNode& aNode,
ToLowerCase(tmp);
rv = mNodeInfoManager->GetNodeInfo(tmp, nsnull, kNameSpaceID_None,
*getter_AddRefs(nodeInfo));
getter_AddRefs(nodeInfo));
} else {
nsCOMPtr<nsIDTD> dtd;
rv = mParser->GetDTD(getter_AddRefs(dtd));
@@ -930,7 +930,7 @@ HTMLContentSink::CreateContentObject(const nsIParserNode& aNode,
nsDependentString tag(dtd->IntTagToStringTag(aNodeType));
rv = mNodeInfoManager->GetNodeInfo(tag, nsnull, kNameSpaceID_None,
*getter_AddRefs(nodeInfo));
getter_AddRefs(nodeInfo));
}
}
@@ -1001,9 +1001,7 @@ NS_CreateHTMLElement(nsIHTMLContent** aResult, nsINodeInfo *aNodeInfo,
if (!parserService)
return NS_ERROR_OUT_OF_MEMORY;
nsCOMPtr<nsIAtom> name;
rv = aNodeInfo->GetNameAtom(*getter_AddRefs(name));
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIAtom> name = aNodeInfo->GetNameAtom();
// Find tag in tag table
PRInt32 id;
@@ -1032,7 +1030,7 @@ NS_CreateHTMLElement(nsIHTMLContent** aResult, nsINodeInfo *aNodeInfo,
if (!name->Equals(nsDependentString(tag))) {
nsCOMPtr<nsIAtom> atom = do_GetAtom(tag);
rv = aNodeInfo->NameChanged(atom, *getter_AddRefs(kungFuDeathGrip));
rv = aNodeInfo->NameChanged(atom, getter_AddRefs(kungFuDeathGrip));
NS_ENSURE_SUCCESS(rv, rv);
nodeInfo = kungFuDeathGrip;
@@ -1719,7 +1717,7 @@ SinkContext::CloseContainer(const nsHTMLTag aTag)
#ifdef NS_DEBUG
// Tracing code
nsCOMPtr<nsIAtom> tag;
mStack[mStackPos].mContent->GetTag(*getter_AddRefs(tag));
mStack[mStackPos].mContent->GetTag(getter_AddRefs(tag));
const char *tagStr;
tag->GetUTF8String(&tagStr);
@@ -2135,7 +2133,7 @@ SinkContext::FlushTags(PRBool aNotify)
#ifdef NS_DEBUG
// Tracing code
nsCOMPtr<nsIAtom> tag;
mStack[stackPos].mContent->GetTag(*getter_AddRefs(tag));
mStack[stackPos].mContent->GetTag(getter_AddRefs(tag));
const char* tagStr;
tag->GetUTF8String(&tagStr);
@@ -2455,7 +2453,7 @@ HTMLContentSink::Init(nsIDocument* aDoc,
aDoc->AddObserver(this);
CallQueryInterface(aDoc, &mHTMLDocument);
rv = mDocument->GetNodeInfoManager(*getter_AddRefs(mNodeInfoManager));
rv = mDocument->GetNodeInfoManager(getter_AddRefs(mNodeInfoManager));
NS_ENSURE_SUCCESS(rv, rv);
mDocumentURI = aURL;
@@ -2574,7 +2572,7 @@ HTMLContentSink::Init(nsIDocument* aDoc,
nsCOMPtr<nsINodeInfo> nodeInfo;
rv = mNodeInfoManager->GetNodeInfo(nsHTMLAtoms::html, nsnull,
kNameSpaceID_None,
*getter_AddRefs(nodeInfo));
getter_AddRefs(nodeInfo));
NS_ENSURE_SUCCESS(rv, rv);
// Make root part
@@ -2601,7 +2599,7 @@ HTMLContentSink::Init(nsIDocument* aDoc,
// Make head part
rv = mNodeInfoManager->GetNodeInfo(NS_LITERAL_STRING("head"),
nsnull, kNameSpaceID_None,
*getter_AddRefs(nodeInfo));
getter_AddRefs(nodeInfo));
NS_ENSURE_SUCCESS(rv, rv);
rv = NS_NewHTMLHeadElement(&mHead, nodeInfo);
@@ -3310,7 +3308,7 @@ HTMLContentSink::OpenForm(const nsIParserNode& aNode)
nsCOMPtr<nsINodeInfo> nodeInfo;
result = mNodeInfoManager->GetNodeInfo(nsHTMLAtoms::form, nsnull,
kNameSpaceID_None,
*getter_AddRefs(nodeInfo));
getter_AddRefs(nodeInfo));
NS_ENSURE_SUCCESS(result, result);
nsCOMPtr<nsIHTMLContent> content;
@@ -3642,7 +3640,7 @@ HTMLContentSink::SetDocumentTitle(const nsAString& aTitle)
nsCOMPtr<nsINodeInfo> nodeInfo;
nsresult rv = mNodeInfoManager->GetNodeInfo(nsHTMLAtoms::title, nsnull,
kNameSpaceID_None,
*getter_AddRefs(nodeInfo));
getter_AddRefs(nodeInfo));
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIHTMLContent> it;
@@ -4447,7 +4445,7 @@ HTMLContentSink::ProcessBaseHref(const nsAString& aBaseHref)
if (NS_SUCCEEDED(rv)) {
NS_RELEASE(mDocumentBaseURL);
mDocument->GetBaseURL(mDocumentBaseURL);
mDocument->GetBaseURL(&mDocumentBaseURL);
}
} else {
// NAV compatibility quirk
@@ -4565,7 +4563,7 @@ HTMLContentSink::ProcessBASETag(const nsIParserNode& aNode)
nsCOMPtr<nsINodeInfo> nodeInfo;
mNodeInfoManager->GetNodeInfo(NS_LITERAL_STRING("base"), nsnull,
kNameSpaceID_None,
*getter_AddRefs(nodeInfo));
getter_AddRefs(nodeInfo));
result = NS_CreateHTMLElement(getter_AddRefs(element), nodeInfo, PR_FALSE);
NS_ENSURE_SUCCESS(result, result);
@@ -4967,7 +4965,7 @@ HTMLContentSink::ProcessLINKTag(const nsIParserNode& aNode)
nsCOMPtr<nsIHTMLContent> element;
nsCOMPtr<nsINodeInfo> nodeInfo;
mNodeInfoManager->GetNodeInfo(nsHTMLAtoms::link, nsnull, kNameSpaceID_None,
*getter_AddRefs(nodeInfo));
getter_AddRefs(nodeInfo));
result = NS_CreateHTMLElement(getter_AddRefs(element), nodeInfo, PR_FALSE);
NS_ENSURE_SUCCESS(result, result);
@@ -5065,7 +5063,7 @@ HTMLContentSink::ProcessMETATag(const nsIParserNode& aNode)
nsCOMPtr<nsINodeInfo> nodeInfo;
rv = mNodeInfoManager->GetNodeInfo(NS_LITERAL_STRING("meta"), nsnull,
kNameSpaceID_None,
*getter_AddRefs(nodeInfo));
getter_AddRefs(nodeInfo));
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIHTMLContent> it;
@@ -5606,7 +5604,7 @@ HTMLContentSink::ProcessSCRIPTTag(const nsIParserNode& aNode)
nsCOMPtr<nsIHTMLContent> element;
nsCOMPtr<nsINodeInfo> nodeInfo;
mNodeInfoManager->GetNodeInfo(nsHTMLAtoms::script, nsnull, kNameSpaceID_None,
*getter_AddRefs(nodeInfo));
getter_AddRefs(nodeInfo));
rv = NS_CreateHTMLElement(getter_AddRefs(element), nodeInfo, PR_FALSE);
if (NS_FAILED(rv)) {
@@ -5737,7 +5735,7 @@ HTMLContentSink::ProcessSTYLETag(const nsIParserNode& aNode)
// Create content object
nsCOMPtr<nsINodeInfo> nodeInfo;
mNodeInfoManager->GetNodeInfo(nsHTMLAtoms::style, nsnull, kNameSpaceID_None,
*getter_AddRefs(nodeInfo));
getter_AddRefs(nodeInfo));
nsCOMPtr<nsIHTMLContent> element;
rv = NS_CreateHTMLElement(getter_AddRefs(element), nodeInfo, PR_FALSE);

54
mozilla/content/html/document/src/nsHTMLDocument.cpp
View File

@@ -1375,7 +1375,7 @@ nsHTMLDocument::ContentAppended(nsIContent* aContainer,
PRInt32 i;
nsCOMPtr<nsIContent> newChild;
for (i = aNewIndexInContainer; i < count; ++i) {
aContainer->ChildAt(i, *getter_AddRefs(newChild));
aContainer->ChildAt(i, getter_AddRefs(newChild));
if (newChild)
RegisterNamedItems(newChild);
}
@@ -1447,7 +1447,7 @@ nsHTMLDocument::AttributeWillChange(nsIContent* aContent, PRInt32 aNameSpaceID,
nsCOMPtr<nsIAtom> tag;
nsAutoString value;
aContent->GetTag(*getter_AddRefs(tag));
aContent->GetTag(getter_AddRefs(tag));
if (IsNamedItem(aContent, tag, value)) {
nsresult rv = RemoveFromNameTable(value, aContent);
@@ -1480,7 +1480,7 @@ nsHTMLDocument::AttributeChanged(nsIContent* aContent, PRInt32 aNameSpaceID,
nsCOMPtr<nsIAtom> tag;
nsAutoString value;
aContent->GetTag(*getter_AddRefs(tag));
aContent->GetTag(getter_AddRefs(tag));
if (IsNamedItem(aContent, tag, value)) {
nsresult rv = UpdateNameTableEntry(value, aContent);
@@ -1553,15 +1553,13 @@ nsHTMLDocument::CreateElementNS(const nsAString& aNamespaceURI,
const nsAString& aQualifiedName,
nsIDOMElement** aReturn)
{
nsresult rv = NS_OK;
nsCOMPtr<nsINodeInfo> nodeInfo;
rv = mNodeInfoManager->GetNodeInfo(aQualifiedName, aNamespaceURI,
*getter_AddRefs(nodeInfo));
nsresult rv = mNodeInfoManager->GetNodeInfo(aQualifiedName,
aNamespaceURI,
getter_AddRefs(nodeInfo));
NS_ENSURE_SUCCESS(rv, rv);
PRInt32 namespaceID;
nodeInfo->GetNamespaceID(namespaceID);
PRInt32 namespaceID = nodeInfo->GetNamespaceID();
nsCOMPtr<nsIElementFactory> elementFactory;
nsContentUtils::GetNSManagerWeakRef()->GetElementFactory(namespaceID,
@@ -1603,7 +1601,7 @@ nsHTMLDocument::CreateElement(const nsAString& aTagName,
}
nsresult rv = mNodeInfoManager->GetNodeInfo(tmp, nsnull, mDefaultNamespaceID,
*getter_AddRefs(nodeInfo));
getter_AddRefs(nodeInfo));
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIHTMLContent> content;
@@ -2184,7 +2182,7 @@ PRInt32
GetHTMLDocumentNamespace(nsIContent *aContent)
{
nsCOMPtr<nsIDocument> doc;
aContent->GetDocument(*getter_AddRefs(doc));
aContent->GetDocument(getter_AddRefs(doc));
NS_ASSERTION(doc, "This method should never be called on content nodes "
"that are not in a document!");
@@ -2207,7 +2205,7 @@ PRBool
nsHTMLDocument::MatchLinks(nsIContent *aContent, nsString* aData)
{
nsCOMPtr<nsINodeInfo> ni;
aContent->GetNodeInfo(*getter_AddRefs(ni));
aContent->GetNodeInfo(getter_AddRefs(ni));
if (ni) {
PRInt32 namespaceID = GetHTMLDocumentNamespace(aContent);
@@ -2241,7 +2239,7 @@ PRBool
nsHTMLDocument::MatchAnchors(nsIContent *aContent, nsString* aData)
{
nsCOMPtr<nsINodeInfo> ni;
aContent->GetNodeInfo(*getter_AddRefs(ni));
aContent->GetNodeInfo(getter_AddRefs(ni));
if (ni) {
PRInt32 namespaceID = GetHTMLDocumentNamespace(aContent);
@@ -2481,8 +2479,8 @@ nsHTMLDocument::OpenCommon(nsIURI* aSourceURL)
nsCOMPtr<nsIAtom> name, prefix;
PRInt32 nsid;
root->GetAttrNameAt(count, nsid, *getter_AddRefs(name),
*getter_AddRefs(prefix));
root->GetAttrNameAt(count, &nsid, getter_AddRefs(name),
getter_AddRefs(prefix));
root->UnsetAttr(nsid, name, PR_FALSE);
}
@@ -3610,7 +3608,7 @@ nsHTMLDocument::UnregisterNamedItems(nsIContent *aContent)
{
nsCOMPtr<nsIAtom> tag;
aContent->GetTag(*getter_AddRefs(tag));
aContent->GetTag(getter_AddRefs(tag));
if (tag == nsLayoutAtoms::textTagName) {
// Text nodes are not named items nor can they have children.
@@ -3640,13 +3638,11 @@ nsHTMLDocument::UnregisterNamedItems(nsIContent *aContent)
aContent->ChildCount(count);
for (i = 0; i < count; i++) {
nsIContent *child;
nsCOMPtr<nsIContent> child;
aContent->ChildAt(i, child);
aContent->ChildAt(i, getter_AddRefs(child));
UnregisterNamedItems(child);
NS_RELEASE(child);
}
return NS_OK;
@@ -3657,7 +3653,7 @@ nsHTMLDocument::RegisterNamedItems(nsIContent *aContent)
{
nsCOMPtr<nsIAtom> tag;
aContent->GetTag(*getter_AddRefs(tag));
aContent->GetTag(getter_AddRefs(tag));
if (tag == nsLayoutAtoms::textTagName) {
// Text nodes are not named items nor can they have children.
@@ -3686,13 +3682,11 @@ nsHTMLDocument::RegisterNamedItems(nsIContent *aContent)
aContent->ChildCount(count);
for (i = 0; i < count; i++) {
nsIContent *child;
nsCOMPtr<nsIContent> child;
aContent->ChildAt(i, child);
aContent->ChildAt(i, getter_AddRefs(child));
RegisterNamedItems(child);
NS_RELEASE(child);
}
return NS_OK;
@@ -3706,7 +3700,7 @@ FindNamedItems(const nsAString& aName, nsIContent *aContent,
"Entry w/o content list passed to FindNamedItems()!");
nsCOMPtr<nsIAtom> tag;
aContent->GetTag(*getter_AddRefs(tag));
aContent->GetTag(getter_AddRefs(tag));
if (tag == nsLayoutAtoms::textTagName) {
// Text nodes are not named items nor can they have children.
@@ -3735,7 +3729,7 @@ FindNamedItems(const nsAString& aName, nsIContent *aContent,
nsCOMPtr<nsIContent> child;
for (i = 0; i < count; i++) {
aContent->ChildAt(i, *getter_AddRefs(child));
aContent->ChildAt(i, getter_AddRefs(child));
FindNamedItems(aName, child, aEntry, aIsXHTML);
}
@@ -3874,7 +3868,7 @@ nsHTMLDocument::ResolveName(const nsAString& aName,
if (e && e != ID_NOT_IN_DOCUMENT) {
nsCOMPtr<nsIAtom> tag;
e->GetTag(*getter_AddRefs(tag));
e->GetTag(getter_AddRefs(tag));
if (tag == nsHTMLAtoms::embed ||
tag == nsHTMLAtoms::img ||
@@ -3907,12 +3901,12 @@ nsHTMLDocument::GetBodyContent()
for (i = 0; i < child_count; i++) {
nsCOMPtr<nsIContent> child;
root->ChildAt(i, *getter_AddRefs(child));
root->ChildAt(i, getter_AddRefs(child));
NS_ENSURE_TRUE(child, NS_ERROR_UNEXPECTED);
if (child->IsContentOfType(nsIContent::eHTML)) {
nsCOMPtr<nsINodeInfo> ni;
child->GetNodeInfo(*getter_AddRefs(ni));
child->GetNodeInfo(getter_AddRefs(ni));
if (ni->Equals(nsHTMLAtoms::body, mDefaultNamespaceID)) {
mBodyContent = do_QueryInterface(child);

12
mozilla/content/html/document/src/nsHTMLFragmentContentSink.cpp
View File

@@ -338,7 +338,7 @@ nsHTMLFragmentContentSink::SetTitle(const nsString& aValue)
nsCOMPtr<nsINodeInfo> nodeInfo;
result = mNodeInfoManager->GetNodeInfo(nsHTMLAtoms::title, nsnull,
kNameSpaceID_None,
*getter_AddRefs(nodeInfo));
getter_AddRefs(nodeInfo));
if(NS_SUCCEEDED(result)) {
nsCOMPtr<nsIHTMLContent> content=nsnull;
result = NS_NewHTMLTitleElement(getter_AddRefs(content), nodeInfo);
@@ -492,7 +492,7 @@ nsHTMLFragmentContentSink::OpenContainer(const nsIParserNode& aNode)
result =
mNodeInfoManager->GetNodeInfo(aNode.GetText(), nsnull,
kNameSpaceID_None,
*getter_AddRefs(nodeInfo));
getter_AddRefs(nodeInfo));
} else {
nsIParserService* parserService =
nsContentUtils::GetParserServiceWeakRef();
@@ -507,7 +507,7 @@ nsHTMLFragmentContentSink::OpenContainer(const nsIParserNode& aNode)
result =
mNodeInfoManager->GetNodeInfo(nsDependentString(name), nsnull,
kNameSpaceID_None,
*getter_AddRefs(nodeInfo));
getter_AddRefs(nodeInfo));
}
NS_ENSURE_SUCCESS(result, result);
@@ -587,7 +587,7 @@ nsHTMLFragmentContentSink::AddLeaf(const nsIParserNode& aNode)
result =
mNodeInfoManager->GetNodeInfo(aNode.GetText(), nsnull,
kNameSpaceID_None,
*getter_AddRefs(nodeInfo));
getter_AddRefs(nodeInfo));
} else {
const PRUnichar *name = nsnull;
result = parserService->HTMLIdToStringTag(nodeType, &name);
@@ -596,7 +596,7 @@ nsHTMLFragmentContentSink::AddLeaf(const nsIParserNode& aNode)
result =
mNodeInfoManager->GetNodeInfo(nsDependentString(name), nsnull,
kNameSpaceID_None,
*getter_AddRefs(nodeInfo));
getter_AddRefs(nodeInfo));
}
NS_ENSURE_SUCCESS(result, result);
@@ -728,7 +728,7 @@ NS_IMETHODIMP
nsHTMLFragmentContentSink::SetTargetDocument(nsIDocument* aTargetDocument)
{
if (aTargetDocument) {
aTargetDocument->GetNodeInfoManager(*getter_AddRefs(mNodeInfoManager));
aTargetDocument->GetNodeInfoManager(getter_AddRefs(mNodeInfoManager));
}
if (mNodeInfoManager) {

2
mozilla/content/html/document/src/nsImageDocument.cpp
View File

@@ -485,7 +485,7 @@ nsImageDocument::CreateSyntheticDocument()
nsCOMPtr<nsINodeInfo> nodeInfo;
rv = mNodeInfoManager->GetNodeInfo(nsHTMLAtoms::img, nsnull,
kNameSpaceID_None,
*getter_AddRefs(nodeInfo));
getter_AddRefs(nodeInfo));
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIHTMLContent> image;

4
mozilla/content/html/document/src/nsMediaDocument.cpp
View File

@@ -175,7 +175,7 @@ nsMediaDocument::CreateSyntheticDocument()
nsCOMPtr<nsINodeInfo> nodeInfo;
rv = mNodeInfoManager->GetNodeInfo(nsHTMLAtoms::html, nsnull,
kNameSpaceID_None,
*getter_AddRefs(nodeInfo));
getter_AddRefs(nodeInfo));
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIHTMLContent> root;
@@ -188,7 +188,7 @@ nsMediaDocument::CreateSyntheticDocument()
rv = mNodeInfoManager->GetNodeInfo(nsHTMLAtoms::body, nsnull,
kNameSpaceID_None,
*getter_AddRefs(nodeInfo));
getter_AddRefs(nodeInfo));
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIHTMLContent> body;

2
mozilla/content/html/document/src/nsPluginDocument.cpp
View File

@@ -172,7 +172,7 @@ nsPluginDocument::CreateSyntheticPluginDocument()
nsCOMPtr<nsINodeInfo> nodeInfo;
rv = mNodeInfoManager->GetNodeInfo(nsHTMLAtoms::embed, nsnull,
kNameSpaceID_None,
*getter_AddRefs(nodeInfo));
getter_AddRefs(nodeInfo));
NS_ENSURE_SUCCESS(rv, rv);
rv = NS_NewHTMLSharedLeafElement(getter_AddRefs(mPluginContent), nodeInfo);
if (NS_FAILED(rv)) {