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 11 matching lines...) Expand all Loading... |
22 #include "base/test/simple_test_tick_clock.h" | 22 #include "base/test/simple_test_tick_clock.h" |
23 #include "base/threading/thread_task_runner_handle.h" | 23 #include "base/threading/thread_task_runner_handle.h" |
24 #include "build/build_config.h" | 24 #include "build/build_config.h" |
25 #include "cc/output/begin_frame_args.h" | 25 #include "cc/output/begin_frame_args.h" |
26 #include "cc/output/compositor_frame.h" | 26 #include "cc/output/compositor_frame.h" |
27 #include "cc/output/compositor_frame_metadata.h" | 27 #include "cc/output/compositor_frame_metadata.h" |
28 #include "cc/output/copy_output_request.h" | 28 #include "cc/output/copy_output_request.h" |
29 #include "cc/surfaces/surface.h" | 29 #include "cc/surfaces/surface.h" |
30 #include "cc/surfaces/surface_manager.h" | 30 #include "cc/surfaces/surface_manager.h" |
31 #include "components/display_compositor/gl_helper.h" | 31 #include "components/display_compositor/gl_helper.h" |
| 32 #include "components/display_compositor/host_shared_bitmap_manager.h" |
32 #include "content/browser/browser_thread_impl.h" | 33 #include "content/browser/browser_thread_impl.h" |
33 #include "content/browser/compositor/test/no_transport_image_transport_factory.h
" | 34 #include "content/browser/compositor/test/no_transport_image_transport_factory.h
" |
34 #include "content/browser/frame_host/render_widget_host_view_guest.h" | 35 #include "content/browser/frame_host/render_widget_host_view_guest.h" |
35 #include "content/browser/gpu/compositor_util.h" | 36 #include "content/browser/gpu/compositor_util.h" |
36 #include "content/browser/renderer_host/delegated_frame_host.h" | 37 #include "content/browser/renderer_host/delegated_frame_host.h" |
37 #include "content/browser/renderer_host/delegated_frame_host_client_aura.h" | 38 #include "content/browser/renderer_host/delegated_frame_host_client_aura.h" |
38 #include "content/browser/renderer_host/input/input_router.h" | 39 #include "content/browser/renderer_host/input/input_router.h" |
39 #include "content/browser/renderer_host/input/mouse_wheel_event_queue.h" | 40 #include "content/browser/renderer_host/input/mouse_wheel_event_queue.h" |
40 #include "content/browser/renderer_host/overscroll_controller.h" | 41 #include "content/browser/renderer_host/overscroll_controller.h" |
41 #include "content/browser/renderer_host/overscroll_controller_delegate.h" | 42 #include "content/browser/renderer_host/overscroll_controller_delegate.h" |
42 #include "content/browser/renderer_host/render_view_host_factory.h" | 43 #include "content/browser/renderer_host/render_view_host_factory.h" |
43 #include "content/browser/renderer_host/render_widget_host_delegate.h" | 44 #include "content/browser/renderer_host/render_widget_host_delegate.h" |
44 #include "content/browser/renderer_host/render_widget_host_impl.h" | 45 #include "content/browser/renderer_host/render_widget_host_impl.h" |
45 #include "content/browser/renderer_host/render_widget_host_view_event_handler.h" | 46 #include "content/browser/renderer_host/render_widget_host_view_event_handler.h" |
46 #include "content/browser/renderer_host/render_widget_host_view_frame_subscriber
.h" | 47 #include "content/browser/renderer_host/render_widget_host_view_frame_subscriber
.h" |
47 #include "content/browser/renderer_host/resize_lock.h" | 48 #include "content/browser/renderer_host/resize_lock.h" |
48 #include "content/browser/renderer_host/text_input_manager.h" | 49 #include "content/browser/renderer_host/text_input_manager.h" |
49 #include "content/browser/web_contents/web_contents_view_aura.h" | 50 #include "content/browser/web_contents/web_contents_view_aura.h" |
50 #include "content/common/host_shared_bitmap_manager.h" | |
51 #include "content/common/input/synthetic_web_input_event_builders.h" | 51 #include "content/common/input/synthetic_web_input_event_builders.h" |
52 #include "content/common/input_messages.h" | 52 #include "content/common/input_messages.h" |
53 #include "content/common/text_input_state.h" | 53 #include "content/common/text_input_state.h" |
54 #include "content/common/view_messages.h" | 54 #include "content/common/view_messages.h" |
55 #include "content/public/browser/render_widget_host_view.h" | 55 #include "content/public/browser/render_widget_host_view.h" |
56 #include "content/public/browser/web_contents_view_delegate.h" | 56 #include "content/public/browser/web_contents_view_delegate.h" |
57 #include "content/public/common/context_menu_params.h" | 57 #include "content/public/common/context_menu_params.h" |
58 #include "content/public/test/mock_render_process_host.h" | 58 #include "content/public/test/mock_render_process_host.h" |
59 #include "content/public/test/test_browser_context.h" | 59 #include "content/public/test/test_browser_context.h" |
60 #include "content/test/test_render_view_host.h" | 60 #include "content/test/test_render_view_host.h" |
(...skipping 2199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2260 | 2260 |
2261 TEST_F(RenderWidgetHostViewAuraTest, DiscardDelegatedFrames) { | 2261 TEST_F(RenderWidgetHostViewAuraTest, DiscardDelegatedFrames) { |
2262 view_->InitAsChild(nullptr); | 2262 view_->InitAsChild(nullptr); |
2263 | 2263 |
2264 size_t max_renderer_frames = | 2264 size_t max_renderer_frames = |
2265 RendererFrameManager::GetInstance()->GetMaxNumberOfSavedFrames(); | 2265 RendererFrameManager::GetInstance()->GetMaxNumberOfSavedFrames(); |
2266 ASSERT_LE(2u, max_renderer_frames); | 2266 ASSERT_LE(2u, max_renderer_frames); |
2267 size_t renderer_count = max_renderer_frames + 1; | 2267 size_t renderer_count = max_renderer_frames + 1; |
2268 gfx::Rect view_rect(100, 100); | 2268 gfx::Rect view_rect(100, 100); |
2269 gfx::Size frame_size = view_rect.size(); | 2269 gfx::Size frame_size = view_rect.size(); |
2270 DCHECK_EQ(0u, HostSharedBitmapManager::current()->AllocatedBitmapCount()); | 2270 DCHECK_EQ(0u, display_compositor::HostSharedBitmapManager::current() |
| 2271 ->AllocatedBitmapCount()); |
2271 | 2272 |
2272 std::unique_ptr<RenderWidgetHostImpl* []> hosts( | 2273 std::unique_ptr<RenderWidgetHostImpl* []> hosts( |
2273 new RenderWidgetHostImpl*[renderer_count]); | 2274 new RenderWidgetHostImpl*[renderer_count]); |
2274 std::unique_ptr<FakeRenderWidgetHostViewAura* []> views( | 2275 std::unique_ptr<FakeRenderWidgetHostViewAura* []> views( |
2275 new FakeRenderWidgetHostViewAura*[renderer_count]); | 2276 new FakeRenderWidgetHostViewAura*[renderer_count]); |
2276 | 2277 |
2277 // Create a bunch of renderers. | 2278 // Create a bunch of renderers. |
2278 for (size_t i = 0; i < renderer_count; ++i) { | 2279 for (size_t i = 0; i < renderer_count; ++i) { |
2279 int32_t routing_id = process_host_->GetNextRoutingID(); | 2280 int32_t routing_id = process_host_->GetNextRoutingID(); |
2280 delegates_.push_back(base::WrapUnique(new MockRenderWidgetHostDelegate)); | 2281 delegates_.push_back(base::WrapUnique(new MockRenderWidgetHostDelegate)); |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2391 EXPECT_FALSE(views[1]->released_front_lock_active()); | 2392 EXPECT_FALSE(views[1]->released_front_lock_active()); |
2392 | 2393 |
2393 for (size_t i = 0; i < renderer_count - 1; ++i) | 2394 for (size_t i = 0; i < renderer_count - 1; ++i) |
2394 views[i]->Hide(); | 2395 views[i]->Hide(); |
2395 | 2396 |
2396 // Allocate enough bitmaps so that two frames (proportionally) would be | 2397 // Allocate enough bitmaps so that two frames (proportionally) would be |
2397 // enough hit the handle limit. | 2398 // enough hit the handle limit. |
2398 int handles_per_frame = 5; | 2399 int handles_per_frame = 5; |
2399 RendererFrameManager::GetInstance()->set_max_handles(handles_per_frame * 2); | 2400 RendererFrameManager::GetInstance()->set_max_handles(handles_per_frame * 2); |
2400 | 2401 |
2401 HostSharedBitmapManagerClient bitmap_client( | 2402 display_compositor::HostSharedBitmapManagerClient bitmap_client( |
2402 HostSharedBitmapManager::current()); | 2403 display_compositor::HostSharedBitmapManager::current()); |
2403 | 2404 |
2404 for (size_t i = 0; i < (renderer_count - 1) * handles_per_frame; i++) { | 2405 for (size_t i = 0; i < (renderer_count - 1) * handles_per_frame; i++) { |
2405 bitmap_client.ChildAllocatedSharedBitmap( | 2406 bitmap_client.ChildAllocatedSharedBitmap( |
2406 1, base::SharedMemory::NULLHandle(), cc::SharedBitmap::GenerateId()); | 2407 1, base::SharedMemory::NULLHandle(), cc::SharedBitmap::GenerateId()); |
2407 } | 2408 } |
2408 | 2409 |
2409 // Hiding this last bitmap should evict all but two frames. | 2410 // Hiding this last bitmap should evict all but two frames. |
2410 views[renderer_count - 1]->Hide(); | 2411 views[renderer_count - 1]->Hide(); |
2411 for (size_t i = 0; i < renderer_count; ++i) { | 2412 for (size_t i = 0; i < renderer_count; ++i) { |
2412 if (i + 2 < renderer_count) | 2413 if (i + 2 < renderer_count) |
(...skipping 12 matching lines...) Expand all Loading... |
2425 | 2426 |
2426 TEST_F(RenderWidgetHostViewAuraTest, DiscardDelegatedFramesWithLocking) { | 2427 TEST_F(RenderWidgetHostViewAuraTest, DiscardDelegatedFramesWithLocking) { |
2427 view_->InitAsChild(nullptr); | 2428 view_->InitAsChild(nullptr); |
2428 | 2429 |
2429 size_t max_renderer_frames = | 2430 size_t max_renderer_frames = |
2430 RendererFrameManager::GetInstance()->GetMaxNumberOfSavedFrames(); | 2431 RendererFrameManager::GetInstance()->GetMaxNumberOfSavedFrames(); |
2431 ASSERT_LE(2u, max_renderer_frames); | 2432 ASSERT_LE(2u, max_renderer_frames); |
2432 size_t renderer_count = max_renderer_frames + 1; | 2433 size_t renderer_count = max_renderer_frames + 1; |
2433 gfx::Rect view_rect(100, 100); | 2434 gfx::Rect view_rect(100, 100); |
2434 gfx::Size frame_size = view_rect.size(); | 2435 gfx::Size frame_size = view_rect.size(); |
2435 DCHECK_EQ(0u, HostSharedBitmapManager::current()->AllocatedBitmapCount()); | 2436 DCHECK_EQ(0u, display_compositor::HostSharedBitmapManager::current() |
| 2437 ->AllocatedBitmapCount()); |
2436 | 2438 |
2437 std::unique_ptr<RenderWidgetHostImpl* []> hosts( | 2439 std::unique_ptr<RenderWidgetHostImpl* []> hosts( |
2438 new RenderWidgetHostImpl*[renderer_count]); | 2440 new RenderWidgetHostImpl*[renderer_count]); |
2439 std::unique_ptr<FakeRenderWidgetHostViewAura* []> views( | 2441 std::unique_ptr<FakeRenderWidgetHostViewAura* []> views( |
2440 new FakeRenderWidgetHostViewAura*[renderer_count]); | 2442 new FakeRenderWidgetHostViewAura*[renderer_count]); |
2441 | 2443 |
2442 // Create a bunch of renderers. | 2444 // Create a bunch of renderers. |
2443 for (size_t i = 0; i < renderer_count; ++i) { | 2445 for (size_t i = 0; i < renderer_count; ++i) { |
2444 int32_t routing_id = process_host_->GetNextRoutingID(); | 2446 int32_t routing_id = process_host_->GetNextRoutingID(); |
2445 delegates_.push_back(base::WrapUnique(new MockRenderWidgetHostDelegate)); | 2447 delegates_.push_back(base::WrapUnique(new MockRenderWidgetHostDelegate)); |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2496 // The test logic below relies on having max_renderer_frames > 2. By default, | 2498 // The test logic below relies on having max_renderer_frames > 2. By default, |
2497 // this value is calculated from total physical memory and causes the test to | 2499 // this value is calculated from total physical memory and causes the test to |
2498 // fail when run on hardware with < 256MB of RAM. | 2500 // fail when run on hardware with < 256MB of RAM. |
2499 const size_t kMaxRendererFrames = 5; | 2501 const size_t kMaxRendererFrames = 5; |
2500 RendererFrameManager::GetInstance()->set_max_number_of_saved_frames( | 2502 RendererFrameManager::GetInstance()->set_max_number_of_saved_frames( |
2501 kMaxRendererFrames); | 2503 kMaxRendererFrames); |
2502 | 2504 |
2503 size_t renderer_count = kMaxRendererFrames; | 2505 size_t renderer_count = kMaxRendererFrames; |
2504 gfx::Rect view_rect(100, 100); | 2506 gfx::Rect view_rect(100, 100); |
2505 gfx::Size frame_size = view_rect.size(); | 2507 gfx::Size frame_size = view_rect.size(); |
2506 DCHECK_EQ(0u, HostSharedBitmapManager::current()->AllocatedBitmapCount()); | 2508 DCHECK_EQ(0u, display_compositor::HostSharedBitmapManager::current() |
| 2509 ->AllocatedBitmapCount()); |
2507 | 2510 |
2508 std::unique_ptr<RenderWidgetHostImpl* []> hosts( | 2511 std::unique_ptr<RenderWidgetHostImpl* []> hosts( |
2509 new RenderWidgetHostImpl*[renderer_count]); | 2512 new RenderWidgetHostImpl*[renderer_count]); |
2510 std::unique_ptr<FakeRenderWidgetHostViewAura* []> views( | 2513 std::unique_ptr<FakeRenderWidgetHostViewAura* []> views( |
2511 new FakeRenderWidgetHostViewAura*[renderer_count]); | 2514 new FakeRenderWidgetHostViewAura*[renderer_count]); |
2512 | 2515 |
2513 // Create a bunch of renderers. | 2516 // Create a bunch of renderers. |
2514 for (size_t i = 0; i < renderer_count; ++i) { | 2517 for (size_t i = 0; i < renderer_count; ++i) { |
2515 int32_t routing_id = process_host_->GetNextRoutingID(); | 2518 int32_t routing_id = process_host_->GetNextRoutingID(); |
2516 delegates_.push_back(base::WrapUnique(new MockRenderWidgetHostDelegate)); | 2519 delegates_.push_back(base::WrapUnique(new MockRenderWidgetHostDelegate)); |
(...skipping 2199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4716 // There is no composition in the beginning. | 4719 // There is no composition in the beginning. |
4717 EXPECT_FALSE(has_composition_text()); | 4720 EXPECT_FALSE(has_composition_text()); |
4718 SetHasCompositionTextToTrue(); | 4721 SetHasCompositionTextToTrue(); |
4719 view->ImeCancelComposition(); | 4722 view->ImeCancelComposition(); |
4720 // The composition must have been canceled. | 4723 // The composition must have been canceled. |
4721 EXPECT_FALSE(has_composition_text()); | 4724 EXPECT_FALSE(has_composition_text()); |
4722 } | 4725 } |
4723 } | 4726 } |
4724 | 4727 |
4725 } // namespace content | 4728 } // namespace content |
OLD | NEW |