Backed out changeset 93c7b23284b8 (Bug 545593) for causing Md oth failures on linux.

2010-02-12 16:46:04 -06:00
parent 1b46df99a8
commit 13c441d2fb
14 changed files with 226 additions and 33 deletions
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -11420,6 +11420,20 @@ nsDocShell::StopDocumentLoad(void)
  return NS_ERROR_DOCSHELL_REQUEST_REJECTED;
 }

+NS_IMETHODIMP
+nsDocShell::SetRendering(PRBool aRender)
+{
+  if(eCharsetReloadRequested != mCharsetReloadState) 
+  {
+    if (mContentViewer) {
+       mContentViewer->SetEnableRendering(aRender);
+       return NS_OK;
+    }
+  }
+  //return failer if this request is not accepted due to mCharsetReloadState
+  return NS_ERROR_DOCSHELL_REQUEST_REJECTED;
+}
+
 NS_IMETHODIMP
 nsDocShell::GetPrintPreview(nsIWebBrowserPrint** aPrintPreview)
 {