aw: Ensure invalidation when pipeline is stalled

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/global_tile_manager.h"
 #include "android_webview/browser/global_tile_manager_client.h"
 #include "android_webview/browser/parent_compositor_draw_constraints.h"
@@ skipping 126 matching lines @@
                              gfx::Vector2dF current_fling_velocity) OVERRIDE;
 
   // GlobalTileManagerClient overrides.
   virtual content::SynchronousCompositorMemoryPolicy GetMemoryPolicy()
       const OVERRIDE;
   virtual void SetMemoryPolicy(
       content::SynchronousCompositorMemoryPolicy new_policy,
       bool effective_immediately) OVERRIDE;
 
   void UpdateParentDrawConstraints();
+  void DidSkipCommitFrame();
 
  private:
   void SetTotalRootLayerScrollOffset(gfx::Vector2dF new_value_dip);
   // 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);
   bool OnDrawSoftware(jobject java_canvas);
   bool CompositeSW(SkCanvas* canvas);
   void DidComposite();
-  void SkippedCompositeInDraw();
+  void DidSkipCompositeInDraw();
   scoped_ptr<base::Value> RootLayerStateAsValue(
       const gfx::Vector2dF& total_scroll_offset_dip,
       const gfx::SizeF& scrollable_size_dip);
 
   bool OnDrawHardware(jobject java_canvas);
   scoped_ptr<cc::CompositorFrame> CompositeHw();
   void ReturnUnusedResource(scoped_ptr<cc::CompositorFrame> frame);
   void ReturnResourceFromParent();
 
   // If we call up view invalidate and OnDraw is not called before a deadline,
@@ skipping 41 matching lines @@
   // 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_;
 
   int width_;
   int height_;
 
@@ skipping 10 matching lines @@
 
   GlobalTileManager::Key tile_manager_key_;
   content::SynchronousCompositorMemoryPolicy memory_policy_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserViewRenderer);
 };
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_H_