Integrating Mac OS Grammar checker into Chromium.

chrome/renderer/render_view.cc

 // Copyright (c) 2011 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/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 129 matching lines @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPoint.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRange.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSearchableFormData.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSettings.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebTextCheckingCompletion.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebTextCheckingResult.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWindowFeatures.h"
 #include "third_party/cld/encodings/compact_lang_det/win/cld_unicodetext.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/message_box_flags.h"
@@ skipping 93 matching lines @@
 using WebKit::WebRect;
 using WebKit::WebScriptSource;
 using WebKit::WebSearchableFormData;
 using WebKit::WebSecurityOrigin;
 using WebKit::WebSettings;
 using WebKit::WebSharedWorker;
 using WebKit::WebSize;
 using WebKit::WebStorageNamespace;
 using WebKit::WebString;
 using WebKit::WebTextAffinity;
+using WebKit::WebTextCheckingResult;
 using WebKit::WebTextDirection;
 using WebKit::WebURL;
 using WebKit::WebURLError;
 using WebKit::WebURLRequest;
 using WebKit::WebURLResponse;
 using WebKit::WebVector;
 using WebKit::WebView;
 using WebKit::WebWidget;
 using WebKit::WebWindowFeatures;
 using WebKit::WebWorker;
@@ skipping 712 matching lines @@
     IPC_MESSAGE_HANDLER(ViewMsg_Copy, OnCopy)
 #if defined(OS_MACOSX)
     IPC_MESSAGE_HANDLER(ViewMsg_CopyToFindPboard, OnCopyToFindPboard)
 #endif
     IPC_MESSAGE_HANDLER(ViewMsg_Paste, OnPaste)
     IPC_MESSAGE_HANDLER(ViewMsg_Replace, OnReplace)
     IPC_MESSAGE_HANDLER(ViewMsg_ToggleSpellPanel, OnToggleSpellPanel)
     IPC_MESSAGE_HANDLER(ViewMsg_AdvanceToNextMisspelling,
                         OnAdvanceToNextMisspelling)
     IPC_MESSAGE_HANDLER(ViewMsg_ToggleSpellCheck, OnToggleSpellCheck)
+    IPC_MESSAGE_HANDLER(ViewMsg_SpellChecker_RespondTextCheck,
+                        OnRespondTextCheck);
     IPC_MESSAGE_HANDLER(ViewMsg_Delete, OnDelete)
     IPC_MESSAGE_HANDLER(ViewMsg_SelectAll, OnSelectAll)
     IPC_MESSAGE_HANDLER(ViewMsg_CopyImageAt, OnCopyImageAt)
     IPC_MESSAGE_HANDLER(ViewMsg_ExecuteEditCommand, OnExecuteEditCommand)
     IPC_MESSAGE_HANDLER(ViewMsg_Find, OnFind)
     IPC_MESSAGE_HANDLER(ViewMsg_StopFinding, OnStopFinding)
     IPC_MESSAGE_HANDLER(ViewMsg_FindReplyACK, OnFindReplyAck)
     IPC_MESSAGE_HANDLER(ViewMsg_Zoom, OnZoom)
     IPC_MESSAGE_HANDLER(ViewMsg_SetContentSettingsForLoadingURL,
                         OnSetContentSettingsForLoadingURL)
@@ skipping 583 matching lines @@
 void RenderView::OnToggleSpellPanel(bool is_currently_visible) {
   if (!webview())
     return;
   // We need to tell the webView whether the spelling panel is visible or not so
   // that it won't need to make ipc calls later.
   spelling_panel_visible_ = is_currently_visible;
   webview()->focusedFrame()->executeCommand(
       WebString::fromUTF8("ToggleSpellPanel"));
 }
 
+static WebVector<WebTextCheckingResult> toWebResults(
+    const TextCheckingResultList& results) {
+  std::vector<WebTextCheckingResult> webResults;
+  for (size_t i = 0; i < results.size(); ++i) {
+    switch (results[i].type) {
+      case TextCheckingResult::MISSPELLING:
+        webResults.push_back(WebTextCheckingResult(
+            WebTextCheckingResult::ErrorSpelling,
+            results[i].location, results[i].length));
+        break;
+      case TextCheckingResult::BAD_GRAMMAR:
+        webResults.push_back(WebTextCheckingResult(
+            WebTextCheckingResult::ErrorGrammar,
+            results[i].location, results[i].length));
+        break;
+      default:
+        break;
+    }
+  }
+
+  return webResults;
+}
+
+void RenderView::OnRespondTextCheck(
+    int identifier, int tag, const TextCheckingResultList& results) {
+  WebKit::WebTextCheckingCompletion* completion =
+      text_check_completions_.Lookup(identifier);
+  if (!completion)
+    return;
+  text_check_completions_.Remove(identifier);
+  completion->didFinishCheckingText(toWebResults(results));

[Hironori Bono, 2011/02/09 05:43:51]

Out of curiosity, who deletes this 'completion' object?

[gmorrita, 2011/02/10 02:15:21]

didFinishCheckingText() removes |this| at the end of the call.

+}
+
 void RenderView::OnToggleSpellCheck() {
   if (!webview())
     return;
 
   WebFrame* frame = webview()->focusedFrame();
   frame->enableContinuousSpellChecking(
       !frame->isContinuousSpellCheckingEnabled());
 }
 
 void RenderView::OnDelete() {
@@ skipping 720 matching lines @@
   string16 word(text);
   RenderThread* thread = RenderThread::current();
   // Will be NULL during unit tests.
   if (thread) {
     thread->spellchecker()->SpellCheckWord(
         word.c_str(), word.size(), document_tag_,
         &misspelled_offset, &misspelled_length, NULL);
   }
 }
 
+void RenderView::requestCheckingOfText(
+    const WebString& text,
+    WebKit::WebTextCheckingCompletion* completion) {
+  // Text check (unified request for grammar and spell check) is only

[Hironori Bono, 2011/02/09 05:43:51]

it may be a good idea to enclose this block with '#if defined(OS_MACOSX)' and
'#endif' since the platform-spellchecker is available only on Mac OS for now.
Also, it would be better to move this code to
'src/chrome/renderer/spellcheck/spellcheck.cc', which includes all magics about
our spellchecker.

[gmorrita, 2011/02/10 02:15:21]

Absolutely. Moved to spellchecker.cc

+  // available for browser process, so we do IPC instead of
+  // asking the Spellchecker.
+  int32 id = text_check_completions_.Add(completion);
+  Send(new ViewHostMsg_SpellChecker_RequestTextCheck(
+      routing_id_, routing_id_, id, document_tag_,
+      string16(text)));
+}
+
 WebString RenderView::autoCorrectWord(const WebKit::WebString& word) {
   string16 autocorrect_word;
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kExperimentalSpellcheckerFeatures)) {
     EnsureDocumentTag();
     RenderThread* thread = RenderThread::current();
     // Will be NULL during unit tests.
     if (thread) {
       autocorrect_word =
           thread->spellchecker()->GetAutoCorrectionWord(
@@ skipping 3433 matching lines @@
   }
 }
 
 void RenderView::OnContextMenuClosed(
     const webkit_glue::CustomContextMenuContext& custom_context) {
   if (custom_context.is_pepper_menu)
     pepper_delegate_.OnContextMenuClosed(custom_context);
   else
     context_menu_node_.reset();
 }