Remove android webview rendering cruft

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 "android_webview/browser/parent_compositor_draw_constraints.h"
 #include "android_webview/browser/shared_renderer_state.h"
 #include "base/callback.h"
 #include "base/cancelable_callback.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/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 {
  public:
   static void CalculateTileMemoryPolicy();
   static BrowserViewRenderer* FromWebContents(
       content::WebContents* web_contents);
 
   BrowserViewRenderer(
@@ skipping 64 matching lines @@
                             const gfx::SizeF& scrollable_size_dip,
                             float page_scale_factor,
                             float min_page_scale_factor,
                             float max_page_scale_factor) override;
   bool IsExternalFlingActive() const override;
   void DidOverscroll(gfx::Vector2dF accumulated_overscroll,
                      gfx::Vector2dF latest_overscroll_delta,
                      gfx::Vector2dF current_fling_velocity) override;
 
   void UpdateParentDrawConstraints();
-  void DidSkipCommitFrame();
   void DetachFunctorFromView();
 
  private:
   void SetTotalRootLayerScrollOffset(gfx::Vector2dF new_value_dip);
   bool CanOnDraw();
   // Checks the continuous invalidate and block invalidate state, and schedule
   // invalidates appropriately. If |force_invalidate| is true, then send a view
-  // invalidate regardless of compositor expectation. If |skip_reschedule_tick|
-  // is true and if there is already a pending fallback tick, don't reschedule
-  // them.
-  void EnsureContinuousInvalidation(bool force_invalidate,
-                                    bool skip_reschedule_tick);
+  // invalidate regardless of compositor expectation.
+  void EnsureContinuousInvalidation(bool force_invalidate);
   bool CompositeSW(SkCanvas* canvas);
   void DidComposite();
-  void DidSkipCompositeInDraw();
   scoped_refptr<base::trace_event::ConvertableToTraceFormat>
   RootLayerStateAsValue(const gfx::Vector2dF& total_scroll_offset_dip,
                         const gfx::SizeF& scrollable_size_dip);
 
-  scoped_ptr<cc::CompositorFrame> CompositeHw();
-  void ReturnUnusedResource(scoped_ptr<cc::CompositorFrame> frame);
+  bool CompositeHw();
+  void ReturnUnusedResource(scoped_ptr<ChildFrame> frame);
   void ReturnResourceFromParent();
 
   // If we call up view invalidate and OnDraw is not called before a deadline,
   // then we keep ticking the SynchronousCompositor so it can make progress.
   // Do this in a two stage tick due to native MessageLoop favors delayed task,
   // so ensure delayed task is inserted only after the draw task returns.
   void PostFallbackTick();
   void FallbackTickFired();
 
   // Force invoke the compositor to run produce a 1x1 software frame that is
@@ skipping 22 matching lines @@
   float dip_scale_;
   float page_scale_factor_;
   bool on_new_picture_enable_;
   bool clear_view_;
 
   bool offscreen_pre_raster_;
 
   gfx::Vector2d last_on_draw_scroll_offset_;
   gfx::Rect last_on_draw_global_visible_rect_;
 
-  // The draw constraints from the parent compositor. These are only used for
-  // tiling priority.
-  ParentCompositorDrawConstraints parent_draw_constraints_;
-
   // When true, we should continuously invalidate and keep drawing, for example
   // to drive animation. This value is set by the compositor and should always
   // reflect the expectation of the compositor and not be reused for other
   // states.
   bool compositor_needs_continuous_invalidate_;
 
-  bool invalidate_after_composite_;
-
   // Used to block additional invalidates while one is already pending.
   bool block_invalidates_;
 
   base::CancelableClosure post_fallback_tick_;
   base::CancelableClosure fallback_tick_fired_;
   bool fallback_tick_pending_;
 
   gfx::Size size_;
 
   // Current scroll offset in CSS pixels.
   gfx::Vector2dF scroll_offset_dip_;
 
   // Max scroll offset in CSS pixels.
   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
   // spot over a period of time).
   gfx::Vector2dF overscroll_rounding_error_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserViewRenderer);
 };
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_H_