Mus: Install SwapBuffersCompleted/VSync callbacks to DirectOutputSurface(Ozone)

services/ui/surfaces/direct_output_surface_ozone.cc

 // Copyright 2016 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 "services/ui/surfaces/direct_output_surface_ozone.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
@@ skipping 35 matching lines @@
   // presenting the back buffer, enabling the browser compositor to run ahead.
   // Surfaceless implementation acks at the time of actual buffer swap, which
   // shifts the start of the new frame forward relative to the old
   // implementation.
   capabilities_.max_frames_pending = 2;
 
   buffer_queue_->Initialize();
 
   context_provider->SetSwapBuffersCompletionCallback(
       base::Bind(&DirectOutputSurfaceOzone::OnGpuSwapBuffersCompleted,
-                 base::Unretained(this)));
+                 weak_ptr_factory_.GetWeakPtr()));
+  context_provider->SetUpdateVSyncParametersCallback(
+      base::Bind(&DirectOutputSurfaceOzone::OnVSyncParametersUpdated,
+                 weak_ptr_factory_.GetWeakPtr()));
 }
 
 DirectOutputSurfaceOzone::~DirectOutputSurfaceOzone() {
   // TODO(rjkroege): Support cleanup.
 }
 
 void DirectOutputSurfaceOzone::BindToClient(cc::OutputSurfaceClient* client) {
   DCHECK(client);
   DCHECK(!client_);
   client_ = client;
@@ skipping 66 matching lines @@
 bool DirectOutputSurfaceOzone::SurfaceIsSuspendForRecycle() const {
   return false;
 }
 
 bool DirectOutputSurfaceOzone::HasExternalStencilTest() const {
   return false;
 }
 
 void DirectOutputSurfaceOzone::ApplyExternalStencil() {}
 
-void DirectOutputSurfaceOzone::OnUpdateVSyncParametersFromGpu(
-    base::TimeTicks timebase,
-    base::TimeDelta interval) {
-  DCHECK(client_);
-  synthetic_begin_frame_source_->OnUpdateVSyncParameters(timebase, interval);
-}
-
 void DirectOutputSurfaceOzone::OnGpuSwapBuffersCompleted(
     const std::vector<ui::LatencyInfo>& latency_info,
     gfx::SwapResult result,
     const gpu::GpuProcessHostedCALayerTreeParamsMac* params_mac) {
   bool force_swap = false;
   if (result == gfx::SwapResult::SWAP_NAK_RECREATE_BUFFERS) {
     // Even through the swap failed, this is a fixable error so we can pretend
     // it succeeded to the rest of the system.
     result = gfx::SwapResult::SWAP_ACK;
     buffer_queue_->RecreateBuffers();
     force_swap = true;
   }
 
   buffer_queue_->PageFlipComplete();
   client_->DidReceiveSwapBuffersAck();
 
   if (force_swap)
     client_->SetNeedsRedrawRect(gfx::Rect(swap_size_));
 }
 
+void DirectOutputSurfaceOzone::OnVSyncParametersUpdated(
+    base::TimeTicks timebase,
+    base::TimeDelta interval) {
+  // TODO(brianderson): We should not be receiving 0 intervals.
+  synthetic_begin_frame_source_->OnUpdateVSyncParameters(
+      timebase,
+      interval.is_zero() ? cc::BeginFrameArgs::DefaultInterval() : interval);
+}
+
 }  // namespace ui