 Chromium Code Reviews
 Chromium Code Reviews Issue 1779673003:
  Added network components for blimp text input feature  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/src.git@master
    
  
    Issue 1779673003:
  Added network components for blimp text input feature  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/src.git@master| Index: blimp/engine/feature/engine_render_widget_feature.cc | 
| diff --git a/blimp/engine/feature/engine_render_widget_feature.cc b/blimp/engine/feature/engine_render_widget_feature.cc | 
| index 5fdec4868147d15f8fe7cab647f4f45e9a7f5a0f..54e9ea0bb9ac2630698978792c03fd33bdcac1c6 100644 | 
| --- a/blimp/engine/feature/engine_render_widget_feature.cc | 
| +++ b/blimp/engine/feature/engine_render_widget_feature.cc | 
| @@ -5,12 +5,15 @@ | 
| #include "blimp/engine/feature/engine_render_widget_feature.h" | 
| #include "base/numerics/safe_conversions.h" | 
| +#include "base/strings/utf_string_conversions.h" | 
| #include "blimp/common/create_blimp_message.h" | 
| +#include "blimp/common/proto/blimp_conversions.h" | 
| #include "blimp/common/proto/blimp_message.pb.h" | 
| #include "blimp/common/proto/compositor.pb.h" | 
| #include "blimp/common/proto/input.pb.h" | 
| #include "blimp/common/proto/render_widget.pb.h" | 
| #include "content/public/browser/render_widget_host.h" | 
| +#include "content/public/browser/render_widget_host_view.h" | 
| #include "net/base/net_errors.h" | 
| #include "third_party/WebKit/public/web/WebInputEvent.h" | 
| @@ -32,6 +35,12 @@ void EngineRenderWidgetFeature::set_input_message_sender( | 
| input_message_sender_ = std::move(message_processor); | 
| } | 
| +void EngineRenderWidgetFeature::set_ime_message_sender( | 
| + scoped_ptr<BlimpMessageProcessor> message_processor) { | 
| + DCHECK(message_processor); | 
| + ime_message_sender_ = std::move(message_processor); | 
| +} | 
| + | 
| void EngineRenderWidgetFeature::set_compositor_message_sender( | 
| scoped_ptr<BlimpMessageProcessor> message_processor) { | 
| DCHECK(message_processor); | 
| @@ -113,6 +122,48 @@ void EngineRenderWidgetFeature::SendCompositorMessage( | 
| net::CompletionCallback()); | 
| } | 
| +void EngineRenderWidgetFeature::SendShowImeRequest( | 
| 
haibinlu
2016/03/17 18:59:46
add cases to unit tests
 
shaktisahu
2016/03/18 19:08:06
Done.
 | 
| + const int tab_id, | 
| + content::RenderWidgetHost* render_widget_host, | 
| + const ui::TextInputClient* client) { | 
| 
Khushal
2016/03/17 10:02:45
DCHECK the host and client, since you're going to
 | 
| + ImeMessage* ime_message; | 
| + scoped_ptr<BlimpMessage> blimp_message = | 
| + CreateBlimpMessage(&ime_message, tab_id); | 
| + | 
| + int render_widget_id = GetRenderWidgetId(tab_id, render_widget_host); | 
| + DCHECK_GT(render_widget_id, 0); | 
| + ime_message->set_render_widget_id(render_widget_id); | 
| + ime_message->set_type(ImeMessage::SHOW_IME); | 
| + ime_message->set_text_input_type( | 
| + TextInputTypeToProto(client->GetTextInputType())); | 
| + | 
| + gfx::Range text_range; | 
| + base::string16 existing_text; | 
| + client->GetTextRange(&text_range); | 
| + client->GetTextFromRange(text_range, &existing_text); | 
| + ime_message->set_ime_text(base::UTF16ToUTF8(existing_text)); | 
| + | 
| + ime_message_sender_->ProcessMessage(std::move(blimp_message), | 
| + net::CompletionCallback()); | 
| +} | 
| + | 
| +void EngineRenderWidgetFeature::SendHideImeRequest( | 
| + const int tab_id, | 
| + content::RenderWidgetHost* render_widget_host, | 
| + const ui::TextInputClient* client) { | 
| + ImeMessage* ime_message; | 
| + scoped_ptr<BlimpMessage> blimp_message = | 
| + CreateBlimpMessage(&ime_message, tab_id); | 
| + | 
| + int render_widget_id = GetRenderWidgetId(tab_id, render_widget_host); | 
| + DCHECK_GT(render_widget_id, 0); | 
| + ime_message->set_render_widget_id(render_widget_id); | 
| + ime_message->set_type(ImeMessage::HIDE_IME); | 
| + | 
| + ime_message_sender_->ProcessMessage(std::move(blimp_message), | 
| + net::CompletionCallback()); | 
| +} | 
| + | 
| void EngineRenderWidgetFeature::SetDelegate( | 
| const int tab_id, | 
| RenderWidgetMessageDelegate* delegate) { | 
| @@ -131,6 +182,7 @@ void EngineRenderWidgetFeature::ProcessMessage( | 
| const net::CompletionCallback& callback) { | 
| DCHECK(!callback.is_null()); | 
| DCHECK(message->type() == BlimpMessage::RENDER_WIDGET || | 
| + message->type() == BlimpMessage::IME || | 
| message->type() == BlimpMessage::INPUT || | 
| message->type() == BlimpMessage::COMPOSITOR); | 
| @@ -163,6 +215,15 @@ void EngineRenderWidgetFeature::ProcessMessage( | 
| delegate->OnCompositorMessageReceived(render_widget_host, payload); | 
| } | 
| break; | 
| + case BlimpMessage::IME: | 
| + DCHECK(message->ime().type() == ImeMessage::SHOW_TEXT); | 
| + render_widget_host = | 
| + GetRenderWidgetHost(target_tab_id, message->ime().render_widget_id()); | 
| + if (render_widget_host) { | 
| + InsertTextFromIME(render_widget_host->GetView()->GetTextInputClient(), | 
| 
Khushal
2016/03/17 10:02:45
View can be null. Check that as well and drop the
 
shaktisahu
2016/03/18 19:08:06
Done.
 | 
| + message->ime().ime_text()); | 
| + } | 
| + break; | 
| default: | 
| NOTREACHED(); | 
| } | 
| @@ -170,6 +231,19 @@ void EngineRenderWidgetFeature::ProcessMessage( | 
| callback.Run(net::OK); | 
| } | 
| +void EngineRenderWidgetFeature::InsertTextFromIME(ui::TextInputClient* client, | 
| + std::string text) { | 
| + if (client && client->GetTextInputType() != ui::TEXT_INPUT_TYPE_NONE) { | 
| + // Clear out any existing text first and | 
| 
David Trainor- moved to gerrit
2016/03/17 21:53:29
newline is too early
 | 
| + // then insert new text entered through IME. | 
| + gfx::Range text_range; | 
| + client->GetTextRange(&text_range); | 
| + client->ExtendSelectionAndDelete(text_range.length(), text_range.length()); | 
| + | 
| + client->InsertText(base::UTF8ToUTF16(text)); | 
| + } | 
| +} | 
| + | 
| EngineRenderWidgetFeature::RenderWidgetMessageDelegate* | 
| EngineRenderWidgetFeature::FindDelegate(const int tab_id) { | 
| DelegateMap::const_iterator it = delegates_.find(tab_id); |