Move Mac to using renderer spellchecker.

chrome/renderer/render_view.cc

 // Copyright (c) 2009 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.
 
 #if defined(ENABLE_PEPPER)
 #define PEPPER_APIS_ENABLED
 #endif
 
 #include "chrome/renderer/render_view.h"
 
@@ skipping 34 matching lines @@
 #include "chrome/renderer/extensions/event_bindings.h"
 #include "chrome/renderer/extensions/extension_process_bindings.h"
 #include "chrome/renderer/extensions/renderer_extension_bindings.h"
 #include "chrome/renderer/localized_error.h"
 #include "chrome/renderer/media/audio_renderer_impl.h"
 #include "chrome/renderer/navigation_state.h"
 #include "chrome/renderer/notification_provider.h"
 #include "chrome/renderer/plugin_channel_host.h"
 #include "chrome/renderer/print_web_view_helper.h"
 #include "chrome/renderer/render_process.h"
-#if defined(SPELLCHECKER_IN_RENDERER)
 #include "chrome/renderer/spellchecker/spellcheck.h"
-#endif
 #include "chrome/renderer/user_script_slave.h"
 #include "chrome/renderer/visitedlink_slave.h"
 #include "chrome/renderer/webplugin_delegate_pepper.h"
 #include "chrome/renderer/webplugin_delegate_proxy.h"
 #include "chrome/renderer/websharedworker_proxy.h"
 #include "chrome/renderer/webworker_proxy.h"
 #include "grit/generated_resources.h"
 #include "grit/renderer_resources.h"
 #include "net/base/data_url.h"
 #include "net/base/escape.h"
@@ skipping 1428 matching lines @@
   }
 
   return did_execute_command;
 }
 
 void RenderView::spellCheck(const WebString& text,
                             int& misspelled_offset,
                             int& misspelled_length) {
   EnsureDocumentTag();
 
-#if defined(SPELLCHECKER_IN_RENDERER)
   string16 word(text);
   RenderThread* thread = RenderThread::current();
   // Will be NULL during unit tests.
   if (thread) {
-    RenderThread::current()->spellchecker()->SpellCheckWord(
+    thread->spellchecker()->SpellCheckWord(
         word.c_str(), word.size(), document_tag_,
         &misspelled_offset, &misspelled_length, NULL);
   }
-#else
-  Send(new ViewHostMsg_SpellCheck(routing_id_, text, document_tag_,
-                                  &misspelled_offset, &misspelled_length));
-#endif
 }
 
 WebString RenderView::autoCorrectWord(const WebKit::WebString& word) {
   string16 autocorrect_word;
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kExperimentalSpellcheckerFeatures)) {
     EnsureDocumentTag();
-#if defined(SPELLCHECKER_IN_RENDERER)
     RenderThread* thread = RenderThread::current();
     // Will be NULL during unit tests.
     if (thread) {
       autocorrect_word =
-          RenderThread::current()->spellchecker()->GetAutoCorrectionWord(
+          thread->spellchecker()->GetAutoCorrectionWord(
               word, document_tag_);
     }
-#else
-    Send(new ViewHostMsg_GetAutoCorrectWord(
-        routing_id_, word, document_tag_, &autocorrect_word));
-#endif
   }
   return autocorrect_word;
 }
 
 void RenderView::showSpellingUI(bool show) {
   Send(new ViewHostMsg_ShowSpellingPanel(routing_id_, show));
 }
 
 bool RenderView::isShowingSpellingUI() {
   return spelling_panel_visible_;
@@ skipping 64 matching lines @@
   // response as RunJavaScriptMessage.
   std::wstring ignored_result;
   SendAndRunNestedMessageLoop(new ViewHostMsg_RunBeforeUnloadConfirm(
       routing_id_, frame->url(), UTF16ToWideHack(message), &success,
       &ignored_result));
   return success;
 }
 
 void RenderView::showContextMenu(
     WebFrame* frame, const WebContextMenuData& data) {
-  Send(new ViewHostMsg_ContextMenu(routing_id_, ContextMenuParams(data)));
+  ContextMenuParams params = ContextMenuParams(data);
+  if (!params.misspelled_word.empty() && RenderThread::current()) {
+    int misspelled_offset, misspelled_length;
+    bool misspelled = RenderThread::current()->spellchecker()->SpellCheckWord(
+          params.misspelled_word.c_str(), params.misspelled_word.size(),
+          document_tag_,
+          &misspelled_offset, &misspelled_length,
+          &params.dictionary_suggestions);
+    if (!misspelled)
+      params.misspelled_word.clear();
+  }
+
+  Send(new ViewHostMsg_ContextMenu(routing_id_, params));
 }
 
 void RenderView::setStatusText(const WebString& text) {
 }
 
 void RenderView::UpdateTargetURL(const GURL& url, const GURL& fallback_url) {
   GURL latest_url = url.spec().empty() ? fallback_url : url;
   if (latest_url == target_url_)
     return;
 
@@ skipping 907 matching lines @@
 void RenderView::didChangeContentsSize(WebFrame* frame, const WebSize& size) {
   // We don't always want to send the change messages over IPC, only if we've
   // be put in that mode by getting a |ViewMsg_EnablePreferredSizeChangedMode|
   // message.
   if (send_preferred_size_changes_) {
     // WebCore likes to tell us things have changed even when they haven't, so
     // cache the width and height and only send the IPC message when we're sure
     // they're different.
     int width = webview()->mainFrame()->contentsPreferredWidth();
     int height = webview()->mainFrame()->documentElementScrollHeight();
-    
+
     if (width != preferred_size_.width() ||
         height != preferred_size_.height()) {
       preferred_size_.set_width(width);
       preferred_size_.set_height(height);
 
       Send(new ViewHostMsg_DidContentsPreferredSizeChange(routing_id_,
                                                           preferred_size_));
     }
   }
 }
@@ skipping 1277 matching lines @@
       new PluginMsg_SignalModalDialogEvent(host_window_));
 
   message->EnableMessagePumping();  // Runs a nested message loop.
   bool rv = Send(message);
 
   PluginChannelHost::Broadcast(
       new PluginMsg_ResetModalDialogEvent(host_window_));
 
   return rv;
 }