| Index: content/browser/android/synchronous_compositor_host.h
|
| diff --git a/content/browser/android/synchronous_compositor_host.h b/content/browser/android/synchronous_compositor_host.h
|
| index b30e8f87741669fb869c0926278bfcdc8ab0ae07..043daf409373171359290a7d6a4abb8202564515 100644
|
| --- a/content/browser/android/synchronous_compositor_host.h
|
| +++ b/content/browser/android/synchronous_compositor_host.h
|
| @@ -64,12 +64,11 @@ class SynchronousCompositorHost : public SynchronousCompositor {
|
| void DidChangeRootLayerScrollOffset(
|
| const gfx::ScrollOffset& root_offset) override;
|
| void SynchronouslyZoomBy(float zoom_delta, const gfx::Point& anchor) override;
|
| - void SetIsActive(bool is_active) override;
|
| void OnComputeScroll(base::TimeTicks animation_time) override;
|
|
|
| InputEventAckState HandleInputEvent(const blink::WebInputEvent& input_event);
|
| void DidOverscroll(const DidOverscrollParams& over_scroll_params);
|
| - void BeginFrame(const cc::BeginFrameArgs& args);
|
| + void DidSendBeginFrame();
|
| bool OnMessageReceived(const IPC::Message& message);
|
| void DidBecomeCurrent();
|
|
|
| @@ -83,15 +82,11 @@ class SynchronousCompositorHost : public SynchronousCompositor {
|
| SynchronousCompositorClient* client,
|
| bool async_input,
|
| bool use_in_proc_software_draw);
|
| - void PopulateCommonParams(SyncCompositorCommonBrowserParams* params);
|
| void ProcessCommonParams(const SyncCompositorCommonRendererParams& params);
|
| - void UpdateNeedsBeginFrames();
|
| void UpdateFrameMetaData(const cc::CompositorFrameMetadata& frame_metadata);
|
| void OutputSurfaceCreated();
|
| void OnOverScroll(const SyncCompositorCommonRendererParams& params,
|
| const DidOverscrollParams& over_scroll_params);
|
| - void SendAsyncCompositorStateIfNeeded();
|
| - void UpdateStateTask();
|
| bool DemandDrawSwInProc(SkCanvas* canvas);
|
| void SetSoftwareDrawSharedMemoryIfNeeded(size_t stride, size_t buffer_size);
|
| void SendZeroMemory();
|
| @@ -104,7 +99,6 @@ class SynchronousCompositorHost : public SynchronousCompositor {
|
| const bool async_input_;
|
| const bool use_in_process_zero_copy_software_draw_;
|
|
|
| - bool is_active_;
|
| size_t bytes_limit_;
|
| std::unique_ptr<SharedMemoryWithSize> software_draw_shm_;
|
|
|
| @@ -115,10 +109,8 @@ class SynchronousCompositorHost : public SynchronousCompositor {
|
| uint32_t renderer_param_version_;
|
| bool need_animate_scroll_;
|
| uint32_t need_invalidate_count_;
|
| - bool need_begin_frame_;
|
| uint32_t did_activate_pending_tree_count_;
|
|
|
| - base::WeakPtrFactory<SynchronousCompositorHost> weak_ptr_factory_;
|
| DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorHost);
|
| };
|
|
|
|
|