Update the code to have the SpellCheckProvider implement WebSpellCheckClient, in preparation for ...

content/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 "content/renderer/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 18 matching lines @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/devtools_messages.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/common/pepper_plugin_registry.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_view_commands.h"
-#include "chrome/common/spellcheck_messages.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/web_apps.h"
 #include "chrome/renderer/about_handler.h"
 #include "chrome/renderer/autofill/autofill_agent.h"
 #include "chrome/renderer/autofill/form_manager.h"
 #include "chrome/renderer/autofill/password_autofill_manager.h"
 #include "chrome/renderer/automation/dom_automation_controller.h"
 #include "chrome/renderer/devtools_agent.h"
 #include "chrome/renderer/devtools_client.h"
@@ skipping 95 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/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/skia/include/core/SkBitmap.h"
 #include "ui/base/message_box_flags.h"
 #include "ui/gfx/color_utils.h"
@@ skipping 367 matching lines @@
       navigation_gesture_(NavigationGestureUnknown),
       opened_by_user_gesture_(true),
       opener_suppressed_(false),
       is_prerendering_(false),
       page_id_(-1),
       last_page_id_sent_to_browser_(-1),
       last_indexed_page_id_(-1),
       history_list_offset_(-1),
       history_list_length_(0),
       has_unload_listener_(false),
-#if defined(OS_MACOSX)
-      has_document_tag_(false),
-#endif
-      document_tag_(0),
       target_url_status_(TARGET_NONE),
-      spelling_panel_visible_(false),
       view_type_(ViewType::INVALID),
       browser_window_id_(-1),
       ALLOW_THIS_IN_INITIALIZER_LIST(pepper_delegate_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(page_info_method_factory_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(accessibility_method_factory_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(cookie_jar_(this)),
       devtools_client_(NULL),
       geolocation_dispatcher_(NULL),
       speech_input_dispatcher_(NULL),
       device_orientation_dispatcher_(NULL),
       print_helper_(NULL),
       searchbox_(NULL),
       spellcheck_provider_(NULL),
       accessibility_ack_pending_(false),
       p2p_socket_dispatcher_(NULL),
       pending_app_icon_requests_(0),
       session_storage_namespace_id_(session_storage_namespace_id) {
 
   ClearBlockedContentSettings();
 
   routing_id_ = routing_id;
   if (opener_id != MSG_ROUTING_NONE)
     opener_id_ = opener_id;
 
+  webwidget_ = WebView::create(this);
+
   if (counter) {
     shared_popup_counter_ = counter;
     shared_popup_counter_->data++;
     decrement_shared_popup_at_destruction_ = true;
   } else {
     shared_popup_counter_ = new SharedRenderViewCounter(0);
     decrement_shared_popup_at_destruction_ = false;
   }
 
   notification_provider_ = new NotificationProvider(this);
 
   devtools_agent_ = new DevToolsAgent(this);
+  webview()->setDevToolsAgentClient(devtools_agent_);
+
   PasswordAutofillManager* password_autofill_manager =
       new PasswordAutofillManager(this);
   AutofillAgent* autofill_agent = new AutofillAgent(this,
                                                     password_autofill_manager);
+  webview()->setAutoFillClient(autofill_agent);
 
-  webwidget_ = WebView::create(this, devtools_agent_, autofill_agent);
   g_view_map.Get().insert(std::make_pair(webview(), this));
   webkit_preferences_.Apply(webview());
   webview()->initializeMainFrame(this);
   if (!frame_name.empty())
     webview()->mainFrame()->setName(frame_name);
   webview()->settings()->setMinimumTimerInterval(
       is_hidden() ? webkit_glue::kBackgroundTabTimerInterval :
           webkit_glue::kForegroundTabTimerInterval);
 
   OnSetRendererPrefs(renderer_prefs);
@@ skipping 27 matching lines @@
   // notification and can stop the propagation.
   page_click_tracker->AddListener(password_autofill_manager);
   page_click_tracker->AddListener(autofill_agent);
   new TranslateHelper(this);
   print_helper_ = new PrintWebViewHelper(this);
   searchbox_ = new SearchBox(this);
 
   RenderThread* current_thread = RenderThread::current();
   SpellCheck* spellcheck = current_thread ? current_thread->spellchecker() : 0;
   spellcheck_provider_ = new SpellCheckProvider(this, spellcheck);
+  webview()->setSpellCheckClient(spellcheck_provider_);

[gmorrita, 2011/03/29 18:28:37]

How about to allow SpellCheckProvider to set itself to the webview()
instead of set it by RenderView?

I also think that it might be better to setSpellCheckClient(NULL) when
the client interface is gone before webview() get deleted.
Such kind of symmetry would make its lifetime clear.

[jam, 2011/03/29 18:37:54]

yep I was planning on doing this when I move the spellcheck dependencies
completely from RV, soon
right now I was keeping the old behavior/lifetime, then update the webkit code,
and then update RV to completely remove spelling references.  then i would null
it out in spellcheckprovider's destructor

 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableP2PApi)) {
     p2p_socket_dispatcher_ = new P2PSocketDispatcher(this);
   }
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableClientSidePhishingDetection)) {
     new safe_browsing::PhishingClassifierDelegate(this, NULL);
   }
