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

Remove non-inlined version of nsIPresShell::GetDocument(). Bug 253889, r+sr=roc.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@160208 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bryner%brianryner.com
2004-08-02 04:52:55 +00:00
parent d73595ecf1
commit 736c955c54
60 changed files with 201 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/layout/generic/nsSelection.cpp
View File

@@ -1635,8 +1635,7 @@ nsTypedSelection::ToStringWithFormat(const char * aFormatType, PRUint32 aFlags,
return NS_ERROR_FAILURE;
}
nsCOMPtr<nsIDocument> doc;
rv = shell->GetDocument(getter_AddRefs(doc));
nsIDocument *doc = shell->GetDocument();
NS_ENSURE_SUCCESS(rv, rv);
// Flags should always include OutputSelectionOnly if we're coming from here:
@@ -3092,10 +3091,7 @@ NS_IMETHODIMP nsSelection::SelectAll()
return NS_ERROR_FAILURE;
}
nsCOMPtr<nsIDocument> doc;
rv = shell->GetDocument(getter_AddRefs(doc));
if (NS_FAILED(rv))
return rv;
nsIDocument *doc = shell->GetDocument();
if (!doc)
return NS_ERROR_FAILURE;
rootContent = doc->GetRootContent();
@@ -7479,16 +7475,10 @@ nsTypedSelection::NotifySelectionListeners()
PRInt32 cnt = mSelectionListeners.Count();
nsCOMPtr<nsIDOMDocument> domdoc;
nsCOMPtr<nsIDocument> doc;
nsCOMPtr<nsIPresShell> shell;
nsresult rv = GetPresShell(getter_AddRefs(shell));
if (NS_SUCCEEDED(rv) && shell)
{
rv = shell->GetDocument(getter_AddRefs(doc));
if (NS_FAILED(rv))
doc = 0;
domdoc = do_QueryInterface(doc);
}
domdoc = do_QueryInterface(shell->GetDocument());
short reason = mFrameSelection->PopReason();
for (PRInt32 i = 0; i < cnt; i++)
{