Move ownership of TextCheckerClientImpl to WebLocalFrameImpl

third_party/WebKit/Source/core/loader/EmptyClients.h

Index: third_party/WebKit/Source/core/loader/EmptyClients.h
diff --git a/third_party/WebKit/Source/core/loader/EmptyClients.h b/third_party/WebKit/Source/core/loader/EmptyClients.h
index 81fa4ed2bf6923acd2888aef65da3f9efcc70e66..57e2c714594d3b20b5e027f1c1cc7fdd6ba4a8c0 100644
--- a/third_party/WebKit/Source/core/loader/EmptyClients.h
+++ b/third_party/WebKit/Source/core/loader/EmptyClients.h
@@ -369,15 +369,18 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
   std::unique_ptr<WebApplicationCacheHost> createApplicationCacheHost(
       WebApplicationCacheHostClient*) override;
 
+  TextCheckerClient* textCheckerClient() const override { return nullptr; }

[haraken, 2017/04/04 05:19:22]

Would it be possible to return an EmptyTextCheckerClient here instead of
creating it in SpellChecker.cpp?

+
  protected:
   EmptyLocalFrameClient() {}
 };
 
 class CORE_EXPORT EmptyTextCheckerClient : public TextCheckerClient {
-  DISALLOW_NEW();
+  WTF_MAKE_NONCOPYABLE(EmptyTextCheckerClient);
+  USING_FAST_MALLOC(EmptyTextCheckerClient);
 
  public:
-  ~EmptyTextCheckerClient() {}
+  EmptyTextCheckerClient() {}
 
   void checkSpellingOfString(const String&, int*, int*) override {}
   void requestCheckingOfString(TextCheckingRequest*) override;
@@ -394,15 +397,9 @@ class EmptySpellCheckerClient : public SpellCheckerClient {
 
   bool isSpellCheckingEnabled() override { return false; }
   void toggleSpellCheckingEnabled() override {}
-
-  TextCheckerClient& textChecker() override { return m_textCheckerClient; }
-
   void updateSpellingUIWithMisspelledWord(const String&) override {}
   void showSpellingUI(bool) override {}
   bool spellingUIIsShowing() override { return false; }
-
- private:
-  EmptyTextCheckerClient m_textCheckerClient;
 };
 
 class EmptyEditorClient final : public EditorClient {