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 1710 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1721 return; | 1721 return; |
1722 } | 1722 } |
1723 view_->UpdateCursor(cursor); | 1723 view_->UpdateCursor(cursor); |
1724 } | 1724 } |
1725 | 1725 |
1726 void RenderWidgetHostImpl::OnTextInputTypeChanged( | 1726 void RenderWidgetHostImpl::OnTextInputTypeChanged( |
1727 ui::TextInputType type, | 1727 ui::TextInputType type, |
1728 bool can_compose_inline, | 1728 bool can_compose_inline, |
1729 ui::TextInputMode input_mode) { | 1729 ui::TextInputMode input_mode) { |
1730 if (view_) | 1730 if (view_) |
1731 view_->TextInputTypeChanged(type, can_compose_inline, input_mode); | 1731 view_->TextInputTypeChanged(type, input_mode, can_compose_inline); |
1732 } | 1732 } |
1733 | 1733 |
1734 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(USE_AURA) | 1734 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(USE_AURA) |
1735 void RenderWidgetHostImpl::OnImeCompositionRangeChanged( | 1735 void RenderWidgetHostImpl::OnImeCompositionRangeChanged( |
1736 const ui::Range& range, | 1736 const ui::Range& range, |
1737 const std::vector<gfx::Rect>& character_bounds) { | 1737 const std::vector<gfx::Rect>& character_bounds) { |
1738 if (view_) | 1738 if (view_) |
1739 view_->ImeCompositionRangeChanged(range, character_bounds); | 1739 view_->ImeCompositionRangeChanged(range, character_bounds); |
1740 } | 1740 } |
1741 #endif | 1741 #endif |
(...skipping 768 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2510 int process_id = (b->first.second >> 32) & 0xffffffff; | 2510 int process_id = (b->first.second >> 32) & 0xffffffff; |
2511 RenderWidgetHost* rwh = | 2511 RenderWidgetHost* rwh = |
2512 RenderWidgetHost::FromID(process_id, routing_id); | 2512 RenderWidgetHost::FromID(process_id, routing_id); |
2513 if (!rwh) | 2513 if (!rwh) |
2514 continue; | 2514 continue; |
2515 RenderWidgetHostImpl::From(rwh)->FrameSwapped(latency_info); | 2515 RenderWidgetHostImpl::From(rwh)->FrameSwapped(latency_info); |
2516 } | 2516 } |
2517 } | 2517 } |
2518 | 2518 |
2519 } // namespace content | 2519 } // namespace content |
OLD | NEW |