| 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 610 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 621 } | 621 } |
| 622 | 622 |
| 623 if (!content_view_core_) | 623 if (!content_view_core_) |
| 624 return; | 624 return; |
| 625 | 625 |
| 626 content_view_core_->UpdateImeAdapter( | 626 content_view_core_->UpdateImeAdapter( |
| 627 GetNativeImeAdapter(), | 627 GetNativeImeAdapter(), |
| 628 static_cast<int>(params.type), params.flags, | 628 static_cast<int>(params.type), params.flags, |
| 629 params.value, params.selection_start, params.selection_end, | 629 params.value, params.selection_start, params.selection_end, |
| 630 params.composition_start, params.composition_end, | 630 params.composition_start, params.composition_end, |
| 631 params.show_ime_if_needed, params.is_non_ime_change); | 631 params.show_ime_if_needed, params.is_non_ime_change, |
| 632 params.batch_edit); |
| 632 } | 633 } |
| 633 | 634 |
| 634 void RenderWidgetHostViewAndroid::UpdateBackgroundColor(SkColor color) { | 635 void RenderWidgetHostViewAndroid::UpdateBackgroundColor(SkColor color) { |
| 635 if (cached_background_color_ == color) | 636 if (cached_background_color_ == color) |
| 636 return; | 637 return; |
| 637 | 638 |
| 638 cached_background_color_ = color; | 639 cached_background_color_ = color; |
| 639 | 640 |
| 640 if (delegated_frame_host_) | 641 if (delegated_frame_host_) |
| 641 delegated_frame_host_->UpdateBackgroundColor(color); | 642 delegated_frame_host_->UpdateBackgroundColor(color); |
| (...skipping 1228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1870 case ui::MotionEvent::ACTION_UP: | 1871 case ui::MotionEvent::ACTION_UP: |
| 1871 case ui::MotionEvent::ACTION_POINTER_UP: | 1872 case ui::MotionEvent::ACTION_POINTER_UP: |
| 1872 UMA_HISTOGRAM_CUSTOM_COUNTS("Event.Latency.OS.TOUCH_RELEASED", | 1873 UMA_HISTOGRAM_CUSTOM_COUNTS("Event.Latency.OS.TOUCH_RELEASED", |
| 1873 delta.InMicroseconds(), 1, 1000000, 50); | 1874 delta.InMicroseconds(), 1, 1000000, 50); |
| 1874 default: | 1875 default: |
| 1875 return; | 1876 return; |
| 1876 } | 1877 } |
| 1877 } | 1878 } |
| 1878 | 1879 |
| 1879 } // namespace content | 1880 } // namespace content |
| OLD | NEW |