WIP Handle AwContents needing multiple live functors.

android_webview/browser/test/rendering_test.cc

Index: android_webview/browser/test/rendering_test.cc
diff --git a/android_webview/browser/test/rendering_test.cc b/android_webview/browser/test/rendering_test.cc
index 6cbe3c13b11a63ac6fe24d62d6dacd650bf5cce2..31ff112e79cd3feed521fe5f11a74f33e3d44dc6 100644
--- a/android_webview/browser/test/rendering_test.cc
+++ b/android_webview/browser/test/rendering_test.cc
@@ -29,8 +29,10 @@ class TestBrowserViewRenderer : public BrowserViewRenderer {
 
   ~TestBrowserViewRenderer() override {}
 
-  void OnParentDrawConstraintsUpdated() override {
-    BrowserViewRenderer::OnParentDrawConstraintsUpdated();
+  void OnParentDrawConstraintsUpdated(
+      CompositorFrameConsumer* compositor_frame_consumer) override {
+    BrowserViewRenderer::OnParentDrawConstraintsUpdated(
+        compositor_frame_consumer);
     rendering_test_->OnParentDrawConstraintsUpdated();
   }
 
@@ -51,19 +53,23 @@ RenderingTest::~RenderingTest() {
 
 void RenderingTest::SetUpTestHarness() {
   DCHECK(!browser_view_renderer_.get());
-  DCHECK(!render_thread_manager_.get());
-  render_thread_manager_.reset(
-      new RenderThreadManager(this, base::ThreadTaskRunnerHandle::Get()));
-  browser_view_renderer_.reset(new TestBrowserViewRenderer(
-      this, base::ThreadTaskRunnerHandle::Get()));
-  browser_view_renderer_->SetCompositorFrameConsumer(
-      render_thread_manager_.get());
+  DCHECK(!functor_.get());
+  browser_view_renderer_.reset(
+      new TestBrowserViewRenderer(this, base::ThreadTaskRunnerHandle::Get()));
   InitializeCompositor();
-  Attach();
+  std::unique_ptr<FakeWindow> window(
+      new FakeWindow(browser_view_renderer_.get(), this, gfx::Rect(100, 100)));
+  functor_.reset(new FakeFunctor);
+  functor_->Init(window.get(),
+                 std::unique_ptr<RenderThreadManager>(new RenderThreadManager(

[boliu, 2016/05/13 16:09:03]

base::WrapUnique

[Tobias Sargeant, 2016/05/13 17:02:37]

Done.

+                     functor_.get(), base::ThreadTaskRunnerHandle::Get())));
+  browser_view_renderer_->SetCurrentCompositorFrameConsumer(
+      functor_->GetCompositorFrameConsumer());
+  window_ = std::move(window);
 }
 
 CompositorFrameConsumer* RenderingTest::GetCompositorFrameConsumer() {
-  return render_thread_manager_.get();
+  return functor_->GetCompositorFrameConsumer();
 }
 
 CompositorFrameProducer* RenderingTest::GetCompositorFrameProducer() {
@@ -78,11 +84,6 @@ void RenderingTest::InitializeCompositor() {
 }
 
 void RenderingTest::Attach() {

[boliu, 2016/05/13 16:09:02]

remove

-  window_.reset(
-      new FakeWindow(browser_view_renderer_.get(),
-                     base::Bind(&RenderThreadManager::DrawGL,
-                                base::Unretained(render_thread_manager_.get())),
-                     this, gfx::Rect(100, 100)));
 }
 
 void RenderingTest::RunTest() {
@@ -130,16 +131,15 @@ std::unique_ptr<cc::CompositorFrame> RenderingTest::ConstructFrame(
   return compositor_frame;
 }
 
+FakeFunctor* RenderingTest::GetFunctorForView(BrowserViewRenderer* view) {
+  return functor_.get();
+}
+
 void RenderingTest::WillOnDraw() {
   DCHECK(compositor_);
   compositor_->SetHardwareFrame(0u, ConstructEmptyFrame());
 }
 
-bool RenderingTest::RequestInvokeGL(bool wait_for_completion) {
-  window_->RequestInvokeGL(wait_for_completion);
-  return true;
-}
-
 bool RenderingTest::WillDrawOnRT(AwDrawGLInfo* draw_info) {
   draw_info->width = window_->surface_size().width();
   draw_info->height = window_->surface_size().height();
@@ -156,8 +156,6 @@ void RenderingTest::PostInvalidate() {
     window_->PostInvalidate();
 }
 
-void RenderingTest::DetachFunctorFromView() {}
-
 gfx::Point RenderingTest::GetLocationOnScreen() {
   return gfx::Point();
 }