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 712 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
723 | 723 |
724 float RenderWidgetHostViewAndroid::GetBottomControlsHeight() const { | 724 float RenderWidgetHostViewAndroid::GetBottomControlsHeight() const { |
725 if (!content_view_core_) | 725 if (!content_view_core_) |
726 return 0.f; | 726 return 0.f; |
727 | 727 |
728 // The height of the browser controls. | 728 // The height of the browser controls. |
729 return content_view_core_->GetBottomControlsHeightDip(); | 729 return content_view_core_->GetBottomControlsHeightDip(); |
730 } | 730 } |
731 | 731 |
732 void RenderWidgetHostViewAndroid::UpdateCursor(const WebCursor& cursor) { | 732 void RenderWidgetHostViewAndroid::UpdateCursor(const WebCursor& cursor) { |
733 // There are no cursors on Android. | 733 CursorInfo cursor_info; |
| 734 cursor.GetCursorInfo(&cursor_info); |
| 735 view_.OnCursorChanged(cursor_info.type, cursor_info.custom_image, |
| 736 cursor_info.hotspot); |
734 } | 737 } |
735 | 738 |
736 void RenderWidgetHostViewAndroid::SetIsLoading(bool is_loading) { | 739 void RenderWidgetHostViewAndroid::SetIsLoading(bool is_loading) { |
737 // Do nothing. The UI notification is handled through ContentViewClient which | 740 // Do nothing. The UI notification is handled through ContentViewClient which |
738 // is TabContentsDelegate. | 741 // is TabContentsDelegate. |
739 } | 742 } |
740 | 743 |
741 // ----------------------------------------------------------------------------- | 744 // ----------------------------------------------------------------------------- |
742 // TextInputManager::Observer implementations. | 745 // TextInputManager::Observer implementations. |
743 void RenderWidgetHostViewAndroid::OnUpdateTextInputStateCalled( | 746 void RenderWidgetHostViewAndroid::OnUpdateTextInputStateCalled( |
(...skipping 1610 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2354 | 2357 |
2355 ui::WindowAndroidCompositor* compositor = window_android->GetCompositor(); | 2358 ui::WindowAndroidCompositor* compositor = window_android->GetCompositor(); |
2356 if (!compositor) | 2359 if (!compositor) |
2357 return; | 2360 return; |
2358 | 2361 |
2359 overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>( | 2362 overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>( |
2360 overscroll_refresh_handler, compositor, view_.GetDipScale()); | 2363 overscroll_refresh_handler, compositor, view_.GetDipScale()); |
2361 } | 2364 } |
2362 | 2365 |
2363 } // namespace content | 2366 } // namespace content |
OLD | NEW |