Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backing out to fix orange.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@228906 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
peterv%propagandism.org
2007-06-27 23:21:09 +00:00
parent 147a5357cd
commit 857e346b36
52 changed files with 266 additions and 1311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mozilla/docshell/base/nsDocShellEditorData.cpp
View File

@@ -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;