| 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 27d77f3785a2625948303a12ee9a1269cd3efb76..bf708486818836c266e9543d02a48a6aaf375c63 100644
|
| --- a/android_webview/browser/browser_view_renderer.h
|
| +++ b/android_webview/browser/browser_view_renderer.h
|
| @@ -99,7 +99,6 @@ class BrowserViewRenderer : public content::SynchronousCompositorClient {
|
| gfx::Vector2dF current_fling_velocity) override;
|
|
|
| void UpdateParentDrawConstraints();
|
| - void DidSkipCommitFrame();
|
| void InvalidateOnFunctorDestroy();
|
|
|
| private:
|
| @@ -107,19 +106,16 @@ class BrowserViewRenderer : public content::SynchronousCompositorClient {
|
| bool CanOnDraw();
|
| // Posts an invalidate with fallback tick. All invalidates posted while an
|
| // invalidate is pending will be posted as a single invalidate after the
|
| - // pending invalidate is done. If |skip_reschedule_tick| is true a fallback
|
| - // tick won't be scheduled if there's one already pending.
|
| - void PostInvalidateWithFallback(bool skip_reschedule_tick);
|
| + // pending invalidate is done.
|
| + void PostInvalidateWithFallback();
|
| void UpdateCompositorIsActive();
|
| 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 ForceCompositeHw();
|
| + bool CompositeHw();
|
| void ReturnUnusedResource(scoped_ptr<cc::CompositorFrame> frame);
|
| void ReturnResourceFromParent();
|
|
|
| @@ -166,9 +162,6 @@ class BrowserViewRenderer : public content::SynchronousCompositorClient {
|
| // tiling priority.
|
| ParentCompositorDrawConstraints parent_draw_constraints_;
|
|
|
| - // Used to run invalidate after the pending invalidate is done.
|
| - bool invalidate_after_composite_;
|
| -
|
| // Used to block additional invalidates while one is pending.
|
| bool block_invalidates_;
|
|
|
|
|