Refactor BrowserViewRenderer-RenderThreadManager relationship.

android_webview/browser/browser_view_renderer.h

 // Copyright (c) 2013 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_BROWSER_VIEW_RENDERER_H_
 #define ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_H_
 
 #include <stddef.h>
 
 #include <map>
 
+#include "android_webview/browser/compositor_frame_consumer.h"

[boliu, 2016/04/21 17:05:39]

should only need a forward declaration in header

[Tobias Sargeant, 2016/04/21 17:48:27]

Done.

+#include "android_webview/browser/compositor_frame_producer.h"
 #include "android_webview/browser/parent_compositor_draw_constraints.h"
-#include "android_webview/browser/render_thread_manager.h"
 #include "base/callback.h"
 #include "base/cancelable_callback.h"
 #include "base/macros.h"
 #include "base/trace_event/trace_event.h"
 #include "content/public/browser/android/synchronous_compositor.h"
 #include "content/public/browser/android/synchronous_compositor_client.h"
 #include "skia/ext/refptr.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size_f.h"
 #include "ui/gfx/geometry/vector2d_f.h"
 
 class SkCanvas;
 class SkPicture;
 
 namespace content {
 class WebContents;
 }
 
 namespace android_webview {
 
 class BrowserViewRendererClient;
 class ChildFrame;
 
 // Interface for all the WebView-specific content rendering operations.
 // Provides software and hardware rendering and the Capture Picture API.
-class BrowserViewRenderer : public content::SynchronousCompositorClient {
+class BrowserViewRenderer : public content::SynchronousCompositorClient,
+                            public CompositorFrameProducer {
  public:
   static void CalculateTileMemoryPolicy();
   static BrowserViewRenderer* FromWebContents(
       content::WebContents* web_contents);
 
   BrowserViewRenderer(
       BrowserViewRendererClient* client,
       const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner,
       bool disable_page_visibility);
 
   ~BrowserViewRenderer() override;
 
   void RegisterWithWebContents(content::WebContents* web_contents);
 
   // The BrowserViewRenderer client is responsible for ensuring that the
-  // RenderThreadManager has been set correctly via this method.
-  void SetRenderThreadManager(RenderThreadManager* render_thread_manager);
+  // CompositorFrameConsumer has been set correctly via this method.
+  void SetCompositorFrameConsumer(
+      CompositorFrameConsumer* compositor_frame_consumer);
 
   // Called before either OnDrawHardware or OnDrawSoftware to set the view
   // state of this frame. |scroll| is the view's current scroll offset.
   // |global_visible_rect| is the intersection of the view size and the window
   // in window coordinates.
   void PrepareToDraw(const gfx::Vector2d& scroll,
                      const gfx::Rect& global_visible_rect);
 
   // Main handlers for view drawing. A false return value indicates no new
   // frame is produced.
@@ skipping 47 matching lines @@
   void UpdateRootLayerState(const gfx::Vector2dF& total_scroll_offset_dip,
                             const gfx::Vector2dF& max_scroll_offset_dip,
                             const gfx::SizeF& scrollable_size_dip,
                             float page_scale_factor,
                             float min_page_scale_factor,
                             float max_page_scale_factor) override;
   void DidOverscroll(const gfx::Vector2dF& accumulated_overscroll,
                      const gfx::Vector2dF& latest_overscroll_delta,
                      const gfx::Vector2dF& current_fling_velocity) override;
 
-  void OnParentDrawConstraintsUpdated();
-  void DetachFunctorFromView();
+  // CompositorFrameProducer overrides
+  void OnParentDrawConstraintsUpdated(
+      CompositorFrameConsumer* compositor_frame_consumer) override;
+  void OnCompositorFrameConsumerWillDestroy(
+      CompositorFrameConsumer* compositor_frame_consumer) override;
 
  private:
   void SetTotalRootLayerScrollOffset(const gfx::Vector2dF& new_value_dip);
   bool CanOnDraw();
   void UpdateCompositorIsActive();
   bool CompositeSW(SkCanvas* canvas);
   std::unique_ptr<base::trace_event::ConvertableToTraceFormat>
   RootLayerStateAsValue(const gfx::Vector2dF& total_scroll_offset_dip,
                         const gfx::SizeF& scrollable_size_dip);
 
   void ReturnUnusedResource(std::unique_ptr<ChildFrame> frame);
-  void ReturnResourceFromParent();
-  void ReleaseHardware();
+  void ReturnResourceFromParent(
+      CompositorFrameConsumer* compositor_frame_consumer);
+  void ReleaseHardware(CompositorFrameConsumer* compositor_frame_consumer);
 
   gfx::Vector2d max_scroll_offset() const;
 
   void UpdateMemoryPolicy();
 
   uint32_t GetCompositorID(content::SynchronousCompositor* compositor);
   // For debug tracing or logging. Return the string representation of this
   // view renderer's state.
   std::string ToString() const;
 
   BrowserViewRendererClient* const client_;
   const scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
-  RenderThreadManager* render_thread_manager_;
+  CompositorFrameConsumer* compositor_frame_consumer_;
   bool disable_page_visibility_;
 
   // The current compositor that's owned by the current RVH.
   content::SynchronousCompositor* compositor_;
   // A map from compositor's per-WebView unique ID to the compositor's raw
   // pointer. A raw pointer here is fine because the entry will be erased when
   // a compositor is destroyed.
   std::map<size_t, content::SynchronousCompositor*> compositor_map_;
 
   bool is_paused_;
@@ skipping 34 matching lines @@
   uint32_t next_compositor_id_;
 
   ParentCompositorDrawConstraints external_draw_constraints_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserViewRenderer);
 };
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_H_