| Index: android_webview/browser/browser_view_renderer.h
|
| diff --git a/android_webview/browser/browser_view_renderer.h b/android_webview/browser/browser_view_renderer.h
|
| index ee6aa29914b2c8fdca6fada0ab33a5f3bf0516b6..36d74524b3577750998a2f69c10954441ea4bc85 100644
|
| --- a/android_webview/browser/browser_view_renderer.h
|
| +++ b/android_webview/browser/browser_view_renderer.h
|
| @@ -109,7 +109,6 @@ class BrowserViewRenderer : public content::SynchronousCompositorClient {
|
| gfx::Vector2dF current_fling_velocity) override;
|
|
|
| void UpdateParentDrawConstraints();
|
| - void DidSkipCommitFrame();
|
| void DetachFunctorFromView();
|
|
|
| private:
|
| @@ -117,19 +116,15 @@ class BrowserViewRenderer : public content::SynchronousCompositorClient {
|
| 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();
|
| + bool CompositeHw();
|
| void ReturnUnusedResource(scoped_ptr<cc::CompositorFrame> frame);
|
| void ReturnResourceFromParent();
|
|
|
| @@ -183,8 +178,6 @@ class BrowserViewRenderer : public content::SynchronousCompositorClient {
|
| // states.
|
| bool compositor_needs_continuous_invalidate_;
|
|
|
| - bool invalidate_after_composite_;
|
| -
|
| // Used to block additional invalidates while one is already pending.
|
| bool block_invalidates_;
|
|
|
|
|