corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 474389. Fix the 'set up editor after this load' setup, which hasn't really worked for a while, except for initial loads in the window. r+sr=peterv

Browse Source
This commit is contained in:
Boris Zbarsky
2009-01-23 10:16:10 -05:00
parent 365e44a9d2
commit 8d569520d0
4 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
docshell/base/nsDocShell.cpp
View File

@@ -5502,21 +5502,24 @@ nsDocShell::ReattachEditorToWindow(nsISHEntry *aSHEntry)
}
void
nsDocShell::DetachEditorFromWindow(nsISHEntry *aSHEntry)
nsDocShell::DetachEditorFromWindow()
{
if (!mEditorData)
if (!mEditorData || mEditorData->WaitingForLoad()) {
// If there's nothing to detach, or if the editor data is actually set
// up for the _new_ page that's coming in, don't detach.
return;
}
NS_ASSERTION(!aSHEntry || !aSHEntry->HasDetachedEditor(),
NS_ASSERTION(!mOSHE || !mOSHE->HasDetachedEditor(),
"Detaching editor when it's already detached.");
nsresult res = mEditorData->DetachFromWindow();
NS_ASSERTION(NS_SUCCEEDED(res), "Failed to detach editor");
if (NS_SUCCEEDED(res)) {
// Make aSHEntry hold the owning ref to the editor data.
if (aSHEntry)
aSHEntry->SetEditorData(mEditorData.forget());
// Make mOSHE hold the owning ref to the editor data.
if (mOSHE)
mOSHE->SetEditorData(mEditorData.forget());
else
mEditorData = nsnull;
}
@@ -5529,13 +5532,6 @@ nsDocShell::DetachEditorFromWindow(nsISHEntry *aSHEntry)
"Window is still editable after detaching editor.");
}
#endif // DEBUG
}
void
nsDocShell::DetachEditorFromWindow()
{
DetachEditorFromWindow(mOSHE);
}
nsresult