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

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

Issue 1844343005: WIP - Control the lifetime of RenderThreadManager from Java. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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"
(...skipping 11 matching lines...) Expand all
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(!shared_renderer_state_.get());
31 shared_renderer_state_.reset( 31 shared_renderer_state_.reset(
32 new SharedRendererState(this, base::ThreadTaskRunnerHandle::Get())); 32 new SharedRendererState(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 shared_renderer_state_->SetClient(this);
35 browser_view_renderer_->SetSharedRendererState(shared_renderer_state_.get()); 36 browser_view_renderer_->SetSharedRendererState(shared_renderer_state_.get());
36 InitializeCompositor(); 37 InitializeCompositor();
37 Attach(); 38 Attach();
38 } 39 }
39 40
40 void RenderingTest::InitializeCompositor() { 41 void RenderingTest::InitializeCompositor() {
41 DCHECK(!compositor_.get()); 42 DCHECK(!compositor_.get());
42 DCHECK(browser_view_renderer_.get()); 43 DCHECK(browser_view_renderer_.get());
43 compositor_.reset(new content::TestSynchronousCompositor); 44 compositor_.reset(new content::TestSynchronousCompositor);
44 compositor_->SetClient(browser_view_renderer_.get()); 45 compositor_->SetClient(browser_view_renderer_.get());
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698