@@ skipping 11 matching lines @@
   // If file chooser is still waiting for answer, dispatch empty answer.
   while (!file_chooser_completions_.empty()) {
     if (file_chooser_completions_.front()->completion) {
       file_chooser_completions_.front()->completion->didChooseFile(
           WebVector<WebString>());
     }
     file_chooser_completions_.pop_front();
   }
 
 #if defined(OS_MACOSX)
-  // Tell the spellchecker that the document is closed.
-  if (has_document_tag_) {
-    Send(new SpellCheckHostMsg_DocumentWithTagClosed(
-        routing_id_, document_tag_));
-  }
-
   // Destroy all fake plugin window handles on the browser side.
   while (!fake_plugin_window_handles_.empty()) {
     // Make sure no NULL plugin window handles were inserted into this list.
     DCHECK(*fake_plugin_window_handles_.begin());
     // DestroyFakePluginWindowHandle modifies fake_plugin_window_handles_.
     DestroyFakePluginWindowHandle(*fake_plugin_window_handles_.begin());
   }
 #endif
 
   render_thread_->RemoveFilter(audio_message_filter_);
@@ skipping 290 matching lines @@
     IPC_MESSAGE_HANDLER(ViewMsg_ReloadFrame, OnReloadFrame)
     IPC_MESSAGE_HANDLER(ViewMsg_Undo, OnUndo)
     IPC_MESSAGE_HANDLER(ViewMsg_Redo, OnRedo)
     IPC_MESSAGE_HANDLER(ViewMsg_Cut, OnCut)
     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(SpellCheckMsg_ToggleSpellPanel, OnToggleSpellPanel)
-    IPC_MESSAGE_HANDLER(SpellCheckMsg_AdvanceToNextMisspelling,
-                        OnAdvanceToNextMisspelling)
-    IPC_MESSAGE_HANDLER(SpellCheckMsg_ToggleSpellCheck, OnToggleSpellCheck)
     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 527 matching lines @@
 void RenderView::OnReplace(const string16& text) {
   if (!webview())
     return;
 
   WebFrame* frame = webview()->focusedFrame();
   if (!frame->hasSelection())
     frame->selectWordAroundCaret();
   frame->replaceSelection(text);
 }
 
-void RenderView::OnAdvanceToNextMisspelling() {
-  if (!webview())
-    return;
-  webview()->focusedFrame()->executeCommand(
-      WebString::fromUTF8("AdvanceToNextMisspelling"));
-}
-
-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"));
-}
-
-void RenderView::OnToggleSpellCheck() {
-  if (!webview())
-    return;
-
-  WebFrame* frame = webview()->focusedFrame();
-  frame->enableContinuousSpellChecking(
-      !frame->isContinuousSpellCheckingEnabled());
-}
-
 void RenderView::OnDelete() {
   if (!webview())
     return;
 
   webview()->focusedFrame()->executeCommand(WebString::fromUTF8("Delete"));
   UserMetricsRecordAction("DeleteSelection");
 }
 
 void RenderView::OnSelectAll() {
   if (!webview())
@@ skipping 659 matching lines @@
     // seems safest to not execute the rest.
     if (!frame->executeCommand(WebString::fromUTF8(it->name),
                                WebString::fromUTF8(it->value)))
       break;
     did_execute_command = true;
   }
 
   return did_execute_command;
 }
 
