From 445b49e9e403763706ab2a9482b3f1a8c22b9835 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Mon, 19 Jan 2009 16:46:47 -0500 Subject: [PATCH] Bug 459443. Make sure to detach our editor even if we don't have a session history entry, so that scripts will get correctly reenabled. r+sr=peterv --- docshell/base/nsDocShell.cpp | 3 +-- layout/reftests/bugs/459443-1-ref.html | 6 ++++++ layout/reftests/bugs/459443-1.html | 23 +++++++++++++++++++++++ layout/reftests/bugs/reftest.list | 1 + 4 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 layout/reftests/bugs/459443-1-ref.html create mode 100644 layout/reftests/bugs/459443-1.html diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 97e5c050e3..c84769add8 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -5534,8 +5534,7 @@ nsDocShell::DetachEditorFromWindow(nsISHEntry *aSHEntry) void nsDocShell::DetachEditorFromWindow() { - if (mOSHE) - DetachEditorFromWindow(mOSHE); + DetachEditorFromWindow(mOSHE); } nsresult diff --git a/layout/reftests/bugs/459443-1-ref.html b/layout/reftests/bugs/459443-1-ref.html new file mode 100644 index 0000000000..b731831e84 --- /dev/null +++ b/layout/reftests/bugs/459443-1-ref.html @@ -0,0 +1,6 @@ + + + + + + diff --git a/layout/reftests/bugs/459443-1.html b/layout/reftests/bugs/459443-1.html new file mode 100644 index 0000000000..3ff19d1822 --- /dev/null +++ b/layout/reftests/bugs/459443-1.html @@ -0,0 +1,23 @@ + + + + + + + diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list index fa129cd573..dd331ffec6 100644 --- a/layout/reftests/bugs/reftest.list +++ b/layout/reftests/bugs/reftest.list @@ -1028,3 +1028,4 @@ fails == 461512-1.html 461512-1-ref.html # Bug 461512 == 471356-1.html 471356-1-ref.html == 471594-1.xhtml 471594-1-ref.html == 472500-1.xul 472500-1-ref.xul +== 459443-1.html 459443-1-ref.html -- 2.11.4.GIT