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 728 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
739 | 739 |
740 float RenderWidgetHostViewAndroid::GetBottomControlsHeight() const { | 740 float RenderWidgetHostViewAndroid::GetBottomControlsHeight() const { |
741 if (!content_view_core_) | 741 if (!content_view_core_) |
742 return 0.f; | 742 return 0.f; |
743 | 743 |
744 // The height of the browser controls. | 744 // The height of the browser controls. |
745 return content_view_core_->GetBottomControlsHeightDip(); | 745 return content_view_core_->GetBottomControlsHeightDip(); |
746 } | 746 } |
747 | 747 |
748 void RenderWidgetHostViewAndroid::UpdateCursor(const WebCursor& cursor) { | 748 void RenderWidgetHostViewAndroid::UpdateCursor(const WebCursor& cursor) { |
749 // There are no cursors on Android. | 749 CursorInfo cursor_info; |
| 750 cursor.GetCursorInfo(&cursor_info); |
| 751 view_.OnCursorChanged(cursor_info.type, cursor_info.custom_image, |
| 752 cursor_info.hotspot); |
750 } | 753 } |
751 | 754 |
752 void RenderWidgetHostViewAndroid::SetIsLoading(bool is_loading) { | 755 void RenderWidgetHostViewAndroid::SetIsLoading(bool is_loading) { |
753 // Do nothing. The UI notification is handled through ContentViewClient which | 756 // Do nothing. The UI notification is handled through ContentViewClient which |
754 // is TabContentsDelegate. | 757 // is TabContentsDelegate. |
755 } | 758 } |
756 | 759 |
757 // ----------------------------------------------------------------------------- | 760 // ----------------------------------------------------------------------------- |
758 // TextInputManager::Observer implementations. | 761 // TextInputManager::Observer implementations. |
759 void RenderWidgetHostViewAndroid::OnUpdateTextInputStateCalled( | 762 void RenderWidgetHostViewAndroid::OnUpdateTextInputStateCalled( |
(...skipping 1651 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2411 | 2414 |
2412 ui::WindowAndroidCompositor* compositor = window_android->GetCompositor(); | 2415 ui::WindowAndroidCompositor* compositor = window_android->GetCompositor(); |
2413 if (!compositor) | 2416 if (!compositor) |
2414 return; | 2417 return; |
2415 | 2418 |
2416 overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>( | 2419 overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>( |
2417 overscroll_refresh_handler, compositor, view_.GetDipScale()); | 2420 overscroll_refresh_handler, compositor, view_.GetDipScale()); |
2418 } | 2421 } |
2419 | 2422 |
2420 } // namespace content | 2423 } // namespace content |
OLD | NEW |