| 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_view_android.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_android.h" |
| 6 | 6 |
| 7 #include <android/bitmap.h> | 7 #include <android/bitmap.h> |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 765 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 776 ? *GetTextInputManager()->GetTextInputState() | 776 ? *GetTextInputManager()->GetTextInputState() |
| 777 : TextInputState(); | 777 : TextInputState(); |
| 778 | 778 |
| 779 if (!content_view_core_) | 779 if (!content_view_core_) |
| 780 return; | 780 return; |
| 781 | 781 |
| 782 content_view_core_->UpdateImeAdapter( | 782 content_view_core_->UpdateImeAdapter( |
| 783 GetNativeImeAdapter(), static_cast<int>(state.type), state.flags, | 783 GetNativeImeAdapter(), static_cast<int>(state.type), state.flags, |
| 784 state.mode, state.value, state.selection_start, state.selection_end, | 784 state.mode, state.value, state.selection_start, state.selection_end, |
| 785 state.composition_start, state.composition_end, state.show_ime_if_needed, | 785 state.composition_start, state.composition_end, state.show_ime_if_needed, |
| 786 state.is_non_ime_change); | 786 state.reply_to_request); |
| 787 } | 787 } |
| 788 | 788 |
| 789 void RenderWidgetHostViewAndroid::OnImeCompositionRangeChanged( | 789 void RenderWidgetHostViewAndroid::OnImeCompositionRangeChanged( |
| 790 TextInputManager* text_input_manager, | 790 TextInputManager* text_input_manager, |
| 791 RenderWidgetHostViewBase* updated_view) { | 791 RenderWidgetHostViewBase* updated_view) { |
| 792 DCHECK_EQ(text_input_manager_, text_input_manager); | 792 DCHECK_EQ(text_input_manager_, text_input_manager); |
| 793 const TextInputManager::CompositionRangeInfo* info = | 793 const TextInputManager::CompositionRangeInfo* info = |
| 794 text_input_manager_->GetCompositionRangeInfo(); | 794 text_input_manager_->GetCompositionRangeInfo(); |
| 795 if (!info) | 795 if (!info) |
| 796 return; | 796 return; |
| (...skipping 1286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2083 if (!compositor) | 2083 if (!compositor) |
| 2084 return; | 2084 return; |
| 2085 | 2085 |
| 2086 overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>( | 2086 overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>( |
| 2087 overscroll_refresh_handler, compositor, | 2087 overscroll_refresh_handler, compositor, |
| 2088 ui::GetScaleFactorForNativeView(GetNativeView())); | 2088 ui::GetScaleFactorForNativeView(GetNativeView())); |
| 2089 is_showing_overscroll_glow_ = true; | 2089 is_showing_overscroll_glow_ = true; |
| 2090 } | 2090 } |
| 2091 | 2091 |
| 2092 } // namespace content | 2092 } // namespace content |
| OLD | NEW |