Asynchronous spellchecking on Win and Linux

chrome/renderer/spellchecker/spellcheck_provider.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/spellchecker/spellcheck_provider.h"
 
 #include "base/command_line.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/spellcheck_messages.h"
 #include "chrome/renderer/chrome_content_renderer_client.h"
@@ skipping 33 matching lines @@
     Send(new SpellCheckHostMsg_DocumentWithTagClosed(
         routing_id(), document_tag_));
   }
 #endif
 }
 
 void SpellCheckProvider::RequestTextChecking(
     const WebString& text,
     int document_tag,
     WebTextCheckingCompletion* completion) {
+  DCHECK(completion);
+  if (!completion)
+    return;
+
+  if (text.isEmpty()) {
+    completion->didFinishCheckingText(WebVector<WebTextCheckingResult>());
+    return;
+  }
+
 #if defined(OS_MACOSX)
-  // Text check (unified request for grammar and spell check) is only
-  // available for browser process, so we ask the system spellchecker
-  // over IPC or return an empty result if the checker is not
-  // available.
+  // SpellChecker on Mac is only available for browser process, so we ask the
+  // system spellchecker over IPC.
   Send(new SpellCheckHostMsg_RequestTextCheck(
-      routing_id(),
-      text_check_completions_.Add(completion),
-      document_tag,
-      text));
+         routing_id(),

[Hironori Bono, 2012/01/27 06:17:41]

nit: I do not think we need these space characters.

[shinyak, 2012/01/30 06:53:05]

Done. Sorry.

+         text_check_completions_.Add(completion),
+         document_tag,
+         text));
 #else
-    completion->didFinishCheckingText(
-        std::vector<WebTextCheckingResult>());
-#endif  // !OS_MACOSX
+  // On the other platforms, currently we don't have a system spellchecker.
+  // So we post a task to spellcheck.
+
+  // |chrome_content_renderer_client| may be NULL in unit tests.
+  if (chrome_content_renderer_client_) {
+    chrome_content_renderer_client_->spellcheck()->RequestTextChecking(
+        text, document_tag, completion);
+    return;
+  }
+
+  completion->didFinishCheckingText(WebVector<WebTextCheckingResult>());
+#endif
 }
 
 bool SpellCheckProvider::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(SpellCheckProvider, message)
     IPC_MESSAGE_HANDLER(SpellCheckMsg_AdvanceToNextMisspelling,
                         OnAdvanceToNextMisspelling)
     IPC_MESSAGE_HANDLER(SpellCheckMsg_RespondTextCheck, OnRespondTextCheck)
     IPC_MESSAGE_HANDLER(SpellCheckMsg_ToggleSpellPanel, OnToggleSpellPanel)
     IPC_MESSAGE_HANDLER(SpellCheckMsg_ToggleSpellCheck, OnToggleSpellCheck)
@@ skipping 151 matching lines @@
   // TODO(darin): There's actually no reason for this to be here.  We should
   // have the browser side manage the document tag.
 #if defined(OS_MACOSX)
   if (!has_document_tag_) {
     // Make the call to get the tag.
     Send(new SpellCheckHostMsg_GetDocumentTag(routing_id(), &document_tag_));
     has_document_tag_ = true;
   }
 #endif
 }