| Index: content/browser/renderer_host/compositor_impl_android.h
|
| diff --git a/content/browser/renderer_host/compositor_impl_android.h b/content/browser/renderer_host/compositor_impl_android.h
|
| index 52766d5fdc60087dc26832a7f8d5ff0df81d6484..506f5ccae02f84f82eb5e7e8cf32336f806c0a99 100644
|
| --- a/content/browser/renderer_host/compositor_impl_android.h
|
| +++ b/content/browser/renderer_host/compositor_impl_android.h
|
| @@ -33,7 +33,6 @@ struct ANativeWindow;
|
|
|
| namespace cc {
|
| class AnimationHost;
|
| -class BeginFrameSource;
|
| class Display;
|
| class Layer;
|
| class LayerTreeHost;
|
| @@ -54,21 +53,11 @@ class CONTENT_EXPORT CompositorImpl
|
| public ui::UIResourceProvider,
|
| public ui::WindowAndroidCompositor {
|
| public:
|
| - class VSyncObserver {
|
| - public:
|
| - virtual void OnVSync(base::TimeTicks timebase,
|
| - base::TimeDelta interval) = 0;
|
| - };
|
| -
|
| CompositorImpl(CompositorClient* client, gfx::NativeWindow root_window);
|
| ~CompositorImpl() override;
|
|
|
| static bool IsInitialized();
|
|
|
| - void AddObserver(VSyncObserver* observer);
|
| - void RemoveObserver(VSyncObserver* observer);
|
| - void OnNeedsBeginFramesChange(bool needs_begin_frames);
|
| -
|
| // ui::ResourceProvider implementation.
|
| cc::UIResourceId CreateUIResource(cc::UIResourceClient* client) override;
|
| void DeleteUIResource(cc::UIResourceId resource_id) override;
|
| @@ -113,8 +102,6 @@ class CONTENT_EXPORT CompositorImpl
|
| void AttachLayerForReadback(scoped_refptr<cc::Layer> layer) override;
|
| void RequestCopyOfOutputOnRootLayer(
|
| std::unique_ptr<cc::CopyOutputRequest> request) override;
|
| - void OnVSync(base::TimeTicks frame_time,
|
| - base::TimeDelta vsync_period) override;
|
| void SetNeedsAnimate() override;
|
| cc::FrameSinkId GetFrameSinkId() override;
|
|
|
| @@ -147,12 +134,10 @@ class CONTENT_EXPORT CompositorImpl
|
| scoped_refptr<cc::Layer> readback_layer_tree_;
|
|
|
| // Destruction order matters here:
|
| - base::ObserverList<VSyncObserver, true> observer_list_;
|
| std::unique_ptr<cc::AnimationHost> animation_host_;
|
| std::unique_ptr<cc::LayerTreeHost> host_;
|
| ui::ResourceManagerImpl resource_manager_;
|
|
|
| - std::unique_ptr<cc::BeginFrameSource> begin_frame_source_;
|
| std::unique_ptr<cc::Display> display_;
|
|
|
| gfx::Size size_;
|
| @@ -182,7 +167,6 @@ class CONTENT_EXPORT CompositorImpl
|
| bool compositor_frame_sink_request_pending_;
|
|
|
| gpu::Capabilities gpu_capabilities_;
|
| - bool needs_begin_frames_;
|
| base::WeakPtrFactory<CompositorImpl> weak_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(CompositorImpl);
|
|
|