OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/bind_helpers.h" | 5 #include "base/bind_helpers.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
9 #include "cc/surfaces/surface.h" | 9 #include "cc/surfaces/surface.h" |
10 #include "cc/surfaces/surface_factory.h" | 10 #include "cc/surfaces/surface_factory.h" |
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
348 guest_->SendMessageToEmbedder( | 348 guest_->SendMessageToEmbedder( |
349 new BrowserPluginMsg_SetCursor(guest_->browser_plugin_instance_id(), | 349 new BrowserPluginMsg_SetCursor(guest_->browser_plugin_instance_id(), |
350 cursor)); | 350 cursor)); |
351 | 351 |
352 } | 352 } |
353 | 353 |
354 void RenderWidgetHostViewGuest::SetIsLoading(bool is_loading) { | 354 void RenderWidgetHostViewGuest::SetIsLoading(bool is_loading) { |
355 platform_view_->SetIsLoading(is_loading); | 355 platform_view_->SetIsLoading(is_loading); |
356 } | 356 } |
357 | 357 |
358 void RenderWidgetHostViewGuest::TextInputTypeChanged( | 358 void RenderWidgetHostViewGuest::TextInputStateChanged( |
359 ui::TextInputType type, | 359 const ViewHostMsg_TextInputState_Params& params) { |
360 ui::TextInputMode input_mode, | |
361 bool can_compose_inline, | |
362 int flags) { | |
363 if (!guest_) | 360 if (!guest_) |
364 return; | 361 return; |
365 | 362 |
366 RenderWidgetHostViewBase* rwhv = GetOwnerRenderWidgetHostView(); | 363 RenderWidgetHostViewBase* rwhv = GetOwnerRenderWidgetHostView(); |
367 if (!rwhv) | 364 if (!rwhv) |
368 return; | 365 return; |
369 // Forward the information to embedding RWHV. | 366 // Forward the information to embedding RWHV. |
370 rwhv->TextInputTypeChanged(type, input_mode, can_compose_inline, flags); | 367 rwhv->TextInputStateChanged(params); |
371 } | 368 } |
372 | 369 |
373 void RenderWidgetHostViewGuest::ImeCancelComposition() { | 370 void RenderWidgetHostViewGuest::ImeCancelComposition() { |
374 if (!guest_) | 371 if (!guest_) |
375 return; | 372 return; |
376 | 373 |
377 RenderWidgetHostViewBase* rwhv = GetOwnerRenderWidgetHostView(); | 374 RenderWidgetHostViewBase* rwhv = GetOwnerRenderWidgetHostView(); |
378 if (!rwhv) | 375 if (!rwhv) |
379 return; | 376 return; |
380 // Forward the information to embedding RWHV. | 377 // Forward the information to embedding RWHV. |
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
660 } | 657 } |
661 | 658 |
662 if (blink::WebInputEvent::isGestureEventType(event->type)) { | 659 if (blink::WebInputEvent::isGestureEventType(event->type)) { |
663 host_->ForwardGestureEvent( | 660 host_->ForwardGestureEvent( |
664 *static_cast<const blink::WebGestureEvent*>(event)); | 661 *static_cast<const blink::WebGestureEvent*>(event)); |
665 return; | 662 return; |
666 } | 663 } |
667 } | 664 } |
668 | 665 |
669 } // namespace content | 666 } // namespace content |
OLD | NEW |