Backing out to fix orange.

docshell/base/nsDocShellEditorData.cpp

@@ -73,7 +73,7 @@ nsDocShellEditorData::~nsDocShellEditorData()
     nsCOMPtr<nsIDOMWindow> domWindow = do_GetInterface(mDocShell);
     // This will eventually call nsDocShellEditorData::SetEditor(nsnull)
     //   which will call mEditorPreDestroy() and delete the editor
-    mEditingSession->TearDownEditorOnWindow(domWindow, PR_TRUE);
+    mEditingSession->TearDownEditorOnWindow(domWindow);
   }
   else if (mEditor) // Should never have this w/o nsEditingSession!
   {
@@ -104,8 +104,7 @@ nsDocShellEditorData::MakeEditable(PRBool inWaitForUriLoad /*, PRBool inEditable
     mEditor = nsnull;
   }
   
-  if (inWaitForUriLoad)
-    mMakeEditable = PR_TRUE;
+  mMakeEditable = PR_TRUE;
   return NS_OK;
 }
 
@@ -192,8 +191,6 @@ nsDocShellEditorData::SetEditor(nsIEditor *inEditor)
     }
       
     mEditor = inEditor;    // owning addref
-    if (!mEditor)
-      mMakeEditable = PR_FALSE;
   }   
   
   return NS_OK;