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 "android_webview/browser/test/rendering_test.h" | 5 #include "android_webview/browser/test/rendering_test.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "android_webview/browser/browser_view_renderer.h" | 9 #include "android_webview/browser/browser_view_renderer.h" |
10 #include "android_webview/browser/child_frame.h" | 10 #include "android_webview/browser/child_frame.h" |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 ui_task_runner_->PostTask( | 66 ui_task_runner_->PostTask( |
67 FROM_HERE, | 67 FROM_HERE, |
68 base::Bind(&RenderingTest::QuitMessageLoop, base::Unretained(this))); | 68 base::Bind(&RenderingTest::QuitMessageLoop, base::Unretained(this))); |
69 } | 69 } |
70 | 70 |
71 void RenderingTest::QuitMessageLoop() { | 71 void RenderingTest::QuitMessageLoop() { |
72 DCHECK_EQ(base::MessageLoop::current(), message_loop_.get()); | 72 DCHECK_EQ(base::MessageLoop::current(), message_loop_.get()); |
73 message_loop_->QuitWhenIdle(); | 73 message_loop_->QuitWhenIdle(); |
74 } | 74 } |
75 | 75 |
76 scoped_ptr<cc::CompositorFrame> RenderingTest::ConstructEmptyFrame() { | 76 std::unique_ptr<cc::CompositorFrame> RenderingTest::ConstructEmptyFrame() { |
77 scoped_ptr<cc::CompositorFrame> compositor_frame(new cc::CompositorFrame); | 77 std::unique_ptr<cc::CompositorFrame> compositor_frame( |
78 scoped_ptr<cc::DelegatedFrameData> frame(new cc::DelegatedFrameData); | 78 new cc::CompositorFrame); |
79 scoped_ptr<cc::RenderPass> root_pass(cc::RenderPass::Create()); | 79 std::unique_ptr<cc::DelegatedFrameData> frame(new cc::DelegatedFrameData); |
| 80 std::unique_ptr<cc::RenderPass> root_pass(cc::RenderPass::Create()); |
80 gfx::Rect viewport(browser_view_renderer_->size()); | 81 gfx::Rect viewport(browser_view_renderer_->size()); |
81 root_pass->SetNew(cc::RenderPassId(1, 1), viewport, viewport, | 82 root_pass->SetNew(cc::RenderPassId(1, 1), viewport, viewport, |
82 gfx::Transform()); | 83 gfx::Transform()); |
83 frame->render_pass_list.push_back(std::move(root_pass)); | 84 frame->render_pass_list.push_back(std::move(root_pass)); |
84 compositor_frame->delegated_frame_data = std::move(frame); | 85 compositor_frame->delegated_frame_data = std::move(frame); |
85 return compositor_frame; | 86 return compositor_frame; |
86 } | 87 } |
87 | 88 |
88 void RenderingTest::WillOnDraw() { | 89 void RenderingTest::WillOnDraw() { |
89 DCHECK(compositor_); | 90 DCHECK(compositor_); |
(...skipping 28 matching lines...) Expand all Loading... |
118 } | 119 } |
119 | 120 |
120 void RenderingTest::DetachFunctorFromView() { | 121 void RenderingTest::DetachFunctorFromView() { |
121 } | 122 } |
122 | 123 |
123 gfx::Point RenderingTest::GetLocationOnScreen() { | 124 gfx::Point RenderingTest::GetLocationOnScreen() { |
124 return gfx::Point(); | 125 return gfx::Point(); |
125 } | 126 } |
126 | 127 |
127 } // namespace android_webview | 128 } // namespace android_webview |
OLD | NEW |