Clean up backout of the nsDocShell part of the patches in bug 302958 (which, luckily, was not required to fix the bug); calling EnsureContentViewer() from GetPresContext() caused performance regressions. r/sr=bryner, going on a= for previous patch.

git-svn-id: svn://10.0.0.236/trunk@177298 18797224-902f-48f8-a5cc-f745e15eee43

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<nsIDocumentViewer> docv(do_QueryInterface(mContentViewer));
     NS_ENSURE_TRUE(docv, NS_ERROR_NO_INTERFACE);