| 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 758 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 769 } | 769 } |
| 770 | 770 |
| 771 if (!content_view_core_) | 771 if (!content_view_core_) |
| 772 return; | 772 return; |
| 773 | 773 |
| 774 content_view_core_->UpdateImeAdapter( | 774 content_view_core_->UpdateImeAdapter( |
| 775 GetNativeImeAdapter(), | 775 GetNativeImeAdapter(), |
| 776 static_cast<int>(params.type), params.flags, | 776 static_cast<int>(params.type), params.flags, |
| 777 params.value, params.selection_start, params.selection_end, | 777 params.value, params.selection_start, params.selection_end, |
| 778 params.composition_start, params.composition_end, | 778 params.composition_start, params.composition_end, |
| 779 params.show_ime_if_needed, params.is_non_ime_change, | 779 params.show_ime_if_needed, params.is_non_ime_change); |
| 780 params.batch_edit); | |
| 781 } | 780 } |
| 782 | 781 |
| 783 void RenderWidgetHostViewAndroid::UpdateBackgroundColor(SkColor color) { | 782 void RenderWidgetHostViewAndroid::UpdateBackgroundColor(SkColor color) { |
| 784 if (cached_background_color_ == color) | 783 if (cached_background_color_ == color) |
| 785 return; | 784 return; |
| 786 | 785 |
| 787 cached_background_color_ = color; | 786 cached_background_color_ = color; |
| 788 | 787 |
| 789 if (delegated_frame_host_) | 788 if (delegated_frame_host_) |
| 790 delegated_frame_host_->UpdateBackgroundColor(color); | 789 delegated_frame_host_->UpdateBackgroundColor(color); |
| (...skipping 1176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1967 case ui::MotionEvent::ACTION_UP: | 1966 case ui::MotionEvent::ACTION_UP: |
| 1968 case ui::MotionEvent::ACTION_POINTER_UP: | 1967 case ui::MotionEvent::ACTION_POINTER_UP: |
| 1969 UMA_HISTOGRAM_CUSTOM_COUNTS("Event.Latency.OS.TOUCH_RELEASED", | 1968 UMA_HISTOGRAM_CUSTOM_COUNTS("Event.Latency.OS.TOUCH_RELEASED", |
| 1970 delta.InMicroseconds(), 1, 1000000, 50); | 1969 delta.InMicroseconds(), 1, 1000000, 50); |
| 1971 default: | 1970 default: |
| 1972 return; | 1971 return; |
| 1973 } | 1972 } |
| 1974 } | 1973 } |
| 1975 | 1974 |
| 1976 } // namespace content | 1975 } // namespace content |
| OLD | NEW |