Move IME related functions from WebFrame to WebLocalFrame

components/test_runner/text_input_controller.cc

 // Copyright 2014 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 "components/test_runner/text_input_controller.h"
 
 #include "base/macros.h"
 #include "components/test_runner/web_test_proxy.h"
 #include "gin/arguments.h"
 #include "gin/handle.h"
@@ skipping 148 matching lines @@
 
 void TextInputController::InsertText(const std::string& text) {
   view()->confirmComposition(blink::WebString::fromUTF8(text));
 }
 
 void TextInputController::UnmarkText() {
   view()->confirmComposition();
 }
 
 void TextInputController::DoCommand(const std::string& text) {
-  if (view()->mainFrame())
-    view()->mainFrame()->executeCommand(blink::WebString::fromUTF8(text));
+  if (view()->mainFrame()) {
+    if (!view()->mainFrame()->toWebLocalFrame()) {
+      CHECK(false) << "This function cannot be called if the main frame is not"
+                      "a local frame.";
+    }
+    view()->mainFrame()->toWebLocalFrame()->executeCommand(
+        blink::WebString::fromUTF8(text));
+  }
 }
 
 void TextInputController::SetMarkedText(const std::string& text,
                                         int start,
                                         int length) {
   blink::WebString web_text(blink::WebString::fromUTF8(text));
 
   // Split underline into up to 3 elements (before, selection, and after).
   std::vector<blink::WebCompositionUnderline> underlines;
   blink::WebCompositionUnderline underline;
   if (!start) {
     underline.endOffset = length;
   } else {
     underline.endOffset = start;
     underlines.push_back(underline);
     underline.startOffset = start;
     underline.endOffset = start + length;
   }
   underline.thick = true;
   underlines.push_back(underline);
   if (start + length < static_cast<int>(web_text.length())) {
     underline.startOffset = underline.endOffset;
     underline.endOffset = web_text.length();
     underline.thick = false;
     underlines.push_back(underline);
   }
 
   view()->setComposition(web_text, underlines, start, start + length);
 }
 

[yabinh, 2016/07/08 02:42:53]

I think we don't need to CHECK here, because if it's a remote frame, it doesn't
have marked text. So it makes sense to return false.

[dcheng, 2016/07/08 03:31:09]

Right, but fundamentally, we shouldn't be calling this in on a remote frame at
all.

[yabinh, 2016/07/08 04:22:54]

OK. It's been added to the latest patch. Please take another look.

 bool TextInputController::HasMarkedText() {
-  return view()->mainFrame() && view()->mainFrame()->hasMarkedText();
+  return view()->mainFrame() && view()->mainFrame()->isWebLocalFrame() &&
+         view()->mainFrame()->toWebLocalFrame()->hasMarkedText();
 }
 
 std::vector<int> TextInputController::MarkedRange() {
   if (!view()->mainFrame())
     return std::vector<int>();
 
-  blink::WebRange range = view()->mainFrame()->markedRange();
+  if (!view()->mainFrame()->toWebLocalFrame()) {
+    CHECK(false) << "This function cannot be called if the main frame is not"
+                    "a local frame.";
+  }
+
+  blink::WebRange range = view()->mainFrame()->toWebLocalFrame()->markedRange();
   std::vector<int> int_array(2);
   int_array[0] = range.startOffset();
   int_array[1] = range.endOffset();
 
   return int_array;
 }
 
 std::vector<int> TextInputController::SelectedRange() {
   if (!view()->mainFrame())
     return std::vector<int>();
 
-  blink::WebRange range = view()->mainFrame()->selectionRange();
+  if (!view()->mainFrame()->toWebLocalFrame()) {
+    CHECK(false) << "This function cannot be called if the main frame is not"
+                    "a local frame.";
+  }
+
+  blink::WebRange range =
+      view()->mainFrame()->toWebLocalFrame()->selectionRange();
   if (range.isNull())
     return std::vector<int>();
   std::vector<int> int_array(2);
   int_array[0] = range.startOffset();
   int_array[1] = range.endOffset();
 
   return int_array;
 }
 
 std::vector<int> TextInputController::FirstRectForCharacterRange(
@@ skipping 32 matching lines @@
       blink::WebString::fromUTF8(text),
       blink::WebVector<blink::WebCompositionUnderline>(underlines),
       text.length(), text.length());
 }
 
 blink::WebView* TextInputController::view() {
   return web_test_proxy_base_->web_view();
 }
 
 }  // namespace test_runner