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 "cc/output/begin_frame_args.h" | 7 #include "cc/output/begin_frame_args.h" |
8 #include "content/public/test/mock_render_thread.h" | 8 #include "content/public/test/mock_render_thread.h" |
9 #include "content/renderer/render_widget.h" | 9 #include "content/renderer/render_widget.h" |
10 #include "testing/gmock/include/gmock/gmock.h" | 10 #include "testing/gmock/include/gmock/gmock.h" |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 | 55 |
56 private: | 56 private: |
57 DISALLOW_COPY_AND_ASSIGN(RenderWidgetCompositorTest); | 57 DISALLOW_COPY_AND_ASSIGN(RenderWidgetCompositorTest); |
58 }; | 58 }; |
59 | 59 |
60 TEST_F(RenderWidgetCompositorTest, BeginMainFrame) { | 60 TEST_F(RenderWidgetCompositorTest, BeginMainFrame) { |
61 base::TimeTicks frame_time(base::TimeTicks() + | 61 base::TimeTicks frame_time(base::TimeTicks() + |
62 base::TimeDelta::FromSeconds(1)); | 62 base::TimeDelta::FromSeconds(1)); |
63 base::TimeTicks deadline(base::TimeTicks() + base::TimeDelta::FromSeconds(2)); | 63 base::TimeTicks deadline(base::TimeTicks() + base::TimeDelta::FromSeconds(2)); |
64 base::TimeDelta interval(base::TimeDelta::FromSeconds(3)); | 64 base::TimeDelta interval(base::TimeDelta::FromSeconds(3)); |
65 cc::BeginFrameArgs args(cc::BeginFrameArgs::Create( | 65 cc::BeginFrameArgs args( |
66 frame_time, deadline, interval, cc::BeginFrameArgs::NORMAL)); | 66 cc::BeginFrameArgs::Create(BEGINFRAME_FROM_HERE, frame_time, deadline, |
| 67 interval, cc::BeginFrameArgs::NORMAL)); |
67 | 68 |
68 EXPECT_CALL(render_widget_->mock_webwidget_, | 69 EXPECT_CALL(render_widget_->mock_webwidget_, |
69 beginFrame(AllOf( | 70 beginFrame(AllOf( |
70 Field(&blink::WebBeginFrameArgs::lastFrameTimeMonotonic, 1), | 71 Field(&blink::WebBeginFrameArgs::lastFrameTimeMonotonic, 1), |
71 Field(&blink::WebBeginFrameArgs::deadline, 2), | 72 Field(&blink::WebBeginFrameArgs::deadline, 2), |
72 Field(&blink::WebBeginFrameArgs::interval, 3)))); | 73 Field(&blink::WebBeginFrameArgs::interval, 3)))); |
73 | 74 |
74 render_widget_compositor_->BeginMainFrame(args); | 75 render_widget_compositor_->BeginMainFrame(args); |
75 } | 76 } |
76 | 77 |
77 } // namespace content | 78 } // namespace content |
OLD | NEW |