Index: content/browser/renderer_host/delegated_frame_host.h |
diff --git a/content/browser/renderer_host/delegated_frame_host.h b/content/browser/renderer_host/delegated_frame_host.h |
index 4d4133b23705a31f2d9d747f7fd450591e9f6955..f463a3e0f9c91179a5b482f46c945f823e7b47c7 100644 |
--- a/content/browser/renderer_host/delegated_frame_host.h |
+++ b/content/browser/renderer_host/delegated_frame_host.h |
@@ -48,7 +48,7 @@ namespace content { |
class DelegatedFrameHost; |
class RenderWidgetHostViewFrameSubscriber; |
-class ResizeLock; |
+class CompositorResizeLock; |
// The DelegatedFrameHostClient is the interface from the DelegatedFrameHost, |
// which manages delegated frames, and the ui::Compositor being used to |
@@ -66,8 +66,8 @@ class CONTENT_EXPORT DelegatedFrameHostClient { |
virtual gfx::Size DelegatedFrameHostDesiredSizeInDIP() const = 0; |
virtual bool DelegatedFrameCanCreateResizeLock() const = 0; |
- virtual std::unique_ptr<ResizeLock> DelegatedFrameHostCreateResizeLock( |
- bool defer_compositor_lock) = 0; |
+ virtual std::unique_ptr<CompositorResizeLock> |
+ DelegatedFrameHostCreateResizeLock() = 0; |
virtual void DelegatedFrameHostResizeLockWasReleased() = 0; |
virtual void DelegatedFrameHostSendReclaimCompositorResources( |
@@ -299,7 +299,7 @@ class CONTENT_EXPORT DelegatedFrameHost |
// size. It keeps track of the size we expect from the renderer, and locks the |
// compositor, as well as the UI for a short time to give a chance to the |
// renderer of producing a frame of the right size. |
- std::unique_ptr<ResizeLock> resize_lock_; |
+ std::unique_ptr<CompositorResizeLock> resize_lock_; |
// Keeps track of the current frame size. |
gfx::Size current_frame_size_in_dip_; |