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

chrome/renderer/spellchecker/spellcheck_provider.h

 // 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.
 
 #ifndef CHROME_RENDERER_SPELLCHECKER_SPELLCHECK_PROVIDER_H_
 #define CHROME_RENDERER_SPELLCHECKER_SPELLCHECK_PROVIDER_H_
 #pragma once
 
 #include <vector>
 
 #include "base/id_map.h"
 #include "content/renderer/render_view_observer.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSpellCheckClient.h"
 
 class RenderView;
 class SpellCheck;
 
 namespace WebKit {
 class WebString;
 class WebTextCheckingCompletion;
 struct WebTextCheckingResult;
 }
 
 // This class deals with invoking browser-side spellcheck mechanism
 // which is done asynchronously.
-class SpellCheckProvider : public RenderViewObserver {
+class SpellCheckProvider : public RenderViewObserver,
+                           public WebKit::WebSpellCheckClient {
  public:
   typedef IDMap<WebKit::WebTextCheckingCompletion> WebTextCheckCompletions;
 
   SpellCheckProvider(RenderView* render_view, SpellCheck* spellcheck);
   virtual ~SpellCheckProvider();
 
   // Requests async spell and grammar checker to the platform text
   // checker, which is available on the browser process.
   void RequestTextChecking(
       const WebKit::WebString& text,
       int document_tag,
       WebKit::WebTextCheckingCompletion* completion);
 
   // Check the availability of the platform spellchecker.
   // Makes this virtual for overriding on the unittest.
   virtual bool is_using_platform_spelling_engine() const;
 
   // The number of ongoing IPC requests.
   size_t pending_text_request_size() const {
     return text_check_completions_.size();
   }
 
+  int document_tag() const { return document_tag_; }
+
   // RenderViewObserver implementation.
   virtual bool OnMessageReceived(const IPC::Message& message);
 
  private:
-  // A message handler that receives async results for RequestTextChecking().
+  // WebKit::WebSpellCheckClient implementation.
+  virtual void spellCheck(const WebKit::WebString& text,
+                          int& offset,
+                          int& length);
+  virtual void requestCheckingOfText(
+      const WebKit::WebString& text,
+      WebKit::WebTextCheckingCompletion* completion);
+  virtual WebKit::WebString autoCorrectWord(
+      const WebKit::WebString& misspelled_word);
+  virtual void showSpellingUI(bool show);
+  virtual bool isShowingSpellingUI();
+  virtual void updateSpellingUIWithMisspelledWord(
+      const WebKit::WebString& word);
+
+  void OnAdvanceToNextMisspelling();
   void OnRespondTextCheck(
       int identifier,
       int tag,
       const std::vector<WebKit::WebTextCheckingResult>& results);
+  void OnToggleSpellCheck();
+  void OnToggleSpellPanel(bool is_currently_visible);
+
+  // Initializes the document_tag_ member if necessary.
+  void EnsureDocumentTag();
 
   // Holds ongoing spellchecking operations, assigns IDs for the IPC routing.
   WebTextCheckCompletions text_check_completions_;
+
+#if defined(OS_MACOSX)

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

I don't think this ifdef is necessary.
How about to just left it as false?

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

I was just copying over the existing logic from RenderView.  Was it done like
that for any reason?  It does seem less confusing to have it only there for mac,
so that people looking at this who don't know anything about document tags
realize that it's only for mac.

+  // True if the current RenderView has been assigned a document tag.
+  bool has_document_tag_;
+#endif
+
+  int document_tag_;
+
+  // True if the browser is showing the spelling panel for us.
+  bool spelling_panel_visible_;
+
   // Spellcheck implementation for use. Weak reference.
   SpellCheck* spellcheck_;
 
   DISALLOW_COPY_AND_ASSIGN(SpellCheckProvider);
 };
 
 #endif  // CHROME_RENDERER_SPELLCHECKER_SPELLCHECK_PROVIDER_H_