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> |
| 8 |
7 #include "android_webview/browser/browser_view_renderer.h" | 9 #include "android_webview/browser/browser_view_renderer.h" |
8 #include "android_webview/browser/child_frame.h" | 10 #include "android_webview/browser/child_frame.h" |
9 #include "base/location.h" | 11 #include "base/location.h" |
10 #include "base/thread_task_runner_handle.h" | 12 #include "base/thread_task_runner_handle.h" |
11 #include "cc/output/compositor_frame.h" | 13 #include "cc/output/compositor_frame.h" |
12 #include "content/public/test/test_synchronous_compositor_android.h" | 14 #include "content/public/test/test_synchronous_compositor_android.h" |
13 | 15 |
14 namespace android_webview { | 16 namespace android_webview { |
15 | 17 |
16 RenderingTest::RenderingTest() : message_loop_(new base::MessageLoop) { | 18 RenderingTest::RenderingTest() : message_loop_(new base::MessageLoop) { |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 } | 68 } |
67 | 69 |
68 void RenderingTest::SetCompositorFrame() { | 70 void RenderingTest::SetCompositorFrame() { |
69 DCHECK(compositor_.get()); | 71 DCHECK(compositor_.get()); |
70 scoped_ptr<cc::CompositorFrame> compositor_frame(new cc::CompositorFrame); | 72 scoped_ptr<cc::CompositorFrame> compositor_frame(new cc::CompositorFrame); |
71 scoped_ptr<cc::DelegatedFrameData> frame(new cc::DelegatedFrameData); | 73 scoped_ptr<cc::DelegatedFrameData> frame(new cc::DelegatedFrameData); |
72 scoped_ptr<cc::RenderPass> root_pass(cc::RenderPass::Create()); | 74 scoped_ptr<cc::RenderPass> root_pass(cc::RenderPass::Create()); |
73 gfx::Rect viewport(browser_view_renderer_->size()); | 75 gfx::Rect viewport(browser_view_renderer_->size()); |
74 root_pass->SetNew(cc::RenderPassId(1, 1), viewport, viewport, | 76 root_pass->SetNew(cc::RenderPassId(1, 1), viewport, viewport, |
75 gfx::Transform()); | 77 gfx::Transform()); |
76 frame->render_pass_list.push_back(root_pass.Pass()); | 78 frame->render_pass_list.push_back(std::move(root_pass)); |
77 compositor_frame->delegated_frame_data = frame.Pass(); | 79 compositor_frame->delegated_frame_data = std::move(frame); |
78 compositor_->SetHardwareFrame(compositor_frame.Pass()); | 80 compositor_->SetHardwareFrame(std::move(compositor_frame)); |
79 } | 81 } |
80 | 82 |
81 void RenderingTest::WillOnDraw() { | 83 void RenderingTest::WillOnDraw() { |
82 SetCompositorFrame(); | 84 SetCompositorFrame(); |
83 } | 85 } |
84 | 86 |
85 bool RenderingTest::RequestDrawGL(bool wait_for_completion) { | 87 bool RenderingTest::RequestDrawGL(bool wait_for_completion) { |
86 window_->RequestDrawGL(wait_for_completion); | 88 window_->RequestDrawGL(wait_for_completion); |
87 return true; | 89 return true; |
88 } | 90 } |
(...skipping 16 matching lines...) Expand all Loading... |
105 } | 107 } |
106 | 108 |
107 void RenderingTest::DetachFunctorFromView() { | 109 void RenderingTest::DetachFunctorFromView() { |
108 } | 110 } |
109 | 111 |
110 gfx::Point RenderingTest::GetLocationOnScreen() { | 112 gfx::Point RenderingTest::GetLocationOnScreen() { |
111 return gfx::Point(); | 113 return gfx::Point(); |
112 } | 114 } |
113 | 115 |
114 } // namespace android_webview | 116 } // namespace android_webview |
OLD | NEW |