Fix for blocker bugs 95243 (Crash when typing in body of mail compose window)

and 95297 (session history doesn't restore scroll position and form controls).
Fix backs out bryner@netscape.com's patch for bug 92210.

a=jj@netscape.com
This commit is contained in:
kin%netscape.com 2001-08-15 20:41:20 +00:00
Родитель e1478e6f5e
Коммит dc06ecde71
1 изменённых файлов: 5 добавлений и 14 удалений

Просмотреть файл

@ -1023,20 +1023,11 @@ nsDocShell::GetPresContext(nsIPresContext ** aPresContext)
NS_ENSURE_ARG_POINTER(aPresContext);
*aPresContext = nsnull;
/* We want to get the prescontext for the "most previous"
content viewer, because this is the one that will actually
be shown onscreen and is hooked up for events. */
nsCOMPtr<nsIContentViewer> viewer = mContentViewer;
while (viewer) {
nsCOMPtr<nsIContentViewer> prevViewer;
viewer->GetPreviousViewer(getter_AddRefs(prevViewer));
if (prevViewer)
viewer = prevViewer;
else {
nsCOMPtr<nsIDocumentViewer> docv(do_QueryInterface(viewer));
if (docv)
rv = docv->GetPresContext(*aPresContext);
break;
if (mContentViewer) {
nsCOMPtr<nsIDocumentViewer> docv(do_QueryInterface(mContentViewer));
if (docv) {
rv = docv->GetPresContext(*aPresContext);
}
}