diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp index 000a3adb964..ce518e602da 100644 --- a/mozilla/docshell/base/nsDocShell.cpp +++ b/mozilla/docshell/base/nsDocShell.cpp @@ -1251,15 +1251,9 @@ nsDocShell::GetPresContext(nsPresContext ** aPresContext) NS_ENSURE_ARG_POINTER(aPresContext); *aPresContext = nsnull; -#if 1 if (!mContentViewer) return NS_OK; -#else - nsresult rv = EnsureContentViewer(); - if (NS_FAILED(rv)) - return rv; // we're probably being destroyed -#endif - + nsCOMPtr docv(do_QueryInterface(mContentViewer)); NS_ENSURE_TRUE(docv, NS_ERROR_NO_INTERFACE);