Split WebTextCheckClient off WebSpellCheckClient

components/spellcheck/renderer/spellcheck_provider.h

 // 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.
 
 #ifndef COMPONENTS_SPELLCHECK_RENDERER_SPELLCHECK_PROVIDER_H_
 #define COMPONENTS_SPELLCHECK_RENDERER_SPELLCHECK_PROVIDER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <vector>
 
 #include "base/id_map.h"
 #include "base/macros.h"
 #include "components/spellcheck/spellcheck_build_features.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "content/public/renderer/render_view_observer_tracker.h"
 #include "third_party/WebKit/public/web/WebSpellCheckClient.h"
+#include "third_party/WebKit/public/web/WebTextCheckClient.h"
 
 class RenderView;
 class SpellCheck;
 struct SpellCheckResult;
 
 namespace blink {
-class WebString;
 class WebTextCheckingCompletion;
 struct WebTextCheckingResult;
 }
 
 // This class deals with invoking browser-side spellcheck mechanism
 // which is done asynchronously.
+// TODO(xiaochengh): Split this class to implement WebSpellCheckClient and
+// WebTextCheckClient separately.
 class SpellCheckProvider
     : public content::RenderViewObserver,
       public content::RenderViewObserverTracker<SpellCheckProvider>,
-      public blink::WebSpellCheckClient {
+      public blink::WebSpellCheckClient,
+      public blink::WebTextCheckClient {
  public:
   using WebTextCheckCompletions = IDMap<blink::WebTextCheckingCompletion*>;
 
   SpellCheckProvider(content::RenderView* render_view,
                      SpellCheck* spellcheck);
   ~SpellCheckProvider() override;
 
   // Requests async spell and grammar checker to the platform text
   // checker, which is available on the browser process. The function does not
   // have special handling for partial words, as Blink guarantees that no
@@ skipping 21 matching lines @@
 
   // Tries to satisfy a spell check request from the cache in |last_request_|.
   // Returns true (and cancels/finishes the completion) if it can, false
   // if the provider should forward the query on.
   bool SatisfyRequestFromCache(const base::string16& text,
                                blink::WebTextCheckingCompletion* completion);
 
   // RenderViewObserver implementation.
   void OnDestruct() override;
 
-  // blink::WebSpellCheckClient implementation.
+  // blink::WebTextCheckClient implementation.
   void checkSpelling(
       const blink::WebString& text,
       int& offset,
       int& length,
       blink::WebVector<blink::WebString>* optional_suggestions) override;
-
   void requestCheckingOfText(
       const blink::WebString& text,
       blink::WebTextCheckingCompletion* completion) override;
+  void cancelAllPendingRequests() override;
 
-  void cancelAllPendingRequests() override;
+  // blink::WebSpellCheckClient implementation.
   void showSpellingUI(bool show) override;
   bool isShowingSpellingUI() override;
   void updateSpellingUIWithMisspelledWord(
       const blink::WebString& word) override;
 
 #if !BUILDFLAG(USE_BROWSER_SPELLCHECKER)
   void OnRespondSpellingService(
       int identifier,
       bool succeeded,
       const base::string16& text,
@@ skipping 24 matching lines @@
   // True if the browser is showing the spelling panel for us.
   bool spelling_panel_visible_;
 
   // Weak pointer to shared (per RenderView) spellcheck data.
   SpellCheck* spellcheck_;
 
   DISALLOW_COPY_AND_ASSIGN(SpellCheckProvider);
 };
 
 #endif  // COMPONENTS_SPELLCHECK_RENDERER_SPELLCHECK_PROVIDER_H_