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_aura.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <tuple> | 10 #include <tuple> |
(...skipping 14 matching lines...) Expand all Loading... |
25 #include "build/build_config.h" | 25 #include "build/build_config.h" |
26 #include "cc/output/begin_frame_args.h" | 26 #include "cc/output/begin_frame_args.h" |
27 #include "cc/output/compositor_frame.h" | 27 #include "cc/output/compositor_frame.h" |
28 #include "cc/output/compositor_frame_metadata.h" | 28 #include "cc/output/compositor_frame_metadata.h" |
29 #include "cc/output/copy_output_request.h" | 29 #include "cc/output/copy_output_request.h" |
30 #include "cc/surfaces/surface.h" | 30 #include "cc/surfaces/surface.h" |
31 #include "cc/surfaces/surface_manager.h" | 31 #include "cc/surfaces/surface_manager.h" |
32 #include "cc/test/begin_frame_args_test.h" | 32 #include "cc/test/begin_frame_args_test.h" |
33 #include "cc/test/fake_external_begin_frame_source.h" | 33 #include "cc/test/fake_external_begin_frame_source.h" |
34 #include "components/display_compositor/gl_helper.h" | 34 #include "components/display_compositor/gl_helper.h" |
| 35 #include "components/display_compositor/host_shared_bitmap_manager.h" |
35 #include "content/browser/browser_thread_impl.h" | 36 #include "content/browser/browser_thread_impl.h" |
36 #include "content/browser/compositor/test/no_transport_image_transport_factory.h
" | 37 #include "content/browser/compositor/test/no_transport_image_transport_factory.h
" |
37 #include "content/browser/frame_host/render_widget_host_view_guest.h" | 38 #include "content/browser/frame_host/render_widget_host_view_guest.h" |
38 #include "content/browser/gpu/compositor_util.h" | 39 #include "content/browser/gpu/compositor_util.h" |
39 #include "content/browser/renderer_host/delegated_frame_host.h" | 40 #include "content/browser/renderer_host/delegated_frame_host.h" |
40 #include "content/browser/renderer_host/delegated_frame_host_client_aura.h" | 41 #include "content/browser/renderer_host/delegated_frame_host_client_aura.h" |
41 #include "content/browser/renderer_host/input/input_router.h" | 42 #include "content/browser/renderer_host/input/input_router.h" |
42 #include "content/browser/renderer_host/input/mouse_wheel_event_queue.h" | 43 #include "content/browser/renderer_host/input/mouse_wheel_event_queue.h" |
43 #include "content/browser/renderer_host/overscroll_controller.h" | 44 #include "content/browser/renderer_host/overscroll_controller.h" |
44 #include "content/browser/renderer_host/overscroll_controller_delegate.h" | 45 #include "content/browser/renderer_host/overscroll_controller_delegate.h" |
45 #include "content/browser/renderer_host/render_view_host_factory.h" | 46 #include "content/browser/renderer_host/render_view_host_factory.h" |
46 #include "content/browser/renderer_host/render_widget_host_delegate.h" | 47 #include "content/browser/renderer_host/render_widget_host_delegate.h" |
47 #include "content/browser/renderer_host/render_widget_host_impl.h" | 48 #include "content/browser/renderer_host/render_widget_host_impl.h" |
48 #include "content/browser/renderer_host/render_widget_host_view_event_handler.h" | 49 #include "content/browser/renderer_host/render_widget_host_view_event_handler.h" |
49 #include "content/browser/renderer_host/render_widget_host_view_frame_subscriber
.h" | 50 #include "content/browser/renderer_host/render_widget_host_view_frame_subscriber
.h" |
50 #include "content/browser/renderer_host/text_input_manager.h" | 51 #include "content/browser/renderer_host/text_input_manager.h" |
51 #include "content/browser/web_contents/web_contents_view_aura.h" | 52 #include "content/browser/web_contents/web_contents_view_aura.h" |
52 #include "content/common/host_shared_bitmap_manager.h" | |
53 #include "content/common/input/synthetic_web_input_event_builders.h" | 53 #include "content/common/input/synthetic_web_input_event_builders.h" |
54 #include "content/common/input_messages.h" | 54 #include "content/common/input_messages.h" |
55 #include "content/common/text_input_state.h" | 55 #include "content/common/text_input_state.h" |
56 #include "content/common/view_messages.h" | 56 #include "content/common/view_messages.h" |
57 #include "content/public/browser/keyboard_event_processing_result.h" | 57 #include "content/public/browser/keyboard_event_processing_result.h" |
58 #include "content/public/browser/render_widget_host_view.h" | 58 #include "content/public/browser/render_widget_host_view.h" |
59 #include "content/public/browser/web_contents_view_delegate.h" | 59 #include "content/public/browser/web_contents_view_delegate.h" |
60 #include "content/public/common/content_features.h" | 60 #include "content/public/common/content_features.h" |
61 #include "content/public/common/context_menu_params.h" | 61 #include "content/public/common/context_menu_params.h" |
62 #include "content/public/test/mock_render_process_host.h" | 62 #include "content/public/test/mock_render_process_host.h" |
(...skipping 2473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2536 | 2536 |
2537 TEST_F(RenderWidgetHostViewAuraTest, DiscardDelegatedFrames) { | 2537 TEST_F(RenderWidgetHostViewAuraTest, DiscardDelegatedFrames) { |
2538 view_->InitAsChild(nullptr); | 2538 view_->InitAsChild(nullptr); |
2539 | 2539 |
2540 size_t max_renderer_frames = | 2540 size_t max_renderer_frames = |
2541 RendererFrameManager::GetInstance()->GetMaxNumberOfSavedFrames(); | 2541 RendererFrameManager::GetInstance()->GetMaxNumberOfSavedFrames(); |
2542 ASSERT_LE(2u, max_renderer_frames); | 2542 ASSERT_LE(2u, max_renderer_frames); |
2543 size_t renderer_count = max_renderer_frames + 1; | 2543 size_t renderer_count = max_renderer_frames + 1; |
2544 gfx::Rect view_rect(100, 100); | 2544 gfx::Rect view_rect(100, 100); |
2545 gfx::Size frame_size = view_rect.size(); | 2545 gfx::Size frame_size = view_rect.size(); |
2546 DCHECK_EQ(0u, HostSharedBitmapManager::current()->AllocatedBitmapCount()); | 2546 DCHECK_EQ(0u, display_compositor::HostSharedBitmapManager::current() |
| 2547 ->AllocatedBitmapCount()); |
2547 | 2548 |
2548 std::unique_ptr<RenderWidgetHostImpl* []> hosts( | 2549 std::unique_ptr<RenderWidgetHostImpl* []> hosts( |
2549 new RenderWidgetHostImpl*[renderer_count]); | 2550 new RenderWidgetHostImpl*[renderer_count]); |
2550 std::unique_ptr<FakeRenderWidgetHostViewAura* []> views( | 2551 std::unique_ptr<FakeRenderWidgetHostViewAura* []> views( |
2551 new FakeRenderWidgetHostViewAura*[renderer_count]); | 2552 new FakeRenderWidgetHostViewAura*[renderer_count]); |
2552 | 2553 |
2553 // Create a bunch of renderers. | 2554 // Create a bunch of renderers. |
2554 for (size_t i = 0; i < renderer_count; ++i) { | 2555 for (size_t i = 0; i < renderer_count; ++i) { |
2555 int32_t routing_id = process_host_->GetNextRoutingID(); | 2556 int32_t routing_id = process_host_->GetNextRoutingID(); |
2556 delegates_.push_back(base::WrapUnique(new MockRenderWidgetHostDelegate)); | 2557 delegates_.push_back(base::WrapUnique(new MockRenderWidgetHostDelegate)); |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2675 EXPECT_FALSE(views[1]->released_front_lock_active()); | 2676 EXPECT_FALSE(views[1]->released_front_lock_active()); |
2676 | 2677 |
2677 for (size_t i = 0; i < renderer_count - 1; ++i) | 2678 for (size_t i = 0; i < renderer_count - 1; ++i) |
2678 views[i]->Hide(); | 2679 views[i]->Hide(); |
2679 | 2680 |
2680 // Allocate enough bitmaps so that two frames (proportionally) would be | 2681 // Allocate enough bitmaps so that two frames (proportionally) would be |
2681 // enough hit the handle limit. | 2682 // enough hit the handle limit. |
2682 int handles_per_frame = 5; | 2683 int handles_per_frame = 5; |
2683 RendererFrameManager::GetInstance()->set_max_handles(handles_per_frame * 2); | 2684 RendererFrameManager::GetInstance()->set_max_handles(handles_per_frame * 2); |
2684 | 2685 |
2685 HostSharedBitmapManagerClient bitmap_client( | 2686 display_compositor::HostSharedBitmapManagerClient bitmap_client( |
2686 HostSharedBitmapManager::current()); | 2687 display_compositor::HostSharedBitmapManager::current()); |
2687 | 2688 |
2688 for (size_t i = 0; i < (renderer_count - 1) * handles_per_frame; i++) { | 2689 for (size_t i = 0; i < (renderer_count - 1) * handles_per_frame; i++) { |
2689 bitmap_client.ChildAllocatedSharedBitmap( | 2690 bitmap_client.ChildAllocatedSharedBitmap( |
2690 1, base::SharedMemory::NULLHandle(), cc::SharedBitmap::GenerateId()); | 2691 1, base::SharedMemory::NULLHandle(), cc::SharedBitmap::GenerateId()); |
2691 } | 2692 } |
2692 | 2693 |
2693 // Hiding this last bitmap should evict all but two frames. | 2694 // Hiding this last bitmap should evict all but two frames. |
2694 views[renderer_count - 1]->Hide(); | 2695 views[renderer_count - 1]->Hide(); |
2695 for (size_t i = 0; i < renderer_count; ++i) { | 2696 for (size_t i = 0; i < renderer_count; ++i) { |
2696 if (i + 2 < renderer_count) | 2697 if (i + 2 < renderer_count) |
(...skipping 12 matching lines...) Expand all Loading... |
2709 | 2710 |
2710 TEST_F(RenderWidgetHostViewAuraTest, DiscardDelegatedFramesWithLocking) { | 2711 TEST_F(RenderWidgetHostViewAuraTest, DiscardDelegatedFramesWithLocking) { |
2711 view_->InitAsChild(nullptr); | 2712 view_->InitAsChild(nullptr); |
2712 | 2713 |
2713 size_t max_renderer_frames = | 2714 size_t max_renderer_frames = |
2714 RendererFrameManager::GetInstance()->GetMaxNumberOfSavedFrames(); | 2715 RendererFrameManager::GetInstance()->GetMaxNumberOfSavedFrames(); |
2715 ASSERT_LE(2u, max_renderer_frames); | 2716 ASSERT_LE(2u, max_renderer_frames); |
2716 size_t renderer_count = max_renderer_frames + 1; | 2717 size_t renderer_count = max_renderer_frames + 1; |
2717 gfx::Rect view_rect(100, 100); | 2718 gfx::Rect view_rect(100, 100); |
2718 gfx::Size frame_size = view_rect.size(); | 2719 gfx::Size frame_size = view_rect.size(); |
2719 DCHECK_EQ(0u, HostSharedBitmapManager::current()->AllocatedBitmapCount()); | 2720 DCHECK_EQ(0u, display_compositor::HostSharedBitmapManager::current() |
| 2721 ->AllocatedBitmapCount()); |
2720 | 2722 |
2721 std::unique_ptr<RenderWidgetHostImpl* []> hosts( | 2723 std::unique_ptr<RenderWidgetHostImpl* []> hosts( |
2722 new RenderWidgetHostImpl*[renderer_count]); | 2724 new RenderWidgetHostImpl*[renderer_count]); |
2723 std::unique_ptr<FakeRenderWidgetHostViewAura* []> views( | 2725 std::unique_ptr<FakeRenderWidgetHostViewAura* []> views( |
2724 new FakeRenderWidgetHostViewAura*[renderer_count]); | 2726 new FakeRenderWidgetHostViewAura*[renderer_count]); |
2725 | 2727 |
2726 // Create a bunch of renderers. | 2728 // Create a bunch of renderers. |
2727 for (size_t i = 0; i < renderer_count; ++i) { | 2729 for (size_t i = 0; i < renderer_count; ++i) { |
2728 int32_t routing_id = process_host_->GetNextRoutingID(); | 2730 int32_t routing_id = process_host_->GetNextRoutingID(); |
2729 delegates_.push_back(base::WrapUnique(new MockRenderWidgetHostDelegate)); | 2731 delegates_.push_back(base::WrapUnique(new MockRenderWidgetHostDelegate)); |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2781 // The test logic below relies on having max_renderer_frames > 2. By default, | 2783 // The test logic below relies on having max_renderer_frames > 2. By default, |
2782 // this value is calculated from total physical memory and causes the test to | 2784 // this value is calculated from total physical memory and causes the test to |
2783 // fail when run on hardware with < 256MB of RAM. | 2785 // fail when run on hardware with < 256MB of RAM. |
2784 const size_t kMaxRendererFrames = 5; | 2786 const size_t kMaxRendererFrames = 5; |
2785 RendererFrameManager::GetInstance()->set_max_number_of_saved_frames( | 2787 RendererFrameManager::GetInstance()->set_max_number_of_saved_frames( |
2786 kMaxRendererFrames); | 2788 kMaxRendererFrames); |
2787 | 2789 |
2788 size_t renderer_count = kMaxRendererFrames; | 2790 size_t renderer_count = kMaxRendererFrames; |
2789 gfx::Rect view_rect(100, 100); | 2791 gfx::Rect view_rect(100, 100); |
2790 gfx::Size frame_size = view_rect.size(); | 2792 gfx::Size frame_size = view_rect.size(); |
2791 DCHECK_EQ(0u, HostSharedBitmapManager::current()->AllocatedBitmapCount()); | 2793 DCHECK_EQ(0u, display_compositor::HostSharedBitmapManager::current() |
| 2794 ->AllocatedBitmapCount()); |
2792 | 2795 |
2793 std::unique_ptr<RenderWidgetHostImpl* []> hosts( | 2796 std::unique_ptr<RenderWidgetHostImpl* []> hosts( |
2794 new RenderWidgetHostImpl*[renderer_count]); | 2797 new RenderWidgetHostImpl*[renderer_count]); |
2795 std::unique_ptr<FakeRenderWidgetHostViewAura* []> views( | 2798 std::unique_ptr<FakeRenderWidgetHostViewAura* []> views( |
2796 new FakeRenderWidgetHostViewAura*[renderer_count]); | 2799 new FakeRenderWidgetHostViewAura*[renderer_count]); |
2797 | 2800 |
2798 // Create a bunch of renderers. | 2801 // Create a bunch of renderers. |
2799 for (size_t i = 0; i < renderer_count; ++i) { | 2802 for (size_t i = 0; i < renderer_count; ++i) { |
2800 int32_t routing_id = process_host_->GetNextRoutingID(); | 2803 int32_t routing_id = process_host_->GetNextRoutingID(); |
2801 delegates_.push_back(base::WrapUnique(new MockRenderWidgetHostDelegate)); | 2804 delegates_.push_back(base::WrapUnique(new MockRenderWidgetHostDelegate)); |
(...skipping 2423 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5225 // There is no composition in the beginning. | 5228 // There is no composition in the beginning. |
5226 EXPECT_FALSE(has_composition_text()); | 5229 EXPECT_FALSE(has_composition_text()); |
5227 SetHasCompositionTextToTrue(); | 5230 SetHasCompositionTextToTrue(); |
5228 view->ImeCancelComposition(); | 5231 view->ImeCancelComposition(); |
5229 // The composition must have been canceled. | 5232 // The composition must have been canceled. |
5230 EXPECT_FALSE(has_composition_text()); | 5233 EXPECT_FALSE(has_composition_text()); |
5231 } | 5234 } |
5232 } | 5235 } |
5233 | 5236 |
5234 } // namespace content | 5237 } // namespace content |
OLD | NEW |