From 9d8d6835159afe80a04bbaed46b6063529e8b4be Mon Sep 17 00:00:00 2001 From: "peterv@propagandism.org" Date: Mon, 29 Oct 2007 11:22:48 -0700 Subject: [PATCH] Fix for bug 401288 (Crash in Composer [@ PresShell::GetSelection][@ nsCOMArray_base::InsertObjectAt]). r/sr=bz, a=endgame. --- content/html/document/src/nsHTMLDocument.cpp | 4 ++-- content/html/document/src/nsHTMLDocument.h | 9 --------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp index f50661161f39..6b0ac09ce181 100644 --- a/content/html/document/src/nsHTMLDocument.cpp +++ b/content/html/document/src/nsHTMLDocument.cpp @@ -3737,7 +3737,7 @@ nsHTMLDocument::EndUpdate(nsUpdateType aUpdateType) { nsDocument::EndUpdate(aUpdateType); - if (mUpdateNestLevel == 0 && EditingShouldBeOn() != IsEditingOn()) { + if (mUpdateNestLevel == 0 && mContentEditableCount > 0 != IsEditingOn()) { EditingStateChanged(); } } @@ -3752,7 +3752,7 @@ nsHTMLDocument::ChangeContentEditableCount(nsIContent *aElement, mContentEditableCount += aChange; if (mParser || - (mUpdateNestLevel > 0 && EditingShouldBeOn() != IsEditingOn())) { + (mUpdateNestLevel > 0 && mContentEditableCount > 0 != IsEditingOn())) { return NS_OK; } diff --git a/content/html/document/src/nsHTMLDocument.h b/content/html/document/src/nsHTMLDocument.h index 7e9606a52898..ff80c06fa3f3 100644 --- a/content/html/document/src/nsHTMLDocument.h +++ b/content/html/document/src/nsHTMLDocument.h @@ -212,15 +212,6 @@ public: mDisableCookieAccess = PR_TRUE; } - /** - * Returns whether the document should be editable. This can be different from - * IsEditingOn() (for example if we're delaying turning the editor on/off). - */ - PRBool EditingShouldBeOn() - { - return HasFlag(NODE_IS_EDITABLE) || mContentEditableCount > 0; - } - void EndUpdate(nsUpdateType aUpdateType); NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED_NO_UNLINK(nsHTMLDocument, nsDocument)