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

Bug 386782. save and restore editor state so that it isn't lost when a page goes into the bfcache and then comes back. patch by Chris Pearce, r+sr=peterv,a=beltzner

Browse Source
This commit is contained in:
2008-04-23 14:36:17 -07:00
parent 3ba669d01f
commit c8c3e7e610
17 changed files with 660 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
docshell/base/nsDocShellEditorData.cpp
View File

@@ -40,13 +40,11 @@
#include "nsIComponentManager.h"
#include "nsIInterfaceRequestorUtils.h"
#include "nsIDOMWindow.h"
#include "nsIDocShellTreeItem.h"
#include "nsIDOMDocument.h"
#include "nsDocShellEditorData.h"
/*---------------------------------------------------------------------------
nsDocShellEditorData
@@ -56,6 +54,7 @@
nsDocShellEditorData::nsDocShellEditorData(nsIDocShell* inOwningDocShell)
: mDocShell(inOwningDocShell)
, mMakeEditable(PR_FALSE)
, mIsDetached(PR_FALSE)
{
NS_ASSERTION(mDocShell, "Where is my docShell?");
}
@@ -74,18 +73,12 @@ nsDocShellEditorData::~nsDocShellEditorData()
void
nsDocShellEditorData::TearDownEditor()
{
if (mEditingSession)
{
nsCOMPtr<nsIDOMWindow> domWindow = do_GetInterface(mDocShell);
// This will eventually call nsDocShellEditorData::SetEditor(nsnull)
// which will call mEditorPreDestroy() and delete the editor
mEditingSession->TearDownEditorOnWindow(domWindow);
}
else if (mEditor) // Should never have this w/o nsEditingSession!
{
NS_ASSERTION(mIsDetached, "We should be detached before tearing down");
if (mEditor) {
mEditor->PreDestroy();
mEditor = nsnull; // explicit clear to make destruction order predictable
mEditor = nsnull;
}
mEditingSession = nsnull;
}
@@ -95,7 +88,7 @@ nsDocShellEditorData::TearDownEditor()
----------------------------------------------------------------------------*/
nsresult
nsDocShellEditorData::MakeEditable(PRBool inWaitForUriLoad /*, PRBool inEditable */)
nsDocShellEditorData::MakeEditable(PRBool inWaitForUriLoad)
{
if (mMakeEditable)
return NS_OK;
@@ -218,6 +211,7 @@ nsresult
nsDocShellEditorData::EnsureEditingSession()
{
NS_ASSERTION(mDocShell, "Should have docShell here");
NS_ASSERTION(!mIsDetached, "This will stomp editing session!");
nsresult rv = NS_OK;
@@ -230,3 +224,44 @@ nsDocShellEditorData::EnsureEditingSession()
return rv;
}
nsresult
nsDocShellEditorData::DetachFromWindow()
{
NS_ASSERTION(mEditingSession,
"Can't detach when we don't have a session to detach!");
nsCOMPtr<nsIDOMWindow> domWindow = do_GetInterface(mDocShell);
nsresult rv = mEditingSession->DetachFromWindow(domWindow);
NS_ENSURE_SUCCESS(rv, rv);
mIsDetached = PR_TRUE;
mDetachedMakeEditable = mMakeEditable;
mMakeEditable = PR_FALSE;
nsCOMPtr<nsIDOMDocument> domDoc;
domWindow->GetDocument(getter_AddRefs(domDoc));
nsCOMPtr<nsIHTMLDocument> htmlDoc = do_QueryInterface(domDoc);
if (htmlDoc)
mDetachedEditingState = htmlDoc->GetEditingState();
return NS_OK;
}
nsresult
nsDocShellEditorData::ReattachToWindow(nsIDOMWindow *aWindow)
{
nsCOMPtr<nsIDOMWindow> domWindow = do_GetInterface(mDocShell);
nsresult rv = mEditingSession->ReattachToWindow(domWindow);
NS_ENSURE_SUCCESS(rv, rv);
mIsDetached = PR_FALSE;
mMakeEditable = mDetachedMakeEditable;
nsCOMPtr<nsIDOMDocument> domDoc;
domWindow->GetDocument(getter_AddRefs(domDoc));
nsCOMPtr<nsIHTMLDocument> htmlDoc = do_QueryInterface(domDoc);
if (htmlDoc)
htmlDoc->SetEditingState(mDetachedEditingState);
return NS_OK;
}