Chromium Code Reviews| 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/direct_compositor_frame_sink.h" | 5 #include "cc/surfaces/direct_compositor_frame_sink.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "cc/output/renderer_settings.h" | 9 #include "cc/output/renderer_settings.h" |
| 10 #include "cc/output/texture_mailbox_deleter.h" | 10 #include "cc/output/texture_mailbox_deleter.h" |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 131 SwapBuffersWithDamage(display_rect_); | 131 SwapBuffersWithDamage(display_rect_); |
| 132 task_runner_->RunUntilIdle(); | 132 task_runner_->RunUntilIdle(); |
| 133 EXPECT_EQ(1u, display_output_surface_->num_sent_frames()); | 133 EXPECT_EQ(1u, display_output_surface_->num_sent_frames()); |
| 134 display_output_surface_->set_suspended_for_recycle(false); | 134 display_output_surface_->set_suspended_for_recycle(false); |
| 135 SwapBuffersWithDamage(display_rect_); | 135 SwapBuffersWithDamage(display_rect_); |
| 136 task_runner_->RunUntilIdle(); | 136 task_runner_->RunUntilIdle(); |
| 137 EXPECT_EQ(2u, display_output_surface_->num_sent_frames()); | 137 EXPECT_EQ(2u, display_output_surface_->num_sent_frames()); |
| 138 } | 138 } |
| 139 | 139 |
| 140 TEST_F(DirectCompositorFrameSinkTest, | 140 TEST_F(DirectCompositorFrameSinkTest, |
| 141 LockingResourcesDoesNotIndirectlyCauseDamage) { | 141 LockingResourcesDoesNotIndirectlyCauseDamage) { |
|
danakj
2017/01/04 18:43:38
It looks like you can remove this test, it's now i
ericrk
2017/01/11 19:17:54
Ah yeah, looks like it. That first part isn't real
| |
| 142 compositor_frame_sink_->ForceReclaimResources(); | |
| 143 EXPECT_EQ(1u, display_output_surface_->num_sent_frames()); | 142 EXPECT_EQ(1u, display_output_surface_->num_sent_frames()); |
| 144 task_runner_->RunPendingTasks(); | 143 task_runner_->RunPendingTasks(); |
| 145 EXPECT_EQ(1u, display_output_surface_->num_sent_frames()); | 144 EXPECT_EQ(1u, display_output_surface_->num_sent_frames()); |
| 146 | 145 |
| 147 SwapBuffersWithDamage(gfx::Rect()); | 146 SwapBuffersWithDamage(gfx::Rect()); |
| 148 EXPECT_EQ(1u, display_output_surface_->num_sent_frames()); | 147 EXPECT_EQ(1u, display_output_surface_->num_sent_frames()); |
| 149 task_runner_->RunUntilIdle(); | 148 task_runner_->RunUntilIdle(); |
| 150 EXPECT_EQ(1u, display_output_surface_->num_sent_frames()); | 149 EXPECT_EQ(1u, display_output_surface_->num_sent_frames()); |
| 151 } | 150 } |
| 152 | 151 |
| 153 } // namespace | 152 } // namespace |
| 154 } // namespace cc | 153 } // namespace cc |
| OLD | NEW |