cc: Get rid of PostSwapBuffersComplete.

blimp/client/support/compositor/blimp_embedder_compositor.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 "blimp/client/support/compositor/blimp_embedder_compositor.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
+#include "base/memory/weak_ptr.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "blimp/client/public/compositor/compositor_dependencies.h"
 #include "blimp/client/support/compositor/blimp_context_provider.h"
 #include "cc/animation/animation_host.h"
 #include "cc/layers/layer.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/output_surface_frame.h"
 #include "cc/output/texture_mailbox_deleter.h"
 #include "cc/raster/single_thread_task_graph_runner.h"
 #include "cc/surfaces/direct_compositor_frame_sink.h"
@@ skipping 15 matching lines @@
     Start("BlimpBrowserCompositorWorker",
           base::SimpleThread::Options(base::ThreadPriority::BACKGROUND));
   }
 
   ~SimpleTaskGraphRunner() override { Shutdown(); }
 };
 
 class DisplayOutputSurface : public cc::OutputSurface {
  public:
   explicit DisplayOutputSurface(
-      scoped_refptr<cc::ContextProvider> context_provider)
-      : cc::OutputSurface(std::move(context_provider)) {}
+      scoped_refptr<cc::ContextProvider> context_provider,
+      scoped_refptr<base::SingleThreadTaskRunner> task_runner)
+      : cc::OutputSurface(std::move(context_provider)),
+        task_runner_(std::move(task_runner)),
+        weak_ptr_factory_(this) {}
 
   ~DisplayOutputSurface() override = default;
 
   // cc::OutputSurface implementation
   void EnsureBackbuffer() override {}
   void DiscardBackbuffer() override {
     context_provider()->ContextGL()->DiscardBackbufferCHROMIUM();
   }
   void BindFramebuffer() override {
     context_provider()->ContextGL()->BindFramebuffer(GL_FRAMEBUFFER, 0);
   }
   void Reshape(const gfx::Size& size,
                float device_scale_factor,
                const gfx::ColorSpace& color_space,
                bool has_alpha) override {
     context_provider()->ContextGL()->ResizeCHROMIUM(
         size.width(), size.height(), device_scale_factor, has_alpha);
   }
   void SwapBuffers(cc::OutputSurfaceFrame frame) override {
-    // See cc::OutputSurface::SwapBuffers() comment for details.
     context_provider_->ContextSupport()->Swap();
-    cc::OutputSurface::PostSwapBuffersComplete();
+    // The ack for SwapBuffers must be run asynchronously, that will be
+    // satisfied since we will go through a PostTask here.
+    task_runner_->PostTask(
+        FROM_HERE, base::Bind(&DisplayOutputSurface::SwapBuffersCallback,
+                              weak_ptr_factory_.GetWeakPtr()));
   }
   cc::OverlayCandidateValidator* GetOverlayCandidateValidator() const override {
     return nullptr;
   }
   bool IsDisplayedAsOverlayPlane() const override { return false; }
   unsigned GetOverlayTextureId() const override { return 0; }
   bool SurfaceIsSuspendForRecycle() const override { return false; }
   uint32_t GetFramebufferCopyTextureFormat() override {
     // We assume we have an alpha channel from the BlimpContextProvider, so use
     // GL_RGBA here.
     return GL_RGBA;
   }
   bool HasExternalStencilTest() const override { return false; }
   void ApplyExternalStencil() override {}
 
  private:
+  void SwapBuffersCallback() { client_->DidSwapBuffersComplete(); }
+
+  scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
+  base::WeakPtrFactory<DisplayOutputSurface> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(DisplayOutputSurface);
 };
 
 base::LazyInstance<SimpleTaskGraphRunner> g_task_graph_runner =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 BlimpEmbedderCompositor::BlimpEmbedderCompositor(
     CompositorDependencies* compositor_dependencies)
@@ skipping 85 matching lines @@
 
   // Can't handle the request right now since we don't have a widget.
   if (!host_->IsVisible())
     return;
 
   DCHECK(context_provider_);
 
   gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager =
       compositor_dependencies_->GetGpuMemoryBufferManager();
 
+  auto task_runner = base::ThreadTaskRunnerHandle::Get();
   auto display_output_surface =
-      base::MakeUnique<DisplayOutputSurface>(context_provider_);
+      base::MakeUnique<DisplayOutputSurface>(context_provider_, task_runner);
 
-  auto* task_runner = base::ThreadTaskRunnerHandle::Get().get();
   std::unique_ptr<cc::SyntheticBeginFrameSource> begin_frame_source(
       new cc::DelayBasedBeginFrameSource(
-          base::MakeUnique<cc::DelayBasedTimeSource>(task_runner)));
+          base::MakeUnique<cc::DelayBasedTimeSource>(task_runner.get())));
   std::unique_ptr<cc::DisplayScheduler> scheduler(new cc::DisplayScheduler(
-      begin_frame_source.get(), task_runner,
+      begin_frame_source.get(), task_runner.get(),
       display_output_surface->capabilities().max_frames_pending));
 
   display_ = base::MakeUnique<cc::Display>(
       nullptr /*shared_bitmap_manager*/, gpu_memory_buffer_manager,
       host_->GetSettings().renderer_settings, std::move(begin_frame_source),
       std::move(display_output_surface), std::move(scheduler),
-      base::MakeUnique<cc::TextureMailboxDeleter>(task_runner));
+      base::MakeUnique<cc::TextureMailboxDeleter>(task_runner.get()));
   display_->SetVisible(true);
   display_->Resize(viewport_size_in_px_);
 
   // The Browser compositor and display share the same context provider.
   auto compositor_frame_sink = base::MakeUnique<cc::DirectCompositorFrameSink>(
       frame_sink_id_, compositor_dependencies_->GetSurfaceManager(),
       display_.get(), context_provider_, nullptr);
 
   host_->SetCompositorFrameSink(std::move(compositor_frame_sink));
 }
 
 }  // namespace client
 }  // namespace blimp