| 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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 DISALLOW_COPY_AND_ASSIGN(RenderWidgetCompositorTest); | 70 DISALLOW_COPY_AND_ASSIGN(RenderWidgetCompositorTest); |
| 71 }; | 71 }; |
| 72 | 72 |
| 73 TEST_F(RenderWidgetCompositorTest, BeginMainFrame) { | 73 TEST_F(RenderWidgetCompositorTest, BeginMainFrame) { |
| 74 base::TimeTicks frame_time(base::TimeTicks() + | 74 base::TimeTicks frame_time(base::TimeTicks() + |
| 75 base::TimeDelta::FromSeconds(1)); | 75 base::TimeDelta::FromSeconds(1)); |
| 76 base::TimeTicks deadline(base::TimeTicks() + base::TimeDelta::FromSeconds(2)); | 76 base::TimeTicks deadline(base::TimeTicks() + base::TimeDelta::FromSeconds(2)); |
| 77 base::TimeDelta interval(base::TimeDelta::FromSeconds(3)); | 77 base::TimeDelta interval(base::TimeDelta::FromSeconds(3)); |
| 78 cc::BeginFrameArgs args( | 78 cc::BeginFrameArgs args( |
| 79 cc::BeginFrameArgs::Create(BEGINFRAME_FROM_HERE, frame_time, deadline, | 79 cc::BeginFrameArgs::Create(BEGINFRAME_FROM_HERE, frame_time, deadline, |
| 80 interval, cc::BeginFrameArgs::NORMAL)); | 80 interval, cc::BeginFrameArgs::NORMAL, true)); |
| 81 | 81 |
| 82 EXPECT_CALL(render_widget_->mock_webwidget_, | 82 EXPECT_CALL(render_widget_->mock_webwidget_, |
| 83 beginFrame(AllOf( | 83 beginFrame(AllOf( |
| 84 Field(&blink::WebBeginFrameArgs::lastFrameTimeMonotonic, 1), | 84 Field(&blink::WebBeginFrameArgs::lastFrameTimeMonotonic, 1), |
| 85 Field(&blink::WebBeginFrameArgs::deadline, 2), | 85 Field(&blink::WebBeginFrameArgs::deadline, 2), |
| 86 Field(&blink::WebBeginFrameArgs::interval, 3)))); | 86 Field(&blink::WebBeginFrameArgs::interval, 3)))); |
| 87 | 87 |
| 88 render_widget_compositor_->BeginMainFrame(args); | 88 render_widget_compositor_->BeginMainFrame(args); |
| 89 } | 89 } |
| 90 | 90 |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 311 } | 311 } |
| 312 | 312 |
| 313 TEST_F(RenderWidgetCompositorOutputSurfaceTest, FallbackSuccessNormalSuccess) { | 313 TEST_F(RenderWidgetCompositorOutputSurfaceTest, FallbackSuccessNormalSuccess) { |
| 314 // The first success is a fallback, but the next should not be a fallback. | 314 // The first success is a fallback, but the next should not be a fallback. |
| 315 RunTest(false, RenderWidgetCompositor::OUTPUT_SURFACE_RETRIES_BEFORE_FALLBACK, | 315 RunTest(false, RenderWidgetCompositor::OUTPUT_SURFACE_RETRIES_BEFORE_FALLBACK, |
| 316 1, 1); | 316 1, 1); |
| 317 } | 317 } |
| 318 | 318 |
| 319 } // namespace | 319 } // namespace |
| 320 } // namespace content | 320 } // namespace content |
| OLD | NEW |