WIP Handle AwContents needing multiple live functors.

android_webview/browser/test/rendering_test.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/browser/test/rendering_test.h"
 
 #include <utility>
 
 #include "android_webview/browser/browser_view_renderer.h"
 #include "android_webview/browser/child_frame.h"
@@ skipping 11 matching lines @@
 class TestBrowserViewRenderer : public BrowserViewRenderer {
  public:
   TestBrowserViewRenderer(
       RenderingTest* rendering_test,
       const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner)
       : BrowserViewRenderer(rendering_test, ui_task_runner),
         rendering_test_(rendering_test) {}
 
   ~TestBrowserViewRenderer() override {}
 
-  void OnParentDrawConstraintsUpdated() override {
-    BrowserViewRenderer::OnParentDrawConstraintsUpdated();
+  void OnParentDrawConstraintsUpdated(
+      CompositorFrameConsumer* compositor_frame_consumer) override {
+    BrowserViewRenderer::OnParentDrawConstraintsUpdated(
+        compositor_frame_consumer);
     rendering_test_->OnParentDrawConstraintsUpdated();
   }
 
  private:
   RenderingTest* const rendering_test_;
 };
 }
 
 RenderingTest::RenderingTest() : message_loop_(new base::MessageLoop) {
   ui_task_runner_ = base::ThreadTaskRunnerHandle::Get();
 }
 
 RenderingTest::~RenderingTest() {
   DCHECK(ui_task_runner_->BelongsToCurrentThread());
   if (window_.get())
     window_->Detach();
 }
 
 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());
+  functor_.reset(new Functor(base::Bind(
+      &RenderingTest::CreateRenderThreadManager, base::Unretained(this))));
+  browser_view_renderer_.reset(
+      new TestBrowserViewRenderer(this, base::ThreadTaskRunnerHandle::Get()));
+  browser_view_renderer_->SetCurrentCompositorFrameConsumer(
+      functor_->GetCompositorFrameConsumer());
   InitializeCompositor();
   Attach();
 }
 
+RenderThreadManager* RenderingTest::CreateRenderThreadManager(
+    RenderThreadManagerClient* client) {
+  return new RenderThreadManager(client, base::ThreadTaskRunnerHandle::Get());

[boliu, 2016/05/10 15:18:19]

hmm, dcheck this is the ui thread?

[Tobias Sargeant, 2016/05/13 13:23:57]

This got removed.

+}
+
 CompositorFrameConsumer* RenderingTest::GetCompositorFrameConsumer() {
-  return render_thread_manager_.get();
+  return functor_->GetCompositorFrameConsumer();
 }
 
 CompositorFrameProducer* RenderingTest::GetCompositorFrameProducer() {
   return browser_view_renderer_.get();
 }
 
 void RenderingTest::InitializeCompositor() {
   DCHECK(!compositor_.get());
   DCHECK(browser_view_renderer_.get());
   compositor_.reset(new content::TestSynchronousCompositor);
   compositor_->SetClient(browser_view_renderer_.get());
 }
 
 void RenderingTest::Attach() {
   window_.reset(
-      new FakeWindow(browser_view_renderer_.get(),
-                     base::Bind(&RenderThreadManager::DrawGL,
-                                base::Unretained(render_thread_manager_.get())),
-                     this, gfx::Rect(100, 100)));
+      new FakeWindow(browser_view_renderer_.get(), this, gfx::Rect(100, 100)));
+  window_->SetDrawFunctor(functor_.get());
 }
 
 void RenderingTest::RunTest() {
   SetUpTestHarness();
 
   ui_task_runner_->PostTask(
       FROM_HERE, base::Bind(&RenderingTest::StartTest, base::Unretained(this)));
   message_loop_->Run();
 }
 
@@ skipping 32 matching lines @@
   resource.id = resource_id;
   compositor_frame->delegated_frame_data->resource_list.push_back(resource);
   return compositor_frame;
 }
 
 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();
   draw_info->is_layer = false;
   gfx::Transform transform;
   transform.matrix().asColMajorf(draw_info->transform);
   return true;
 }
 
 void RenderingTest::OnNewPicture() {}
 
 void RenderingTest::PostInvalidate() {
   if (window_)
     window_->PostInvalidate();
 }
 
-void RenderingTest::DetachFunctorFromView() {}
-
 gfx::Point RenderingTest::GetLocationOnScreen() {
   return gfx::Point();
 }
 
 }  // namespace android_webview