| 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 604 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 615 } | 615 } |
| 616 | 616 |
| 617 if (!content_view_core_) | 617 if (!content_view_core_) |
| 618 return; | 618 return; |
| 619 | 619 |
| 620 content_view_core_->UpdateImeAdapter( | 620 content_view_core_->UpdateImeAdapter( |
| 621 GetNativeImeAdapter(), | 621 GetNativeImeAdapter(), |
| 622 static_cast<int>(params.type), params.flags, | 622 static_cast<int>(params.type), params.flags, |
| 623 params.value, params.selection_start, params.selection_end, | 623 params.value, params.selection_start, params.selection_end, |
| 624 params.composition_start, params.composition_end, | 624 params.composition_start, params.composition_end, |
| 625 params.show_ime_if_needed, params.is_non_ime_change); | 625 params.show_ime_if_needed, params.is_non_ime_change, |
| 626 params.batch_edit); |
| 626 } | 627 } |
| 627 | 628 |
| 628 void RenderWidgetHostViewAndroid::UpdateBackgroundColor(SkColor color) { | 629 void RenderWidgetHostViewAndroid::UpdateBackgroundColor(SkColor color) { |
| 629 if (cached_background_color_ == color) | 630 if (cached_background_color_ == color) |
| 630 return; | 631 return; |
| 631 | 632 |
| 632 cached_background_color_ = color; | 633 cached_background_color_ = color; |
| 633 | 634 |
| 634 if (delegated_frame_host_) | 635 if (delegated_frame_host_) |
| 635 delegated_frame_host_->UpdateBackgroundColor(color); | 636 delegated_frame_host_->UpdateBackgroundColor(color); |
| (...skipping 1226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1862 case ui::MotionEvent::ACTION_UP: | 1863 case ui::MotionEvent::ACTION_UP: |
| 1863 case ui::MotionEvent::ACTION_POINTER_UP: | 1864 case ui::MotionEvent::ACTION_POINTER_UP: |
| 1864 UMA_HISTOGRAM_CUSTOM_COUNTS("Event.Latency.OS.TOUCH_RELEASED", | 1865 UMA_HISTOGRAM_CUSTOM_COUNTS("Event.Latency.OS.TOUCH_RELEASED", |
| 1865 delta.InMicroseconds(), 1, 1000000, 50); | 1866 delta.InMicroseconds(), 1, 1000000, 50); |
| 1866 default: | 1867 default: |
| 1867 return; | 1868 return; |
| 1868 } | 1869 } |
| 1869 } | 1870 } |
| 1870 | 1871 |
| 1871 } // namespace content | 1872 } // namespace content |
| OLD | NEW |