Fix CompositorResizeLock to do something.

content/browser/renderer_host/browser_compositor_view_mac.mm

 // 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.
 
 #include "content/browser/renderer_host/browser_compositor_view_mac.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/trace_event/trace_event.h"
 #include "content/browser/compositor/image_transport_factory.h"
-#include "content/browser/renderer_host/resize_lock.h"
+#include "content/browser/renderer_host/compositor_resize_lock.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/context_factory.h"
 #include "media/base/video_frame.h"
 #include "ui/accelerated_widget_mac/accelerated_widget_mac.h"
 #include "ui/accelerated_widget_mac/window_resize_helper_mac.h"
 #include "ui/base/layout.h"
 #include "ui/gfx/geometry/dip_util.h"
 
 namespace content {
 
@@ skipping 59 matching lines @@
 
   // ui::CompositorObserver implementation:
   void OnCompositingDidCommit(ui::Compositor* compositor) override;
   void OnCompositingStarted(ui::Compositor* compositor,
                             base::TimeTicks start_time) override {}
   void OnCompositingLockStateChanged(ui::Compositor* compositor) override {}
   void OnCompositingShuttingDown(ui::Compositor* compositor) override {}
 
   std::unique_ptr<ui::AcceleratedWidgetMac> accelerated_widget_mac_;
   ui::Compositor compositor_;
-  scoped_refptr<ui::CompositorLock> compositor_suspended_lock_;
+  std::unique_ptr<ui::CompositorLock> compositor_suspended_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(RecyclableCompositorMac);
 };
 
 RecyclableCompositorMac::RecyclableCompositorMac()
     : accelerated_widget_mac_(new ui::AcceleratedWidgetMac()),
       compositor_(content::GetContextFactoryPrivate()->AllocateFrameSinkId(),
                   content::GetContextFactory(),
                   content::GetContextFactoryPrivate(),
                   ui::WindowResizeHelperMac::Get()->task_runner()) {
   compositor_.SetAcceleratedWidget(
       accelerated_widget_mac_->accelerated_widget());
-  compositor_.SetLocksWillTimeOut(false);
   Suspend();
   compositor_.AddObserver(this);
 }
 
 RecyclableCompositorMac::~RecyclableCompositorMac() {
   compositor_.RemoveObserver(this);
 }
 
 void RecyclableCompositorMac::Suspend() {
-  compositor_suspended_lock_ = compositor_.GetCompositorLock();
+  // Requests a compositor lock without a timeout.
+  compositor_suspended_lock_ =
+      compositor_.GetCompositorLock(nullptr, base::TimeDelta());
 }
 
 void RecyclableCompositorMac::Unsuspend() {
   compositor_suspended_lock_ = nullptr;
 }
 
 void RecyclableCompositorMac::OnCompositingDidCommit(
     ui::Compositor* compositor_that_did_commit) {
   DCHECK_EQ(compositor_that_did_commit, compositor());
   content::ImageTransportFactory::GetInstance()
@@ skipping 287 matching lines @@
 gfx::Size BrowserCompositorMac::DelegatedFrameHostDesiredSizeInDIP() const {
   NSRect bounds = [client_->BrowserCompositorMacGetNSView() bounds];
   return gfx::Size(bounds.size.width, bounds.size.height);
 }
 
 bool BrowserCompositorMac::DelegatedFrameCanCreateResizeLock() const {
   // Mac uses the RenderWidgetResizeHelper instead of a resize lock.
   return false;
 }
 
-std::unique_ptr<ResizeLock>
-BrowserCompositorMac::DelegatedFrameHostCreateResizeLock(
-    bool defer_compositor_lock) {
+std::unique_ptr<CompositorResizeLock>
+BrowserCompositorMac::DelegatedFrameHostCreateResizeLock() {
   NOTREACHED();
-  return std::unique_ptr<ResizeLock>();
+  return nullptr;
 }
 
 void BrowserCompositorMac::DelegatedFrameHostResizeLockWasReleased() {
   NOTREACHED();
 }
 
 void BrowserCompositorMac::DelegatedFrameHostSendReclaimCompositorResources(
     int compositor_frame_sink_id,
     bool is_swap_ack,
     const cc::ReturnedResourceArray& resources) {
   client_->BrowserCompositorMacSendReclaimCompositorResources(
       compositor_frame_sink_id, is_swap_ack, resources);
 }
 
 void BrowserCompositorMac::OnBeginFrame(const cc::BeginFrameArgs& args) {
   client_->BrowserCompositorMacSendBeginFrame(args);
 }
 
 bool BrowserCompositorMac::IsAutoResizeEnabled() const {
   NOTREACHED();
   return false;
 }
 
 }  // namespace content