Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(93)

Side by Side Diff: android_webview/browser/test/rendering_test.cc

Issue 1858853002: Rename SharedRendererState to RenderThreadManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « android_webview/browser/test/rendering_test.h ('k') | android_webview/native/aw_contents.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "android_webview/browser/render_thread_manager.h"
12 #include "base/location.h" 12 #include "base/location.h"
13 #include "base/thread_task_runner_handle.h" 13 #include "base/thread_task_runner_handle.h"
14 #include "cc/output/compositor_frame.h" 14 #include "cc/output/compositor_frame.h"
15 #include "content/public/test/test_synchronous_compositor_android.h" 15 #include "content/public/test/test_synchronous_compositor_android.h"
16 16
17 namespace android_webview { 17 namespace android_webview {
18 18
19 RenderingTest::RenderingTest() : message_loop_(new base::MessageLoop) { 19 RenderingTest::RenderingTest() : message_loop_(new base::MessageLoop) {
20 ui_task_runner_ = base::ThreadTaskRunnerHandle::Get(); 20 ui_task_runner_ = base::ThreadTaskRunnerHandle::Get();
21 } 21 }
22 22
23 RenderingTest::~RenderingTest() { 23 RenderingTest::~RenderingTest() {
24 if (window_.get()) 24 if (window_.get())
25 window_->Detach(); 25 window_->Detach();
26 } 26 }
27 27
28 void RenderingTest::SetUpTestHarness() { 28 void RenderingTest::SetUpTestHarness() {
29 DCHECK(!browser_view_renderer_.get()); 29 DCHECK(!browser_view_renderer_.get());
30 DCHECK(!shared_renderer_state_.get()); 30 DCHECK(!render_thread_manager_.get());
31 shared_renderer_state_.reset( 31 render_thread_manager_.reset(
32 new SharedRendererState(this, base::ThreadTaskRunnerHandle::Get())); 32 new RenderThreadManager(this, base::ThreadTaskRunnerHandle::Get()));
33 browser_view_renderer_.reset(new BrowserViewRenderer( 33 browser_view_renderer_.reset(new BrowserViewRenderer(
34 this, base::ThreadTaskRunnerHandle::Get(), false)); 34 this, base::ThreadTaskRunnerHandle::Get(), false));
35 browser_view_renderer_->SetSharedRendererState(shared_renderer_state_.get()); 35 browser_view_renderer_->SetRenderThreadManager(render_thread_manager_.get());
36 InitializeCompositor(); 36 InitializeCompositor();
37 Attach(); 37 Attach();
38 } 38 }
39 39
40 void RenderingTest::InitializeCompositor() { 40 void RenderingTest::InitializeCompositor() {
41 DCHECK(!compositor_.get()); 41 DCHECK(!compositor_.get());
42 DCHECK(browser_view_renderer_.get()); 42 DCHECK(browser_view_renderer_.get());
43 compositor_.reset(new content::TestSynchronousCompositor); 43 compositor_.reset(new content::TestSynchronousCompositor);
44 compositor_->SetClient(browser_view_renderer_.get()); 44 compositor_->SetClient(browser_view_renderer_.get());
45 } 45 }
46 46
47 void RenderingTest::Attach() { 47 void RenderingTest::Attach() {
48 window_.reset(new FakeWindow(browser_view_renderer_.get(), 48 window_.reset(new FakeWindow(browser_view_renderer_.get(),
49 shared_renderer_state_.get(), this, 49 render_thread_manager_.get(), this,
50 gfx::Rect(100, 100))); 50 gfx::Rect(100, 100)));
51 } 51 }
52 52
53 void RenderingTest::RunTest() { 53 void RenderingTest::RunTest() {
54 SetUpTestHarness(); 54 SetUpTestHarness();
55 55
56 ui_task_runner_->PostTask( 56 ui_task_runner_->PostTask(
57 FROM_HERE, base::Bind(&RenderingTest::StartTest, base::Unretained(this))); 57 FROM_HERE, base::Bind(&RenderingTest::StartTest, base::Unretained(this)));
58 message_loop_->Run(); 58 message_loop_->Run();
59 } 59 }
(...skipping 29 matching lines...) Expand all
89 void RenderingTest::WillOnDraw() { 89 void RenderingTest::WillOnDraw() {
90 DCHECK(compositor_); 90 DCHECK(compositor_);
91 compositor_->SetHardwareFrame(0u, ConstructEmptyFrame()); 91 compositor_->SetHardwareFrame(0u, ConstructEmptyFrame());
92 } 92 }
93 93
94 bool RenderingTest::RequestDrawGL(bool wait_for_completion) { 94 bool RenderingTest::RequestDrawGL(bool wait_for_completion) {
95 window_->RequestDrawGL(wait_for_completion); 95 window_->RequestDrawGL(wait_for_completion);
96 return true; 96 return true;
97 } 97 }
98 98
99 bool RenderingTest::WillDrawOnRT(SharedRendererState* functor, 99 bool RenderingTest::WillDrawOnRT(RenderThreadManager* functor,
100 AwDrawGLInfo* draw_info) { 100 AwDrawGLInfo* draw_info) {
101 draw_info->width = window_->surface_size().width(); 101 draw_info->width = window_->surface_size().width();
102 draw_info->height = window_->surface_size().height(); 102 draw_info->height = window_->surface_size().height();
103 draw_info->is_layer = false; 103 draw_info->is_layer = false;
104 gfx::Transform transform; 104 gfx::Transform transform;
105 transform.matrix().asColMajorf(draw_info->transform); 105 transform.matrix().asColMajorf(draw_info->transform);
106 return true; 106 return true;
107 } 107 }
108 108
109 void RenderingTest::OnNewPicture() { 109 void RenderingTest::OnNewPicture() {
110 } 110 }
111 111
112 void RenderingTest::PostInvalidate() { 112 void RenderingTest::PostInvalidate() {
113 if (window_) 113 if (window_)
114 window_->PostInvalidate(); 114 window_->PostInvalidate();
115 } 115 }
116 116
117 void RenderingTest::OnParentDrawConstraintsUpdated() { 117 void RenderingTest::OnParentDrawConstraintsUpdated() {
118 browser_view_renderer_->OnParentDrawConstraintsUpdated(); 118 browser_view_renderer_->OnParentDrawConstraintsUpdated();
119 } 119 }
120 120
121 void RenderingTest::DetachFunctorFromView() { 121 void RenderingTest::DetachFunctorFromView() {
122 } 122 }
123 123
124 gfx::Point RenderingTest::GetLocationOnScreen() { 124 gfx::Point RenderingTest::GetLocationOnScreen() {
125 return gfx::Point(); 125 return gfx::Point();
126 } 126 }
127 127
128 } // namespace android_webview 128 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/browser/test/rendering_test.h ('k') | android_webview/native/aw_contents.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698