OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "cc/surfaces/surface_display_output_surface.h" | 5 #include "cc/surfaces/surface_display_output_surface.h" |
6 | 6 |
7 #include "cc/surfaces/onscreen_display_client.h" | 7 #include "cc/surfaces/onscreen_display_client.h" |
8 #include "cc/surfaces/surface_id_allocator.h" | 8 #include "cc/surfaces/surface_id_allocator.h" |
9 #include "cc/surfaces/surface_manager.h" | 9 #include "cc/surfaces/surface_manager.h" |
10 #include "cc/test/fake_output_surface.h" | 10 #include "cc/test/fake_output_surface.h" |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
72 &surface_display_output_surface_client_); | 72 &surface_display_output_surface_client_); |
73 display_client_.display()->Resize(display_size_); | 73 display_client_.display()->Resize(display_size_); |
74 | 74 |
75 EXPECT_FALSE(surface_display_output_surface_client_ | 75 EXPECT_FALSE(surface_display_output_surface_client_ |
76 .did_lose_output_surface_called()); | 76 .did_lose_output_surface_called()); |
77 } | 77 } |
78 | 78 |
79 ~SurfaceDisplayOutputSurfaceTest() override {} | 79 ~SurfaceDisplayOutputSurfaceTest() override {} |
80 | 80 |
81 void SwapBuffersWithDamage(const gfx::Rect& damage_rect_) { | 81 void SwapBuffersWithDamage(const gfx::Rect& damage_rect_) { |
82 scoped_ptr<RenderPass> render_pass(RenderPass::Create()); | 82 std::unique_ptr<RenderPass> render_pass(RenderPass::Create()); |
83 render_pass->SetNew(RenderPassId(1, 1), display_rect_, damage_rect_, | 83 render_pass->SetNew(RenderPassId(1, 1), display_rect_, damage_rect_, |
84 gfx::Transform()); | 84 gfx::Transform()); |
85 | 85 |
86 scoped_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData); | 86 std::unique_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData); |
87 frame_data->render_pass_list.push_back(std::move(render_pass)); | 87 frame_data->render_pass_list.push_back(std::move(render_pass)); |
88 | 88 |
89 CompositorFrame frame; | 89 CompositorFrame frame; |
90 frame.delegated_frame_data = std::move(frame_data); | 90 frame.delegated_frame_data = std::move(frame_data); |
91 | 91 |
92 surface_display_output_surface_.SwapBuffers(&frame); | 92 surface_display_output_surface_.SwapBuffers(&frame); |
93 } | 93 } |
94 | 94 |
95 void SetUp() override { | 95 void SetUp() override { |
96 // Draw the first frame to start in an "unlocked" state. | 96 // Draw the first frame to start in an "unlocked" state. |
97 SwapBuffersWithDamage(display_rect_); | 97 SwapBuffersWithDamage(display_rect_); |
98 | 98 |
99 EXPECT_EQ(0u, output_surface_->num_sent_frames()); | 99 EXPECT_EQ(0u, output_surface_->num_sent_frames()); |
100 task_runner_->RunUntilIdle(); | 100 task_runner_->RunUntilIdle(); |
101 EXPECT_EQ(1u, output_surface_->num_sent_frames()); | 101 EXPECT_EQ(1u, output_surface_->num_sent_frames()); |
102 } | 102 } |
103 | 103 |
104 protected: | 104 protected: |
105 scoped_ptr<base::SimpleTestTickClock> now_src_; | 105 std::unique_ptr<base::SimpleTestTickClock> now_src_; |
106 scoped_refptr<OrderedSimpleTaskRunner> task_runner_; | 106 scoped_refptr<OrderedSimpleTaskRunner> task_runner_; |
107 SurfaceIdAllocator allocator_; | 107 SurfaceIdAllocator allocator_; |
108 | 108 |
109 const gfx::Size display_size_; | 109 const gfx::Size display_size_; |
110 const gfx::Rect display_rect_; | 110 const gfx::Rect display_rect_; |
111 FakeOutputSurface* output_surface_; | 111 FakeOutputSurface* output_surface_; |
112 SurfaceManager surface_manager_; | 112 SurfaceManager surface_manager_; |
113 TestSharedBitmapManager bitmap_manager_; | 113 TestSharedBitmapManager bitmap_manager_; |
114 TestGpuMemoryBufferManager gpu_memory_buffer_manager_; | 114 TestGpuMemoryBufferManager gpu_memory_buffer_manager_; |
115 RendererSettings renderer_settings_; | 115 RendererSettings renderer_settings_; |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
158 EXPECT_EQ(1u, output_surface_->num_sent_frames()); | 158 EXPECT_EQ(1u, output_surface_->num_sent_frames()); |
159 | 159 |
160 SwapBuffersWithDamage(gfx::Rect()); | 160 SwapBuffersWithDamage(gfx::Rect()); |
161 EXPECT_EQ(1u, output_surface_->num_sent_frames()); | 161 EXPECT_EQ(1u, output_surface_->num_sent_frames()); |
162 task_runner_->RunUntilIdle(); | 162 task_runner_->RunUntilIdle(); |
163 EXPECT_EQ(1u, output_surface_->num_sent_frames()); | 163 EXPECT_EQ(1u, output_surface_->num_sent_frames()); |
164 } | 164 } |
165 | 165 |
166 } // namespace | 166 } // namespace |
167 } // namespace cc | 167 } // namespace cc |
OLD | NEW |