Move WebTextCheckClient reference from WebViewImpl to WebLocalFrameImpl

chrome/renderer/chrome_content_renderer_client.cc

 // 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.
 
 #include "chrome/renderer/chrome_content_renderer_client.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 547 matching lines @@
   // ChromeRenderViewTests.
   if (subresource_filter_ruleset_dealer_) {
     new subresource_filter::SubresourceFilterAgent(
         render_frame, subresource_filter_ruleset_dealer_.get());
   }
 
   if (command_line->HasSwitch(switches::kInstantProcess) &&
       render_frame->IsMainFrame()) {
     new SearchBox(render_frame);
   }
+
+#if BUILDFLAG(ENABLE_SPELLCHECK)
+  // TODO(xiaochengh): Use a different SpellCheckProvider for each RenderFrame.
+  if (SpellCheckProvider* provider =
+          SpellCheckProvider::Get(render_frame->GetRenderView())) {
+    render_frame->GetWebFrame()->setTextCheckClient(provider);
+  }
+#endif
 }
 
 void ChromeContentRendererClient::RenderViewCreated(
     content::RenderView* render_view) {
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   ChromeExtensionsRendererClient::GetInstance()->RenderViewCreated(render_view);
 #endif
 #if BUILDFLAG(ENABLE_SPELLCHECK)
-  new SpellCheckProvider(render_view, spellcheck_.get());
+  SpellCheckProvider* provider =
+      new SpellCheckProvider(render_view, spellcheck_.get());
+  // For a main frame of a view, RenderFrameCreated is called earlier than
+  // RenderViewCreated. This workaround ensures that WebTextCheckClient is
+  // still set for any main frame.
+  // TODO(xiaocheng): Remove this workaround once SpellCheckProvider becomes

[Lei Zhang, 2017/04/05 23:49:19]

Your two newly added TODOs have different user names inside.

[Xiaocheng, 2017/04/06 02:58:30]

Whoops. Thanks for catching.

+  // a RenderFrameObserver.
+  if (content::RenderFrame* main_frame = render_view->GetMainRenderFrame())
+    main_frame->GetWebFrame()->setTextCheckClient(provider);
+
   new SpellCheckPanel(render_view);
 #endif
   new prerender::PrerendererClient(render_view);
 
   new ChromeRenderViewObserver(render_view, web_cache_impl_.get());
 
   new password_manager::CredentialManagerClient(render_view);
 }
 
 
@@ skipping 932 matching lines @@
 
   RecordYouTubeRewriteUMA(result);
   return corrected_url.ReplaceComponents(r);
 }
 
 std::unique_ptr<base::TaskScheduler::InitParams>
 ChromeContentRendererClient::GetTaskSchedulerInitParams() {
   return task_scheduler_util::
       GetRendererTaskSchedulerInitParamsFromCommandLine();
 }