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