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 614 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
625 } | 625 } |
626 | 626 |
627 if (!content_view_core_) | 627 if (!content_view_core_) |
628 return; | 628 return; |
629 | 629 |
630 content_view_core_->UpdateImeAdapter( | 630 content_view_core_->UpdateImeAdapter( |
631 GetNativeImeAdapter(), | 631 GetNativeImeAdapter(), |
632 static_cast<int>(params.type), params.flags, | 632 static_cast<int>(params.type), params.flags, |
633 params.value, params.selection_start, params.selection_end, | 633 params.value, params.selection_start, params.selection_end, |
634 params.composition_start, params.composition_end, | 634 params.composition_start, params.composition_end, |
635 params.show_ime_if_needed, params.is_non_ime_change); | 635 params.show_ime_if_needed, params.is_non_ime_change, |
| 636 params.batch_edit); |
636 } | 637 } |
637 | 638 |
638 void RenderWidgetHostViewAndroid::UpdateBackgroundColor(SkColor color) { | 639 void RenderWidgetHostViewAndroid::UpdateBackgroundColor(SkColor color) { |
639 if (cached_background_color_ == color) | 640 if (cached_background_color_ == color) |
640 return; | 641 return; |
641 | 642 |
642 cached_background_color_ = color; | 643 cached_background_color_ = color; |
643 | 644 |
644 if (delegated_frame_host_) | 645 if (delegated_frame_host_) |
645 delegated_frame_host_->UpdateBackgroundColor(color); | 646 delegated_frame_host_->UpdateBackgroundColor(color); |
(...skipping 1241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1887 case ui::MotionEvent::ACTION_UP: | 1888 case ui::MotionEvent::ACTION_UP: |
1888 case ui::MotionEvent::ACTION_POINTER_UP: | 1889 case ui::MotionEvent::ACTION_POINTER_UP: |
1889 UMA_HISTOGRAM_CUSTOM_COUNTS("Event.Latency.OS.TOUCH_RELEASED", | 1890 UMA_HISTOGRAM_CUSTOM_COUNTS("Event.Latency.OS.TOUCH_RELEASED", |
1890 delta.InMicroseconds(), 1, 1000000, 50); | 1891 delta.InMicroseconds(), 1, 1000000, 50); |
1891 default: | 1892 default: |
1892 return; | 1893 return; |
1893 } | 1894 } |
1894 } | 1895 } |
1895 | 1896 |
1896 } // namespace content | 1897 } // namespace content |
OLD | NEW |