Fix for
bug 388183 (Reloading this testcase causes crash [@
nsHTMLDocument::ChangeContentEditableCount] with null editor), now with correct whitespace. r/sr=jst.
--- a/content/html/document/src/nsHTMLDocument.cpp
+++ b/content/html/document/src/nsHTMLDocument.cpp
@@ -3759,35 +3759,35 @@ nsHTMLDocument::ChangeContentEditableCou
nsCOMPtr<nsIEditorDocShell> editorDocShell =
do_QueryInterface(docshell, &rv);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIEditor> editor;
editorDocShell->GetEditor(getter_AddRefs(editor));
if (editor) {
- nsCOMPtr<nsIDOMRange> range;
- rv = NS_NewRange(getter_AddRefs(range));
- NS_ENSURE_SUCCESS(rv, rv);
-
- rv = range->SelectNode(node);
- NS_ENSURE_SUCCESS(rv, rv);
-
- nsCOMPtr<nsIInlineSpellChecker> spellChecker;
- rv = editor->GetInlineSpellChecker(PR_FALSE,
- getter_AddRefs(spellChecker));
- NS_ENSURE_SUCCESS(rv, rv);
-
- if (spellChecker) {
- rv = spellChecker->SpellCheckRange(range);
+ nsCOMPtr<nsIDOMRange> range;
+ rv = NS_NewRange(getter_AddRefs(range));
+ NS_ENSURE_SUCCESS(rv, rv);
+
+ rv = range->SelectNode(node);
NS_ENSURE_SUCCESS(rv, rv);
+
+ nsCOMPtr<nsIInlineSpellChecker> spellChecker;
+ rv = editor->GetInlineSpellChecker(PR_FALSE,
+ getter_AddRefs(spellChecker));
+ NS_ENSURE_SUCCESS(rv, rv);
+
+ if (spellChecker) {
+ rv = spellChecker->SpellCheckRange(range);
+ NS_ENSURE_SUCCESS(rv, rv);
+ }
}
}
}
- }
return NS_OK;
}
static void
NotifyEditableStateChange(nsINode *aNode, nsIDocument *aDocument,
PRBool aEditable)
{
@@ -3827,19 +3827,19 @@ nsHTMLDocument::TurnEditingOff()
// turn editing off
rv = editSession->TearDownEditorOnWindow(window, PR_TRUE);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIEditor> editor;
editorDocShell->GetEditor(getter_AddRefs(editor));
nsCOMPtr<nsIEditorStyleSheets> editorss = do_QueryInterface(editor);
if (editorss) {
- editorss->RemoveOverrideStyleSheet(NS_LITERAL_STRING("resource:/res/contenteditable.css"));
+ editorss->RemoveOverrideStyleSheet(NS_LITERAL_STRING("resource:/res/contenteditable.css"));
if (mEditingState == eDesignMode)
- editorss->RemoveOverrideStyleSheet(NS_LITERAL_STRING("resource:/res/designmode.css"));
+ editorss->RemoveOverrideStyleSheet(NS_LITERAL_STRING("resource:/res/designmode.css"));
}
if (mEditingState == eDesignMode) {
rv = docshell->SetAllowJavascript(mScriptsEnabled);
NS_ENSURE_SUCCESS(rv, rv);
rv = docshell->SetAllowPlugins(mPluginsEnabled);
NS_ENSURE_SUCCESS(rv, rv);