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

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

Issue 1943963003: WIP Handle AwContents needing multiple live functors. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed; unittests TODO Created 4 years, 7 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 class TestBrowserViewRenderer : public BrowserViewRenderer { 22 class TestBrowserViewRenderer : public BrowserViewRenderer {
23 public: 23 public:
24 TestBrowserViewRenderer( 24 TestBrowserViewRenderer(
25 RenderingTest* rendering_test, 25 RenderingTest* rendering_test,
26 const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner) 26 const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner)
27 : BrowserViewRenderer(rendering_test, ui_task_runner), 27 : BrowserViewRenderer(rendering_test, ui_task_runner),
28 rendering_test_(rendering_test) {} 28 rendering_test_(rendering_test) {}
29 29
30 ~TestBrowserViewRenderer() override {} 30 ~TestBrowserViewRenderer() override {}
31 31
32 void OnParentDrawConstraintsUpdated() override { 32 void OnParentDrawConstraintsUpdated(
33 BrowserViewRenderer::OnParentDrawConstraintsUpdated(); 33 CompositorFrameConsumer* compositor_frame_consumer) override {
34 BrowserViewRenderer::OnParentDrawConstraintsUpdated(
35 compositor_frame_consumer);
34 rendering_test_->OnParentDrawConstraintsUpdated(); 36 rendering_test_->OnParentDrawConstraintsUpdated();
35 } 37 }
36 38
37 private: 39 private:
38 RenderingTest* const rendering_test_; 40 RenderingTest* const rendering_test_;
39 }; 41 };
40 } 42 }
41 43
42 RenderingTest::RenderingTest() : message_loop_(new base::MessageLoop) { 44 RenderingTest::RenderingTest() : message_loop_(new base::MessageLoop) {
43 ui_task_runner_ = base::ThreadTaskRunnerHandle::Get(); 45 ui_task_runner_ = base::ThreadTaskRunnerHandle::Get();
44 } 46 }
45 47
46 RenderingTest::~RenderingTest() { 48 RenderingTest::~RenderingTest() {
47 DCHECK(ui_task_runner_->BelongsToCurrentThread()); 49 DCHECK(ui_task_runner_->BelongsToCurrentThread());
48 if (window_.get()) 50 if (window_.get())
49 window_->Detach(); 51 window_->Detach();
50 } 52 }
51 53
52 void RenderingTest::SetUpTestHarness() { 54 void RenderingTest::SetUpTestHarness() {
53 DCHECK(!browser_view_renderer_.get()); 55 DCHECK(!browser_view_renderer_.get());
54 DCHECK(!render_thread_manager_.get()); 56 DCHECK(!render_thread_manager_.get());
55 render_thread_manager_.reset( 57 render_thread_manager_.reset(
56 new RenderThreadManager(this, base::ThreadTaskRunnerHandle::Get())); 58 new RenderThreadManager(this, base::ThreadTaskRunnerHandle::Get()));
57 browser_view_renderer_.reset(new TestBrowserViewRenderer( 59 browser_view_renderer_.reset(new TestBrowserViewRenderer(
58 this, base::ThreadTaskRunnerHandle::Get())); 60 this, base::ThreadTaskRunnerHandle::Get()));
59 browser_view_renderer_->SetCompositorFrameConsumer( 61 browser_view_renderer_->SetCurrentCompositorFrameConsumer(
60 render_thread_manager_.get()); 62 render_thread_manager_.get());
61 InitializeCompositor(); 63 InitializeCompositor();
62 Attach(); 64 Attach();
63 } 65 }
64 66
65 CompositorFrameConsumer* RenderingTest::GetCompositorFrameConsumer() { 67 CompositorFrameConsumer* RenderingTest::GetCompositorFrameConsumer() {
66 return render_thread_manager_.get(); 68 return render_thread_manager_.get();
67 } 69 }
68 70
69 CompositorFrameProducer* RenderingTest::GetCompositorFrameProducer() { 71 CompositorFrameProducer* RenderingTest::GetCompositorFrameProducer() {
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 window_->PostInvalidate(); 158 window_->PostInvalidate();
157 } 159 }
158 160
159 void RenderingTest::DetachFunctorFromView() {} 161 void RenderingTest::DetachFunctorFromView() {}
160 162
161 gfx::Point RenderingTest::GetLocationOnScreen() { 163 gfx::Point RenderingTest::GetLocationOnScreen() {
162 return gfx::Point(); 164 return gfx::Point();
163 } 165 }
164 166
165 } // namespace android_webview 167 } // namespace android_webview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698