Move SharedRendererState ownership to AwContents

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>
@@ skipping 33 matching lines @@
 
   BrowserViewRenderer(
       BrowserViewRendererClient* client,
       const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner,
       bool disable_page_visibility);
 
   ~BrowserViewRenderer() override;
 
   void RegisterWithWebContents(content::WebContents* web_contents);
 
+  void SetSharedRendererState(SharedRendererState* shared_renderer_state);
   SharedRendererState* GetAwDrawGLViewContext();
   bool RequestDrawGL(bool wait_for_completion);
 
   // 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.
-  bool OnDrawHardware();
+  scoped_ptr<ChildFrame> OnDrawHardware(
+      const ParentCompositorDrawConstraints& parent_draw_constraints);
   bool OnDrawSoftware(SkCanvas* canvas);
 
   // CapturePicture API methods.
   skia::RefPtr<SkPicture> CapturePicture(int width, int height);
   void EnableOnNewPicture(bool enabled);
 
   void ClearView();
 
   void SetOffscreenPreRaster(bool enabled);
+  bool offscreen_pre_raster() {
+    return offscreen_pre_raster_;
+  }
 
   // View update notifications.
   void SetIsPaused(bool paused);
   void SetViewVisibility(bool visible);
   void SetWindowVisibility(bool visible);
   void OnSizeChanged(int width, int height);
   void OnAttachedToWindow(int width, int height);
   void OnDetachedFromWindow();
   void OnComputeScroll(base::TimeTicks animation_time);
 
   // Sets the scale for logical<->physical pixel conversions.
   void SetDipScale(float dip_scale);
   float dip_scale() const { return dip_scale_; }
   float page_scale_factor() const { return page_scale_factor_; }
 
   // Set the root layer scroll offset to |new_value|.
   void ScrollTo(const gfx::Vector2d& new_value);
 
   // Android views hierarchy gluing.
   bool IsVisible() const;
   gfx::Rect GetScreenRect() const;
   bool attached_to_window() const { return attached_to_window_; }
   bool hardware_enabled() const { return hardware_enabled_; }
   gfx::Size size() const { return size_; }
-  void ReleaseHardware();
 
   bool IsClientVisible() const;
   void TrimMemory(const int level, const bool visible);
 
   // SynchronousCompositorClient overrides.
   void DidInitializeCompositor(
       content::SynchronousCompositor* compositor) override;
   void DidDestroyCompositor(
       content::SynchronousCompositor* compositor) override;
   void DidBecomeCurrent(content::SynchronousCompositor* compositor) override;
   void PostInvalidate() override;
   void DidUpdateContent() override;
   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 UpdateParentDrawConstraints();
   void DetachFunctorFromView();
 
+  gfx::Vector2d last_on_draw_scroll_offset() {

[boliu, 2016/03/23 20:42:32]

I was wrong. last_on_draw_scroll_offset_ can be removed from BVR altogether, and
just stay in AwC.

[Tobias Sargeant, 2016/03/24 16:53:05]

Done.

+    return last_on_draw_scroll_offset_;
+  }
+
+  gfx::Rect GetInterestRect(bool is_layer) const;
+  void UpdateMemoryPolicy(gfx::Rect interest_rect);

[boliu, 2016/03/23 20:42:32]

GetInterestRect and UpdateMemoryPolicy can be merged into a single

void SetParentDrawConstraints(const ParentCompositorDrawConstraints&);

UpdateMemoryPolicy don't need to be exposed to AwC I think

[boliu, 2016/03/23 20:46:11]

As in SetParentDrawConstraints will also do the UpdateMemoryPolicy work. Just
that the name doesn't need to be exposed to AwC.

Actually, all this should just be done as part of OnDrawHardware.

+
+  void ReturnUnusedResource(scoped_ptr<ChildFrame> frame);
+  void ReturnResourceFromParent(uint32_t compositor_id,
+                                uint32_t output_surface_id,
+                                cc::ReturnedResourceArray* resources);
+
  private:
   void SetTotalRootLayerScrollOffset(const gfx::Vector2dF& new_value_dip);
   bool CanOnDraw();
   void UpdateCompositorIsActive();
   bool CompositeSW(SkCanvas* canvas);
   scoped_ptr<base::trace_event::ConvertableToTraceFormat> RootLayerStateAsValue(
       const gfx::Vector2dF& total_scroll_offset_dip,
       const gfx::SizeF& scrollable_size_dip);
 
-  void ReturnUnusedResource(scoped_ptr<ChildFrame> frame);
-  void ReturnResourceFromParent();
-
   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* client_;
-  SharedRendererState shared_renderer_state_;
+  SharedRendererState* shared_renderer_state_;

[boliu, 2016/03/23 20:42:32]

should remove this from this patch, only one usage left.

   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
   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_;
 
@@ skipping 20 matching lines @@
 
   // Current scroll offset in CSS pixels.
   // TODO(miletus): Make scroll_offset_dip_ a gfx::ScrollOffset.
   gfx::Vector2dF scroll_offset_dip_;
 
   // Max scroll offset in CSS pixels.
   // TODO(miletus): Make max_scroll_offset_dip_ a gfx::ScrollOffset.
   gfx::Vector2dF max_scroll_offset_dip_;
 
   // Used to prevent rounding errors from accumulating enough to generate
-  // visible skew (especially noticeable when scrolling up and down in the same
+  // visible skew (especially noticeable when scrolling up and down in the
+  // same

[boliu, 2016/03/23 20:42:32]

undo this change

[Tobias Sargeant, 2016/03/24 16:53:05]

Done.

   // spot over a period of time).
   // TODO(miletus): Make overscroll_rounding_error_ a gfx::ScrollOffset.
   gfx::Vector2dF overscroll_rounding_error_;
 
   uint32_t next_compositor_id_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserViewRenderer);
 };
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_H_