Fix for bug 395340 (Crash [@ nsINode::GetNodeParent] with CSS counters and contentEditable). r/sr=bz, a=endgame.

git-svn-id: svn://10.0.0.236/trunk@238198 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
peterv%propagandism.org
2007-10-26 10:30:44 +00:00
parent 43b1dac308
commit 3c709cb608
3 changed files with 26 additions and 4 deletions

View File

@@ -3732,6 +3732,16 @@ nsHTMLDocument::GetDesignMode(nsAString & aDesignMode)
return NS_OK;
}
void
nsHTMLDocument::EndUpdate(nsUpdateType aUpdateType)
{
nsDocument::EndUpdate(aUpdateType);
if (mUpdateNestLevel == 0 && EditingShouldBeOn() != IsEditingOn()) {
EditingStateChanged();
}
}
nsresult
nsHTMLDocument::ChangeContentEditableCount(nsIContent *aElement,
PRInt32 aChange)
@@ -3741,7 +3751,8 @@ nsHTMLDocument::ChangeContentEditableCount(nsIContent *aElement,
mContentEditableCount += aChange;
if (mParser) {
if (mParser ||
(mUpdateNestLevel > 0 && EditingShouldBeOn() != IsEditingOn())) {
return NS_OK;
}