Bug 1507543 - Spellchecker for contenteditable/design-mode should not…

… run without focus; r=m_kato Differential Revision: https://phabricator.services.mozilla.com/D12875 --HG-- rename : editor/reftests/spellcheck-contenteditable-nofocus.html => editor/reftests/spellcheck-contenteditable-nofocus-1.html extra : moz-landing-system : lando
dothq · Dec 3, 2018 · 30d48a6 · 30d48a6
1 parent cfaa5a1
commit 30d48a6
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/editor/libeditor/tests/test_bug366682.html b/editor/libeditor/tests/test_bug366682.html
@@ -43,6 +43,7 @@
   editDoc().body.innerHTML = "<div>errror and an other errror</div>";
   gMisspeltWords = ["errror", "errror"];
   editDoc().designMode = "on";
+  editDoc().defaultView.focus();
 
   SpecialPowers.Cu.import(
     "resource://testing-common/AsyncSpellCheckTestHelper.jsm")

diff --git a/editor/reftests/reftest.list b/editor/reftests/reftest.list
@@ -119,7 +119,8 @@ needs-focus != 824080-6.html 824080-7.html
 fails-if(Android) needs-focus != spellcheck-contenteditable-attr.html spellcheck-contenteditable-ref.html
 needs-focus == spellcheck-contenteditable-focused.html spellcheck-contenteditable-ref.html
 needs-focus == spellcheck-contenteditable-focused-reframe.html spellcheck-contenteditable-ref.html
-== spellcheck-contenteditable-nofocus.html spellcheck-contenteditable-disabled-ref.html
+== spellcheck-contenteditable-nofocus-1.html spellcheck-contenteditable-disabled-ref.html
+== spellcheck-contenteditable-nofocus-2.html spellcheck-contenteditable-disabled-ref.html
 == spellcheck-contenteditable-disabled.html spellcheck-contenteditable-disabled-ref.html
 == spellcheck-contenteditable-disabled-partial.html spellcheck-contenteditable-disabled-partial-ref.html
 == spellcheck-contenteditable-attr-inherit.html spellcheck-contenteditable-disabled-ref.html

diff --git a/...s/spellcheck-contenteditable-nofocus.html → ...spellcheck-contenteditable-nofocus-1.html b/...s/spellcheck-contenteditable-nofocus.html → ...spellcheck-contenteditable-nofocus-1.html
diff --git a/editor/reftests/spellcheck-contenteditable-nofocus-2.html b/editor/reftests/spellcheck-contenteditable-nofocus-2.html
@@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<html><body><div contenteditable>blahblahblah</div></body></html>
diff --git a/editor/spellchecker/EditorSpellCheck.cpp b/editor/spellchecker/EditorSpellCheck.cpp
@@ -646,11 +646,15 @@ EditorSpellCheck::UpdateCurrentDictionary(
   nsCOMPtr<nsIContent> rootContent;
   HTMLEditor* htmlEditor = mEditor->AsHTMLEditor();
   if (htmlEditor) {
-    rootContent = htmlEditor->GetActiveEditingHost();
+    rootContent = htmlEditor->GetFocusedContent();
   } else {
     rootContent = mEditor->GetRoot();
   }
 
+  if (!rootContent) {
+    return NS_ERROR_FAILURE;
+  }
+
   // Try to get topmost document's document element for embedded mail editor.
   uint32_t flags = 0;
   mEditor->GetFlags(&flags);
@@ -660,13 +664,12 @@ EditorSpellCheck::UpdateCurrentDictionary(
     nsIDocument* parentDoc = ownerDoc->GetParentDocument();
     if (parentDoc) {
       rootContent = parentDoc->GetDocumentElement();
+      if (!rootContent) {
+        return NS_ERROR_FAILURE;
+      }
     }
   }
 
-  if (!rootContent) {
-    return NS_ERROR_FAILURE;
-  }
-
   RefPtr<DictionaryFetcher> fetcher =
       new DictionaryFetcher(this, aCallback, mDictionaryFetcherGroup);
   rootContent->GetLang(fetcher->mRootContentLang);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<!DOCTYPE html>
		<html><body><div contenteditable>blahblahblah</div></body></html>