-void RenderView::spellCheck(const WebString& text,
-                            int& misspelled_offset,
-                            int& misspelled_length) {
-  EnsureDocumentTag();
-
-  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) {
-  spellcheck_provider_->RequestTextChecking(text, document_tag_, completion);
-}
-
-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(
-              word, document_tag_);
-    }
-  }
-  return autocorrect_word;
-}
-
-void RenderView::showSpellingUI(bool show) {
-  Send(new SpellCheckHostMsg_ShowSpellingPanel(routing_id_, show));
-}
-
-bool RenderView::isShowingSpellingUI() {
-  return spelling_panel_visible_;
-}
-
-void RenderView::updateSpellingUIWithMisspelledWord(const WebString& word) {
-  Send(new SpellCheckHostMsg_UpdateSpellingPanelWithMisspelledWord(routing_id_,
-                                                                   word));
-}
-
-void RenderView::continuousSpellCheckingEnabledStateChanged() {
-  UpdateToggleSpellCheckCommandState();
-}
-
 bool RenderView::runFileChooser(
     const WebKit::WebFileChooserParams& params,
     WebFileChooserCompletion* chooser_completion) {
   // Do not open the file dialog in a hidden RenderView.
   if (is_hidden())
     return false;
   ViewHostMsg_RunFileChooser_Params ipc_params;
   if (params.directory)
     ipc_params.mode = ViewHostMsg_RunFileChooser_Mode::OpenFolder;
   else if (params.multiSelect)
@@ skipping 53 matching lines @@
 }
 
 void RenderView::showContextMenu(
     WebFrame* frame, const WebContextMenuData& data) {
   ContextMenuParams params = ContextMenuParams(data);
   if (!params.misspelled_word.empty() && RenderThread::current()) {
     int misspelled_offset, misspelled_length;
     bool spelled_right = RenderThread::current()->spellchecker()->
         SpellCheckWord(
             params.misspelled_word.c_str(), params.misspelled_word.size(),
-            document_tag_,
+            spellcheck_provider_->document_tag(),
             &misspelled_offset, &misspelled_length,
             &params.dictionary_suggestions);
     if (spelled_right)
       params.misspelled_word.clear();
   }
   // Serializing a GURL longer than content::kMaxURLChars will fail, so don't do
   // it.  We replace it with an empty GURL so the appropriate items are disabled
   // in the context menu.
   // TODO(jcivelli): http://crbug.com/45160 This prevents us from saving large
   //                 data encoded images.  We should have a way to save them.
@@ skipping 2706 matching lines @@
         (*plugin_it)->SetWindowFocus(true);
 #endif
       (*plugin_it)->SetContentAreaFocus(enable);
     }
 
     // Notify all Pepper plugins.
     pepper_delegate_.OnSetFocus(enable);
   }
 }
 
-void RenderView::EnsureDocumentTag() {
-  // 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
-}
-
 #if defined(OS_MACOSX)
 void RenderView::PluginFocusChanged(bool focused, int plugin_id) {
   IPC::Message* msg = new ViewHostMsg_PluginFocusChanged(routing_id(),
                                                          focused, plugin_id);
   Send(msg);
 }
 
 void RenderView::StartPluginIme() {
   IPC::Message* msg = new ViewHostMsg_StartPluginIme(routing_id());
   // This message can be sent during event-handling, and needs to be delivered
@@ skipping 256 matching lines @@
     const webkit_glue::CustomContextMenuContext& custom_context) {
   if (custom_context.is_pepper_menu)
     pepper_delegate_.OnContextMenuClosed(custom_context);
   else
     context_menu_node_.reset();
 }
 
 void RenderView::OnNetworkStateChanged(bool online) {
   WebNetworkStateNotifier::setOnLine(online);
 }