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