| 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 760 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 771 ? *GetTextInputManager()->GetTextInputState() | 771 ? *GetTextInputManager()->GetTextInputState() |
| 772 : TextInputState(); | 772 : TextInputState(); |
| 773 | 773 |
| 774 if (!content_view_core_) | 774 if (!content_view_core_) |
| 775 return; | 775 return; |
| 776 | 776 |
| 777 content_view_core_->UpdateImeAdapter( | 777 content_view_core_->UpdateImeAdapter( |
| 778 GetNativeImeAdapter(), static_cast<int>(state.type), state.flags, | 778 GetNativeImeAdapter(), static_cast<int>(state.type), state.flags, |
| 779 state.mode, state.value, state.selection_start, state.selection_end, | 779 state.mode, state.value, state.selection_start, state.selection_end, |
| 780 state.composition_start, state.composition_end, state.show_ime_if_needed, | 780 state.composition_start, state.composition_end, state.show_ime_if_needed, |
| 781 state.is_non_ime_change); | 781 state.reply_to_request); |
| 782 } | 782 } |
| 783 | 783 |
| 784 void RenderWidgetHostViewAndroid::UpdateBackgroundColor(SkColor color) { | 784 void RenderWidgetHostViewAndroid::UpdateBackgroundColor(SkColor color) { |
| 785 if (cached_background_color_ == color) | 785 if (cached_background_color_ == color) |
| 786 return; | 786 return; |
| 787 | 787 |
| 788 cached_background_color_ = color; | 788 cached_background_color_ = color; |
| 789 | 789 |
| 790 if (delegated_frame_host_) | 790 if (delegated_frame_host_) |
| 791 delegated_frame_host_->UpdateBackgroundColor(color); | 791 delegated_frame_host_->UpdateBackgroundColor(color); |
| (...skipping 1280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2072 if (!compositor) | 2072 if (!compositor) |
| 2073 return; | 2073 return; |
| 2074 | 2074 |
| 2075 overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>( | 2075 overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>( |
| 2076 overscroll_refresh_handler, compositor, | 2076 overscroll_refresh_handler, compositor, |
| 2077 ui::GetScaleFactorForNativeView(GetNativeView())); | 2077 ui::GetScaleFactorForNativeView(GetNativeView())); |
| 2078 is_showing_overscroll_glow_ = true; | 2078 is_showing_overscroll_glow_ = true; |
| 2079 } | 2079 } |
| 2080 | 2080 |
| 2081 } // namespace content | 2081 } // namespace content |
| OLD | NEW |