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" |
| 11 #include "android_webview/browser/shared_renderer_state.h" |
11 #include "base/location.h" | 12 #include "base/location.h" |
12 #include "base/thread_task_runner_handle.h" | 13 #include "base/thread_task_runner_handle.h" |
13 #include "cc/output/compositor_frame.h" | 14 #include "cc/output/compositor_frame.h" |
14 #include "content/public/test/test_synchronous_compositor_android.h" | 15 #include "content/public/test/test_synchronous_compositor_android.h" |
15 | 16 |
16 namespace android_webview { | 17 namespace android_webview { |
17 | 18 |
18 RenderingTest::RenderingTest() : message_loop_(new base::MessageLoop) { | 19 RenderingTest::RenderingTest() : message_loop_(new base::MessageLoop) { |
19 ui_task_runner_ = base::ThreadTaskRunnerHandle::Get(); | 20 ui_task_runner_ = base::ThreadTaskRunnerHandle::Get(); |
20 } | 21 } |
21 | 22 |
22 RenderingTest::~RenderingTest() { | 23 RenderingTest::~RenderingTest() { |
23 if (window_.get()) | 24 if (window_.get()) |
24 window_->Detach(); | 25 window_->Detach(); |
25 } | 26 } |
26 | 27 |
27 void RenderingTest::SetUpTestHarness() { | 28 void RenderingTest::SetUpTestHarness() { |
28 DCHECK(!browser_view_renderer_.get()); | 29 DCHECK(!browser_view_renderer_.get()); |
| 30 DCHECK(!shared_renderer_state_.get()); |
| 31 shared_renderer_state_.reset(new SharedRendererState( |
| 32 base::ThreadTaskRunnerHandle::Get())); |
29 browser_view_renderer_.reset(new BrowserViewRenderer( | 33 browser_view_renderer_.reset(new BrowserViewRenderer( |
30 this, base::ThreadTaskRunnerHandle::Get(), false)); | 34 this, base::ThreadTaskRunnerHandle::Get(), false)); |
| 35 browser_view_renderer_->SetSharedRendererState(shared_renderer_state_.get()); |
31 InitializeCompositor(); | 36 InitializeCompositor(); |
32 Attach(); | 37 Attach(); |
33 } | 38 } |
34 | 39 |
35 void RenderingTest::InitializeCompositor() { | 40 void RenderingTest::InitializeCompositor() { |
36 DCHECK(!compositor_.get()); | 41 DCHECK(!compositor_.get()); |
37 DCHECK(browser_view_renderer_.get()); | 42 DCHECK(browser_view_renderer_.get()); |
38 compositor_.reset(new content::TestSynchronousCompositor); | 43 compositor_.reset(new content::TestSynchronousCompositor); |
39 compositor_->SetClient(browser_view_renderer_.get()); | 44 compositor_->SetClient(browser_view_renderer_.get()); |
40 } | 45 } |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 } | 113 } |
109 | 114 |
110 void RenderingTest::DetachFunctorFromView() { | 115 void RenderingTest::DetachFunctorFromView() { |
111 } | 116 } |
112 | 117 |
113 gfx::Point RenderingTest::GetLocationOnScreen() { | 118 gfx::Point RenderingTest::GetLocationOnScreen() { |
114 return gfx::Point(); | 119 return gfx::Point(); |
115 } | 120 } |
116 | 121 |
117 } // namespace android_webview | 122 } // namespace android_webview |
OLD | NEW |