| Index: content/browser/renderer_host/begin_frame_observer_proxy.h
|
| diff --git a/content/browser/renderer_host/begin_frame_observer_proxy.h b/content/browser/renderer_host/begin_frame_observer_proxy.h
|
| index fd2aa6d7a06f9507033048bfc843906e60c3b719..291d8bb8a96c51430de2e55662cbbfcc09a3899a 100644
|
| --- a/content/browser/renderer_host/begin_frame_observer_proxy.h
|
| +++ b/content/browser/renderer_host/begin_frame_observer_proxy.h
|
| @@ -25,7 +25,8 @@ class BeginFrameObserverProxyClient {
|
| // This class is used to manage all of the RenderWidgetHostView state and
|
| // functionality that is associated with BeginFrame message handling.
|
| class CONTENT_EXPORT BeginFrameObserverProxy
|
| - : public ui::CompositorBeginFrameObserver {
|
| + : public ui::CompositorBeginFrameObserver,
|
| + public ui::CompositorObserver {
|
| public:
|
| explicit BeginFrameObserverProxy(BeginFrameObserverProxyClient* client);
|
| ~BeginFrameObserverProxy() override;
|
| @@ -38,6 +39,17 @@ class CONTENT_EXPORT BeginFrameObserverProxy
|
| // Overridden from ui::CompositorBeginFrameObserver:
|
| void OnSendBeginFrame(const cc::BeginFrameArgs& args) override;
|
|
|
| + // Overridden from ui::CompositorObserver:
|
| + // TODO(simonhong): Stop overriding ui::CompositorObserver. We need to make
|
| + // sure that this class should be destroyed before ui::Compositor.
|
| + void OnCompositingDidCommit(ui::Compositor* compositor) override {}
|
| + void OnCompositingStarted(ui::Compositor* compositor,
|
| + base::TimeTicks start_time) override {}
|
| + void OnCompositingEnded(ui::Compositor* compositor) override {}
|
| + void OnCompositingAborted(ui::Compositor* compositor) override {}
|
| + void OnCompositingLockStateChanged(ui::Compositor* compositor) override {}
|
| + void OnCompositingShuttingDown(ui::Compositor* compositor) override;
|
| +
|
| private:
|
| void StartObservingBeginFrames();
|
| void StopObservingBeginFrames();
|
|
|