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

Fix for bug 230439 (Remove anonymous nodeinfomanager and other cleanup). r=caillon, sr=jst.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@151500 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
peterv%propagandism.org
2004-01-18 14:52:21 +00:00
parent e0a847a2af
commit f76a4dbc8a
7 changed files with 27 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -155,6 +155,7 @@ public:
nsString mBaseHREF;
nsString mBaseTarget;
nsCOMPtr<nsIDocument> mTargetDocument;
nsCOMPtr<nsINodeInfoManager> mNodeInfoManager;
};
@@ -245,8 +246,10 @@ nsHTMLFragmentContentSink::WillBuildModel(void)
return NS_OK;
}
NS_ASSERTION(mTargetDocument, "Need a document!");
nsCOMPtr<nsIDOMDocumentFragment> frag;
nsresult rv = NS_NewDocumentFragment(getter_AddRefs(frag), nsnull);
nsresult rv = NS_NewDocumentFragment(getter_AddRefs(frag), mTargetDocument);
NS_ENSURE_SUCCESS(rv, rv);
return CallQueryInterface(frag, &mRoot);
@@ -697,18 +700,18 @@ nsHTMLFragmentContentSink::GetFragment(nsIDOMDocumentFragment** aFragment)
NS_IMETHODIMP
nsHTMLFragmentContentSink::SetTargetDocument(nsIDocument* aTargetDocument)
{
if (aTargetDocument) {
mNodeInfoManager = aTargetDocument->GetNodeInfoManager();
}
NS_ENSURE_ARG_POINTER(aTargetDocument);
mTargetDocument = aTargetDocument;
mNodeInfoManager = aTargetDocument->GetNodeInfoManager();
if (mNodeInfoManager) {
return NS_OK;
}
nsresult rv = NS_NewNodeInfoManager(getter_AddRefs(mNodeInfoManager));
NS_ENSURE_SUCCESS(rv, rv);
rv = mNodeInfoManager->Init(nsnull);
rv = mNodeInfoManager->Init(aTargetDocument);
if (NS_FAILED(rv)) {
mNodeInfoManager = nsnull;
}