OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/frame_host/render_widget_host_view_child_frame.h" | 5 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
11 #include "base/macros.h" | 11 #include "base/macros.h" |
12 #include "base/memory/ptr_util.h" | 12 #include "base/memory/ptr_util.h" |
13 #include "base/message_loop/message_loop.h" | |
14 #include "base/run_loop.h" | 13 #include "base/run_loop.h" |
15 #include "base/single_thread_task_runner.h" | 14 #include "base/single_thread_task_runner.h" |
16 #include "base/test/scoped_task_scheduler.h" | 15 #include "base/test/scoped_task_environment.h" |
| 16 #include "base/threading/thread_task_runner_handle.h" |
17 #include "build/build_config.h" | 17 #include "build/build_config.h" |
18 #include "cc/surfaces/compositor_frame_sink_support.h" | 18 #include "cc/surfaces/compositor_frame_sink_support.h" |
19 #include "cc/surfaces/surface.h" | 19 #include "cc/surfaces/surface.h" |
20 #include "cc/surfaces/surface_manager.h" | 20 #include "cc/surfaces/surface_manager.h" |
21 #include "cc/surfaces/surface_sequence.h" | 21 #include "cc/surfaces/surface_sequence.h" |
22 #include "cc/test/begin_frame_args_test.h" | 22 #include "cc/test/begin_frame_args_test.h" |
23 #include "cc/test/fake_external_begin_frame_source.h" | 23 #include "cc/test/fake_external_begin_frame_source.h" |
24 #include "content/browser/compositor/test/no_transport_image_transport_factory.h
" | 24 #include "content/browser/compositor/test/no_transport_image_transport_factory.h
" |
25 #include "content/browser/frame_host/cross_process_frame_connector.h" | 25 #include "content/browser/frame_host/cross_process_frame_connector.h" |
26 #include "content/browser/gpu/compositor_util.h" | 26 #include "content/browser/gpu/compositor_util.h" |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 return nullptr; | 67 return nullptr; |
68 } | 68 } |
69 | 69 |
70 cc::SurfaceInfo last_surface_info_; | 70 cc::SurfaceInfo last_surface_info_; |
71 }; | 71 }; |
72 | 72 |
73 } // namespace | 73 } // namespace |
74 | 74 |
75 class RenderWidgetHostViewChildFrameTest : public testing::Test { | 75 class RenderWidgetHostViewChildFrameTest : public testing::Test { |
76 public: | 76 public: |
77 RenderWidgetHostViewChildFrameTest() : task_scheduler_(&message_loop_) {} | 77 RenderWidgetHostViewChildFrameTest() |
| 78 : scoped_task_environment_( |
| 79 base::test::ScopedTaskEnvironment::MainThreadType::UI) {} |
78 | 80 |
79 void SetUp() override { | 81 void SetUp() override { |
80 browser_context_.reset(new TestBrowserContext); | 82 browser_context_.reset(new TestBrowserContext); |
81 | 83 |
82 // ImageTransportFactory doesn't exist on Android. | 84 // ImageTransportFactory doesn't exist on Android. |
83 #if !defined(OS_ANDROID) | 85 #if !defined(OS_ANDROID) |
84 ImageTransportFactory::InitializeForUnitTests( | 86 ImageTransportFactory::InitializeForUnitTests( |
85 base::WrapUnique(new NoTransportImageTransportFactory)); | 87 base::WrapUnique(new NoTransportImageTransportFactory)); |
86 #endif | 88 #endif |
87 | 89 |
(...skipping 20 matching lines...) Expand all Loading... |
108 } | 110 } |
109 | 111 |
110 void TearDown() override { | 112 void TearDown() override { |
111 if (view_) | 113 if (view_) |
112 view_->Destroy(); | 114 view_->Destroy(); |
113 delete widget_host_; | 115 delete widget_host_; |
114 delete test_frame_connector_; | 116 delete test_frame_connector_; |
115 | 117 |
116 browser_context_.reset(); | 118 browser_context_.reset(); |
117 | 119 |
118 message_loop_.task_runner()->DeleteSoon(FROM_HERE, | 120 base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, |
119 browser_context_.release()); | 121 browser_context_.release()); |
120 base::RunLoop().RunUntilIdle(); | 122 base::RunLoop().RunUntilIdle(); |
121 #if !defined(OS_ANDROID) | 123 #if !defined(OS_ANDROID) |
122 ImageTransportFactory::Terminate(); | 124 ImageTransportFactory::Terminate(); |
123 #endif | 125 #endif |
124 } | 126 } |
125 | 127 |
126 cc::SurfaceId GetSurfaceId() const { | 128 cc::SurfaceId GetSurfaceId() const { |
127 return cc::SurfaceId(view_->frame_sink_id_, view_->local_surface_id_); | 129 return cc::SurfaceId(view_->frame_sink_id_, view_->local_surface_id_); |
128 } | 130 } |
129 | 131 |
130 cc::LocalSurfaceId GetLocalSurfaceId() const { | 132 cc::LocalSurfaceId GetLocalSurfaceId() const { |
131 return view_->local_surface_id_; | 133 return view_->local_surface_id_; |
132 } | 134 } |
133 | 135 |
134 void ClearCompositorSurfaceIfNecessary() { | 136 void ClearCompositorSurfaceIfNecessary() { |
135 view_->ClearCompositorSurfaceIfNecessary(); | 137 view_->ClearCompositorSurfaceIfNecessary(); |
136 } | 138 } |
137 | 139 |
138 protected: | 140 protected: |
139 base::MessageLoopForUI message_loop_; | 141 base::test::ScopedTaskEnvironment scoped_task_environment_; |
140 | |
141 // TaskScheduler is used by RenderWidgetHostImpl constructor. | |
142 base::test::ScopedTaskScheduler task_scheduler_; | |
143 | 142 |
144 std::unique_ptr<BrowserContext> browser_context_; | 143 std::unique_ptr<BrowserContext> browser_context_; |
145 MockRenderWidgetHostDelegate delegate_; | 144 MockRenderWidgetHostDelegate delegate_; |
146 | 145 |
147 // Tests should set these to NULL if they've already triggered their | 146 // Tests should set these to NULL if they've already triggered their |
148 // destruction. | 147 // destruction. |
149 RenderWidgetHostImpl* widget_host_; | 148 RenderWidgetHostImpl* widget_host_; |
150 RenderWidgetHostViewChildFrame* view_; | 149 RenderWidgetHostViewChildFrame* view_; |
151 MockCrossProcessFrameConnector* test_frame_connector_; | 150 MockCrossProcessFrameConnector* test_frame_connector_; |
152 std::unique_ptr<FakeRendererCompositorFrameSink> | 151 std::unique_ptr<FakeRendererCompositorFrameSink> |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
284 // Explicit ack through OnBeginFrameDidNotSwap is forwarded. | 283 // Explicit ack through OnBeginFrameDidNotSwap is forwarded. |
285 cc::BeginFrameAck ack(source_id, 6, 4, false); | 284 cc::BeginFrameAck ack(source_id, 6, 4, false); |
286 view_->OnBeginFrameDidNotSwap(ack); | 285 view_->OnBeginFrameDidNotSwap(ack); |
287 EXPECT_EQ(ack, source.LastAckForObserver(view_->support_.get())); | 286 EXPECT_EQ(ack, source.LastAckForObserver(view_->support_.get())); |
288 } | 287 } |
289 | 288 |
290 view_->SetNeedsBeginFrames(false); | 289 view_->SetNeedsBeginFrames(false); |
291 } | 290 } |
292 | 291 |
293 } // namespace content | 292 } // namespace content |
OLD | NEW |