| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/browser/renderer_host/render_widget_host_impl.h" | 5 #include "content/browser/renderer_host/render_widget_host_impl.h" |
| 6 | 6 |
| 7 #include <math.h> | 7 #include <math.h> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 1279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1290 const string16& text, | 1290 const string16& text, |
| 1291 const std::vector<WebKit::WebCompositionUnderline>& underlines, | 1291 const std::vector<WebKit::WebCompositionUnderline>& underlines, |
| 1292 int selection_start, | 1292 int selection_start, |
| 1293 int selection_end) { | 1293 int selection_end) { |
| 1294 Send(new ViewMsg_ImeSetComposition( | 1294 Send(new ViewMsg_ImeSetComposition( |
| 1295 GetRoutingID(), text, underlines, selection_start, selection_end)); | 1295 GetRoutingID(), text, underlines, selection_start, selection_end)); |
| 1296 } | 1296 } |
| 1297 | 1297 |
| 1298 void RenderWidgetHostImpl::ImeConfirmComposition( | 1298 void RenderWidgetHostImpl::ImeConfirmComposition( |
| 1299 const string16& text, | 1299 const string16& text, |
| 1300 const ui::Range& replacement_range, | 1300 const gfx::Range& replacement_range, |
| 1301 bool keep_selection) { | 1301 bool keep_selection) { |
| 1302 Send(new ViewMsg_ImeConfirmComposition( | 1302 Send(new ViewMsg_ImeConfirmComposition( |
| 1303 GetRoutingID(), text, replacement_range, keep_selection)); | 1303 GetRoutingID(), text, replacement_range, keep_selection)); |
| 1304 } | 1304 } |
| 1305 | 1305 |
| 1306 void RenderWidgetHostImpl::ImeCancelComposition() { | 1306 void RenderWidgetHostImpl::ImeCancelComposition() { |
| 1307 Send(new ViewMsg_ImeSetComposition(GetRoutingID(), string16(), | 1307 Send(new ViewMsg_ImeSetComposition(GetRoutingID(), string16(), |
| 1308 std::vector<WebKit::WebCompositionUnderline>(), 0, 0)); | 1308 std::vector<WebKit::WebCompositionUnderline>(), 0, 0)); |
| 1309 } | 1309 } |
| 1310 | 1310 |
| (...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1727 void RenderWidgetHostImpl::OnTextInputTypeChanged( | 1727 void RenderWidgetHostImpl::OnTextInputTypeChanged( |
| 1728 ui::TextInputType type, | 1728 ui::TextInputType type, |
| 1729 ui::TextInputMode input_mode, | 1729 ui::TextInputMode input_mode, |
| 1730 bool can_compose_inline) { | 1730 bool can_compose_inline) { |
| 1731 if (view_) | 1731 if (view_) |
| 1732 view_->TextInputTypeChanged(type, input_mode, can_compose_inline); | 1732 view_->TextInputTypeChanged(type, input_mode, can_compose_inline); |
| 1733 } | 1733 } |
| 1734 | 1734 |
| 1735 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(USE_AURA) | 1735 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(USE_AURA) |
| 1736 void RenderWidgetHostImpl::OnImeCompositionRangeChanged( | 1736 void RenderWidgetHostImpl::OnImeCompositionRangeChanged( |
| 1737 const ui::Range& range, | 1737 const gfx::Range& range, |
| 1738 const std::vector<gfx::Rect>& character_bounds) { | 1738 const std::vector<gfx::Rect>& character_bounds) { |
| 1739 if (view_) | 1739 if (view_) |
| 1740 view_->ImeCompositionRangeChanged(range, character_bounds); | 1740 view_->ImeCompositionRangeChanged(range, character_bounds); |
| 1741 } | 1741 } |
| 1742 #endif | 1742 #endif |
| 1743 | 1743 |
| 1744 void RenderWidgetHostImpl::OnImeCancelComposition() { | 1744 void RenderWidgetHostImpl::OnImeCancelComposition() { |
| 1745 if (view_) | 1745 if (view_) |
| 1746 view_->ImeCancelComposition(); | 1746 view_->ImeCancelComposition(); |
| 1747 } | 1747 } |
| (...skipping 763 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2511 int process_id = (b->first.second >> 32) & 0xffffffff; | 2511 int process_id = (b->first.second >> 32) & 0xffffffff; |
| 2512 RenderWidgetHost* rwh = | 2512 RenderWidgetHost* rwh = |
| 2513 RenderWidgetHost::FromID(process_id, routing_id); | 2513 RenderWidgetHost::FromID(process_id, routing_id); |
| 2514 if (!rwh) | 2514 if (!rwh) |
| 2515 continue; | 2515 continue; |
| 2516 RenderWidgetHostImpl::From(rwh)->FrameSwapped(latency_info); | 2516 RenderWidgetHostImpl::From(rwh)->FrameSwapped(latency_info); |
| 2517 } | 2517 } |
| 2518 } | 2518 } |
| 2519 | 2519 |
| 2520 } // namespace content | 2520 } // namespace content |
| OLD | NEW |