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/renderer/gpu/render_widget_compositor.h" | 5 #include "content/renderer/gpu/render_widget_compositor.h" |
6 | 6 |
7 #include "base/location.h" | 7 #include "base/location.h" |
8 #include "base/single_thread_task_runner.h" | 8 #include "base/single_thread_task_runner.h" |
9 #include "base/thread_task_runner_handle.h" | 9 #include "base/thread_task_runner_handle.h" |
10 #include "cc/output/begin_frame_args.h" | 10 #include "cc/output/begin_frame_args.h" |
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
201 int expected_successes, | 201 int expected_successes, |
202 int expected_fallback_succeses) { | 202 int expected_fallback_succeses) { |
203 use_null_output_surface_ = use_null_output_surface; | 203 use_null_output_surface_ = use_null_output_surface; |
204 num_failures_before_success_ = num_failures_before_success; | 204 num_failures_before_success_ = num_failures_before_success; |
205 expected_successes_ = expected_successes; | 205 expected_successes_ = expected_successes; |
206 expected_fallback_successes_ = expected_fallback_succeses; | 206 expected_fallback_successes_ = expected_fallback_succeses; |
207 expected_requests_ = num_failures_before_success_ + expected_successes_ + | 207 expected_requests_ = num_failures_before_success_ + expected_successes_ + |
208 expected_fallback_successes_; | 208 expected_fallback_successes_; |
209 } | 209 } |
210 | 210 |
211 void EndTest() { base::MessageLoop::current()->Quit(); } | 211 void EndTest() { base::MessageLoop::current()->QuitWhenIdle(); } |
212 | 212 |
213 void AfterTest() { | 213 void AfterTest() { |
214 EXPECT_EQ(num_failures_before_success_, num_failures_); | 214 EXPECT_EQ(num_failures_before_success_, num_failures_); |
215 EXPECT_EQ(expected_successes_, num_successes_); | 215 EXPECT_EQ(expected_successes_, num_successes_); |
216 EXPECT_EQ(expected_fallback_successes_, num_fallback_successes_); | 216 EXPECT_EQ(expected_fallback_successes_, num_fallback_successes_); |
217 EXPECT_EQ(expected_requests_, num_requests_); | 217 EXPECT_EQ(expected_requests_, num_requests_); |
218 } | 218 } |
219 | 219 |
220 private: | 220 private: |
221 int num_failures_before_success_; | 221 int num_failures_before_success_; |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
314 } | 314 } |
315 | 315 |
316 TEST_F(RenderWidgetCompositorOutputSurfaceTest, FallbackSuccessNormalSuccess) { | 316 TEST_F(RenderWidgetCompositorOutputSurfaceTest, FallbackSuccessNormalSuccess) { |
317 // The first success is a fallback, but the next should not be a fallback. | 317 // The first success is a fallback, but the next should not be a fallback. |
318 RunTest(false, RenderWidgetCompositor::OUTPUT_SURFACE_RETRIES_BEFORE_FALLBACK, | 318 RunTest(false, RenderWidgetCompositor::OUTPUT_SURFACE_RETRIES_BEFORE_FALLBACK, |
319 1, 1); | 319 1, 1); |
320 } | 320 } |
321 | 321 |
322 } // namespace | 322 } // namespace |
323 } // namespace content | 323 } // namespace content |
OLD | NEW |