| Index: content/browser/renderer_host/delegated_frame_host_client_aura.h
|
| diff --git a/content/browser/renderer_host/delegated_frame_host_client_aura.h b/content/browser/renderer_host/delegated_frame_host_client_aura.h
|
| index 7ef327e8b9556fc2e0a1e29a75567a40dd4056ac..4d47003873d7be3bd43bae43adcbd172ed999d4b 100644
|
| --- a/content/browser/renderer_host/delegated_frame_host_client_aura.h
|
| +++ b/content/browser/renderer_host/delegated_frame_host_client_aura.h
|
| @@ -6,6 +6,7 @@
|
| #define CONTENT_BROWSER_RENDERER_HOST_DELEGATED_FRAME_HOST_CLIENT_AURA_H_
|
|
|
| #include "base/macros.h"
|
| +#include "content/browser/renderer_host/compositor_resize_lock.h"
|
| #include "content/browser/renderer_host/delegated_frame_host.h"
|
| #include "content/common/content_export.h"
|
|
|
| @@ -15,7 +16,8 @@ class RenderWidgetHostViewAura;
|
|
|
| // DelegatedFrameHostClient implementation for aura, not used in mus.
|
| class CONTENT_EXPORT DelegatedFrameHostClientAura
|
| - : public DelegatedFrameHostClient {
|
| + : public DelegatedFrameHostClient,
|
| + NON_EXPORTED_BASE(public CompositorResizeLockClient) {
|
| public:
|
| explicit DelegatedFrameHostClientAura(
|
| RenderWidgetHostViewAura* render_widget_host_view);
|
| @@ -32,8 +34,8 @@ class CONTENT_EXPORT DelegatedFrameHostClientAura
|
| SkColor DelegatedFrameHostGetGutterColor(SkColor color) const override;
|
| gfx::Size DelegatedFrameHostDesiredSizeInDIP() const override;
|
| bool DelegatedFrameCanCreateResizeLock() const override;
|
| - std::unique_ptr<ResizeLock> DelegatedFrameHostCreateResizeLock(
|
| - bool defer_compositor_lock) override;
|
| + std::unique_ptr<CompositorResizeLock> DelegatedFrameHostCreateResizeLock()
|
| + override;
|
| void DelegatedFrameHostResizeLockWasReleased() override;
|
| void DelegatedFrameHostSendReclaimCompositorResources(
|
| int compositor_frame_sink_id,
|
| @@ -42,6 +44,11 @@ class CONTENT_EXPORT DelegatedFrameHostClientAura
|
| void OnBeginFrame(const cc::BeginFrameArgs& args) override;
|
| bool IsAutoResizeEnabled() const override;
|
|
|
| + // CompositorResizeLockClient implementation.
|
| + std::unique_ptr<ui::CompositorLock> GetCompositorLock(
|
| + ui::CompositorLockClient* client) override;
|
| + void CompositorResizeLockEnded() override;
|
| +
|
| private:
|
| RenderWidgetHostViewAura* render_widget_host_view_;
|
|
|
|
|