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 701 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
712 | 712 |
713 float RenderWidgetHostViewAndroid::GetBottomControlsHeight() const { | 713 float RenderWidgetHostViewAndroid::GetBottomControlsHeight() const { |
714 if (!content_view_core_) | 714 if (!content_view_core_) |
715 return 0.f; | 715 return 0.f; |
716 | 716 |
717 // The height of the browser controls. | 717 // The height of the browser controls. |
718 return content_view_core_->GetBottomControlsHeightDip(); | 718 return content_view_core_->GetBottomControlsHeightDip(); |
719 } | 719 } |
720 | 720 |
721 void RenderWidgetHostViewAndroid::UpdateCursor(const WebCursor& cursor) { | 721 void RenderWidgetHostViewAndroid::UpdateCursor(const WebCursor& cursor) { |
722 // There are no cursors on Android. | 722 CursorInfo cursor_info; |
| 723 cursor.GetCursorInfo(&cursor_info); |
| 724 view_.OnCursorChanged(cursor_info.type, cursor_info.custom_image, |
| 725 cursor_info.hotspot); |
723 } | 726 } |
724 | 727 |
725 void RenderWidgetHostViewAndroid::SetIsLoading(bool is_loading) { | 728 void RenderWidgetHostViewAndroid::SetIsLoading(bool is_loading) { |
726 // Do nothing. The UI notification is handled through ContentViewClient which | 729 // Do nothing. The UI notification is handled through ContentViewClient which |
727 // is TabContentsDelegate. | 730 // is TabContentsDelegate. |
728 } | 731 } |
729 | 732 |
730 // ----------------------------------------------------------------------------- | 733 // ----------------------------------------------------------------------------- |
731 // TextInputManager::Observer implementations. | 734 // TextInputManager::Observer implementations. |
732 void RenderWidgetHostViewAndroid::OnUpdateTextInputStateCalled( | 735 void RenderWidgetHostViewAndroid::OnUpdateTextInputStateCalled( |
(...skipping 1517 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2250 | 2253 |
2251 ui::WindowAndroidCompositor* compositor = window_android->GetCompositor(); | 2254 ui::WindowAndroidCompositor* compositor = window_android->GetCompositor(); |
2252 if (!compositor) | 2255 if (!compositor) |
2253 return; | 2256 return; |
2254 | 2257 |
2255 overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>( | 2258 overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>( |
2256 overscroll_refresh_handler, compositor, view_.GetDipScale()); | 2259 overscroll_refresh_handler, compositor, view_.GetDipScale()); |
2257 } | 2260 } |
2258 | 2261 |
2259 } // namespace content | 2262 } // namespace content |
OLD | NEW |