Extracting placeholder information from Webkit to Blimp

blimp/engine/session/blimp_engine_session.cc

 // Copyright 2015 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 "blimp/engine/session/blimp_engine_session.h"
 
 #include <string>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 384 matching lines @@
 //  - the TextInputClient is changed (e.g. by a change of focus)
 //  - the TextInputType of the TextInputClient changes
 void BlimpEngineSession::OnTextInputStateChanged(
     const ui::TextInputClient* client) {
   if (!tab_ || !tab_->web_contents()->GetRenderWidgetHostView())
     return;
 
   ui::TextInputType type =
       client ? client->GetTextInputType() : ui::TEXT_INPUT_TYPE_NONE;
 
-  // TODO(shaktisahu): Propagate the new type to the client.
   // Hide IME, when text input is out of focus, i.e. if the text input type
   // changes to ui::TEXT_INPUT_TYPE_NONE. For other text input types,
-  // OnShowImeIfNeeded is used instead to send show IME request to client.
+  // OnUpdateTextInputState is used instead to send show IME request to client.
   if (type == ui::TEXT_INPUT_TYPE_NONE)
     render_widget_feature_.SendHideImeRequest(
         tab_->tab_id(),
         tab_->web_contents()->GetRenderWidgetHostView()->GetRenderWidgetHost());
 }
 
 void BlimpEngineSession::OnInputMethodDestroyed(
     const ui::InputMethod* input_method) {}
 
-// Called when a user input should trigger showing the IME.
-void BlimpEngineSession::OnShowImeIfNeeded() {
-  TRACE_EVENT0("blimp", "BlimpEngineSession::OnShowImeIfNeeded");
-  if (!tab_ || !tab_->web_contents()->GetRenderWidgetHostView() ||
-      !window_tree_host_->GetInputMethod()->GetTextInputClient())
-    return;
+void BlimpEngineSession::OnShowImeIfNeeded() {}
 
-  render_widget_feature_.SendShowImeRequest(
-      tab_->tab_id(),
-      tab_->web_contents()->GetRenderWidgetHostView()->GetRenderWidgetHost(),
-      window_tree_host_->GetInputMethod()->GetTextInputClient());
+// Called when:
+//  - a text area is focused.
+//  - text entered by the user is submitted.
+void BlimpEngineSession::OnUpdateTextInputState(
+    content::RenderWidgetHost* render_widget_host,
+    ui::TextInputType type,
+    const std::string& text,
+    const std::string& placeholder,
+    bool show_ime_if_needed) {
+  if (show_ime_if_needed) {
+    render_widget_feature_.SendShowImeRequest(
+        tab_->tab_id(),
+        tab_->web_contents()->GetRenderWidgetHostView()->GetRenderWidgetHost(),

[Charlie Reis, 2016/10/05 21:19:33]

Sanity check: I'm not sure where this is running, but this pattern looks broken
for out-of-process iframes (and possibly GuestViews).  In those cases, the
WebContents can have more than one RenderWidgetHost.

Is that a problem here?

+        type, text, placeholder);
+  } else {
+    render_widget_feature_.SendHideImeRequest(
+        tab_->tab_id(),
+        tab_->web_contents()->GetRenderWidgetHostView()->GetRenderWidgetHost());
+  }
 }
 
 void BlimpEngineSession::ProcessMessage(
     std::unique_ptr<BlimpMessage> message,
     const net::CompletionCallback& callback) {
   TRACE_EVENT1("blimp", "BlimpEngineSession::ProcessMessage", "TabId",
                message->target_tab_id());
   DCHECK(!callback.is_null());
   DCHECK(BlimpMessage::kTabControl == message->feature_case() ||
          BlimpMessage::kNavigation == message->feature_case());
@@ skipping 127 matching lines @@
     parent->AddChild(content);
   content->Show();
 
   tab_ = base::MakeUnique<Tab>(std::move(new_contents), target_tab_id,
                                &render_widget_feature_,
                                navigation_message_sender_.get());
 }
 
 }  // namespace engine
 }  // namespace blimp