Move IME related functions from WebFrame to WebLocalFrame

chrome/renderer/spellchecker/spellcheck_provider.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/spellchecker/spellcheck_provider.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/spellcheck_marker.h"
 #include "chrome/common/spellcheck_messages.h"
 #include "chrome/common/spellcheck_result.h"
 #include "chrome/renderer/spellchecker/spellcheck.h"
 #include "chrome/renderer/spellchecker/spellcheck_language.h"
 #include "content/public/renderer/render_view.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebElement.h"
-#include "third_party/WebKit/public/web/WebFrame.h"
+#include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebTextCheckingCompletion.h"
 #include "third_party/WebKit/public/web/WebTextCheckingResult.h"
 #include "third_party/WebKit/public/web/WebTextDecorationType.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
 using blink::WebElement;
-using blink::WebFrame;
+using blink::WebLocalFrame;
 using blink::WebString;
 using blink::WebTextCheckingCompletion;
 using blink::WebTextCheckingResult;
 using blink::WebTextDecorationType;
 using blink::WebVector;
 
 static_assert(int(blink::WebTextDecorationTypeSpelling) ==
               int(SpellCheckResult::SPELLING), "mismatching enums");
 static_assert(int(blink::WebTextDecorationTypeGrammar) ==
               int(SpellCheckResult::GRAMMAR), "mismatching enums");
@@ skipping 68 matching lines @@
     IPC_MESSAGE_HANDLER(SpellCheckMsg_RespondTextCheck, OnRespondTextCheck)
     IPC_MESSAGE_HANDLER(SpellCheckMsg_ToggleSpellPanel, OnToggleSpellPanel)
 #endif
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void SpellCheckProvider::FocusedNodeChanged(const blink::WebNode& unused) {
 #if defined(USE_BROWSER_SPELLCHECKER)
-  WebFrame* frame = render_view()->GetWebView()->focusedFrame();
+  WebLocalFrame* frame = render_view()->GetWebView()->focusedFrame();
   WebElement element = frame->document().isNull() ? WebElement() :
       frame->document().focusedElement();
   bool enabled = !element.isNull() && element.isEditable();
   bool checked = enabled && frame->isContinuousSpellCheckingEnabled();
 
   Send(new SpellCheckHostMsg_ToggleSpellCheck(routing_id(), enabled, checked));
 #endif  // USE_BROWSER_SPELLCHECKER
 }
 
 void SpellCheckProvider::spellCheck(
@@ skipping 157 matching lines @@
   spelling_panel_visible_ = is_currently_visible;
   render_view()->GetWebView()->focusedFrame()->executeCommand(
       WebString::fromUTF8("ToggleSpellPanel"));
 }
 #endif
 
 void SpellCheckProvider::EnableSpellcheck(bool enable) {
   if (!render_view()->GetWebView())
     return;
 
-  WebFrame* frame = render_view()->GetWebView()->focusedFrame();
+  WebLocalFrame* frame = render_view()->GetWebView()->focusedFrame();
+  if (!frame)

[dcheng, 2016/06/13 17:29:45]

This seems like the code is doing the wrong thing: ideally, we should just not
call this in a webview that's not actually focused, i.e. the browser process
should be coordinating things. How is spelling check enabled today?

[yabinh, 2016/06/16 07:12:57]

Most of the null checks is unnecessary, except for this one.

I found that spellcheck is always enabled, except on
iOS.(https://cs.corp.google.com/clankium/src/build/common.gypi?q=ENABLE_SPELLCHECK&sq=package:clankium&l=861&dr=C)

It might be the reason.

+    return;
+
   frame->enableContinuousSpellChecking(enable);
   if (!enable)
     frame->removeSpellingMarkers();
 }
 
 bool SpellCheckProvider::SatisfyRequestFromCache(
     const base::string16& text,
     WebTextCheckingCompletion* completion) {
   size_t last_length = last_request_.length();
 
@@ skipping 42 matching lines @@
       return true;
     }
   }
 
   return false;
 }
 
 void SpellCheckProvider::OnDestruct() {
   delete this;
 }