WIP Handle AwContents needing multiple live functors.

android_webview/browser/test/rendering_test.h

 // 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.
 
 #ifndef ANDROID_WEBVIEW_BROWSER_TEST_RENDERING_TEST_H_
 #define ANDROID_WEBVIEW_BROWSER_TEST_RENDERING_TEST_H_
 
 #include <memory>
 
 #include "android_webview/browser/browser_view_renderer_client.h"
@@ skipping 20 matching lines @@
 
 class BrowserViewRenderer;
 class CompositorFrameConsumer;
 class CompositorFrameProducer;
 class FakeWindow;
 class RenderThreadManager;
 struct ParentCompositorDrawConstraints;
 
 class RenderingTest : public testing::Test,
                       public BrowserViewRendererClient,
-                      public RenderThreadManagerClient,
                       public WindowHooks {
  public:
   // BrowserViewRendererClient overrides.
   void OnNewPicture() override;
   void PostInvalidate() override;
   gfx::Point GetLocationOnScreen() override;
   void ScrollContainerViewTo(const gfx::Vector2d& new_value) override {}
   void UpdateScrollState(const gfx::Vector2d& max_scroll_offset,
                          const gfx::SizeF& contents_size_dip,
                          float page_scale_factor,
                          float min_page_scale_factor,
                          float max_page_scale_factor) override {}
   void DidOverscroll(const gfx::Vector2d& overscroll_delta,
                      const gfx::Vector2dF& overscroll_velocity) override {}
 
-  // RenderThreadManagerClient overrides.
-  bool RequestInvokeGL(bool wait_for_completion) override;
-  void DetachFunctorFromView() override;
-
   // WindowHooks overrides.
   void WillOnDraw() override;
   void DidOnDraw(bool success) override {}
   void WillSyncOnRT() override {}
   void DidSyncOnRT() override {}
   void WillProcessOnRT() override {}
   void DidProcessOnRT() override {}
   bool WillDrawOnRT(AwDrawGLInfo* draw_info) override;
   void DidDrawOnRT() override {}
 
   virtual void OnParentDrawConstraintsUpdated() {}
 
+  virtual RenderThreadManager* CreateRenderThreadManager(

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

return unique_ptr to imply passing ownership

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

Removed; don't need the factory any more.

+      RenderThreadManagerClient* client);
+
  protected:
 
   RenderingTest();
   ~RenderingTest() override;
 
   CompositorFrameConsumer* GetCompositorFrameConsumer();
   CompositorFrameProducer* GetCompositorFrameProducer();
 
   virtual void SetUpTestHarness();
   virtual void StartTest();
 
   void RunTest();
   void InitializeCompositor();
   void Attach();
   void EndTest();
   std::unique_ptr<cc::CompositorFrame> ConstructEmptyFrame();
   std::unique_ptr<cc::CompositorFrame> ConstructFrame(
       cc::ResourceId resource_id);
   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
   std::unique_ptr<FakeWindow> window_;
-  std::unique_ptr<RenderThreadManager> render_thread_manager_;
+  std::unique_ptr<Functor> functor_;
   std::unique_ptr<BrowserViewRenderer> browser_view_renderer_;
   std::unique_ptr<content::TestSynchronousCompositor> compositor_;
 
  private:
   void QuitMessageLoop();
 
   void DrawGL(AwDrawGLInfo* aw_draw_gl_info);
 
   const std::unique_ptr<base::MessageLoop> message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderingTest);
 };
 
 #define RENDERING_TEST_F(TEST_FIXTURE_NAME)         \
   TEST_F(TEST_FIXTURE_NAME, RunTest) { RunTest(); } \
   class NeedsSemicolon##TEST_FIXTURE_NAME {}
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_TEST_RENDERING_TEST_H_