Fix CompositorResizeLock to do something.

content/browser/renderer_host/delegated_frame_host.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_DELEGATED_FRAME_HOST_H_
 #define CONTENT_BROWSER_RENDERER_HOST_DELEGATED_FRAME_HOST_H_
 
 #include <stdint.h>
 
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "cc/output/begin_frame_args.h"
 #include "cc/output/copy_output_result.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/surfaces/compositor_frame_sink_support_client.h"
 #include "content/browser/compositor/image_transport_factory.h"
 #include "content/browser/compositor/owned_mailbox.h"
 #include "content/browser/renderer_host/delegated_frame_evictor.h"
 #include "content/browser/renderer_host/dip_util.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
+#include "content/common/content_export.h"
 #include "content/public/browser/render_process_host.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/compositor_observer.h"
 #include "ui/compositor/compositor_vsync_manager.h"
 #include "ui/compositor/layer.h"
 #include "ui/events/event.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 
 namespace base {
 class TickClock;
 }
 
 namespace cc {
 class CompositorFrameSinkSupport;
 }
 
 namespace media {
 class VideoFrame;
 }
 
 namespace display_compositor {
 class ReadbackYUVInterface;
 }
 
 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
 // display them.
 class CONTENT_EXPORT DelegatedFrameHostClient {
  public:
   virtual ~DelegatedFrameHostClient() {}
 
   virtual ui::Layer* DelegatedFrameHostGetLayer() const = 0;
   virtual bool DelegatedFrameHostIsVisible() const = 0;
 
   // Returns the color that the resize gutters should be drawn with. Takes the
   // suggested color from the current page background.
   virtual SkColor DelegatedFrameHostGetGutterColor(SkColor color) const = 0;
   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(
       int compositor_frame_sink_id,
       bool is_swap_ack,
       const cc::ReturnedResourceArray& resources) = 0;
 
   virtual void OnBeginFrame(const cc::BeginFrameArgs& args) = 0;
   virtual bool IsAutoResizeEnabled() const = 0;
 };
@@ skipping 210 matching lines @@
   gfx::Size current_surface_size_;
   float current_scale_factor_;
   cc::ReturnedResourceArray surface_returned_resources_;
 
   // This lock is the one waiting for a frame of the right size to come back
   // from the renderer/GPU process. It is set from the moment the aura window
   // got resized, to the moment we committed the renderer frame of the same
   // 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_;
 
   // This lock is for waiting for a front surface to become available to draw.
-  scoped_refptr<ui::CompositorLock> released_front_lock_;
+  std::unique_ptr<ui::CompositorLock> released_front_lock_;
 
   enum CanLockCompositorState {
     YES_CAN_LOCK,
     // We locked, so at some point we'll need to kick a frame.
     YES_DID_LOCK,
     // No. A lock timed out, we need to kick a new frame before locking again.
     NO_PENDING_RENDERER_FRAME,
     // No. We've got a frame, but it hasn't been committed.
     NO_PENDING_COMMIT,
   };
@@ skipping 20 matching lines @@
       cc::BeginFrameArgs::kInvalidFrameNumber;
 
   bool has_frame_ = false;
 
   std::unique_ptr<DelegatedFrameEvictor> delegated_frame_evictor_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_DELEGATED_FRAME_HOST_H_