Fork cc::OutputSurface into cc::CompositorFrameSink.

blimp/client/core/compositor/delegated_output_surface.cc

Index: blimp/client/core/compositor/delegated_output_surface.cc
diff --git a/blimp/client/core/compositor/delegated_output_surface.cc b/blimp/client/core/compositor/delegated_output_surface.cc
deleted file mode 100644
index 5c2a5a5290fcde4bcb8f6340d01274a344ba9a01..0000000000000000000000000000000000000000
--- a/blimp/client/core/compositor/delegated_output_surface.cc
+++ /dev/null
@@ -1,88 +0,0 @@
-// 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/core/compositor/delegated_output_surface.h"
-
-#include "base/bind.h"
-#include "base/logging.h"
-#include "base/memory/ptr_util.h"
-#include "base/single_thread_task_runner.h"
-#include "base/threading/thread_checker.h"
-#include "base/threading/thread_task_runner_handle.h"
-#include "cc/output/compositor_frame.h"
-#include "cc/output/output_surface_client.h"
-#include "cc/scheduler/begin_frame_source.h"
-#include "cc/scheduler/delay_based_time_source.h"
-
-namespace blimp {
-namespace client {
-
-DelegatedOutputSurface::DelegatedOutputSurface(
-    scoped_refptr<cc::ContextProvider> compositor_context_provider,
-    scoped_refptr<cc::ContextProvider> worker_context_provider,
-    scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
-    base::WeakPtr<BlimpOutputSurfaceClient> client)
-    : cc::OutputSurface(std::move(compositor_context_provider),
-                        std::move(worker_context_provider),
-                        nullptr),
-      main_task_runner_(std::move(main_task_runner)),
-      blimp_client_(client),
-      bound_to_client_(false),
-      weak_factory_(this) {
-  DCHECK(main_task_runner_->BelongsToCurrentThread());
-  capabilities_.delegated_rendering = true;
-}
-
-DelegatedOutputSurface::~DelegatedOutputSurface() = default;
-
-void DelegatedOutputSurface::ReclaimCompositorResources(
-    const cc::ReturnedResourceArray& resources) {
-  DCHECK(client_thread_checker_.CalledOnValidThread());
-  client_->ReclaimResources(resources);
-}
-
-uint32_t DelegatedOutputSurface::GetFramebufferCopyTextureFormat() {
-  NOTREACHED() << "Should not be called on delegated output surface";
-  return 0;
-}
-
-bool DelegatedOutputSurface::BindToClient(cc::OutputSurfaceClient* client) {
-  bool success = cc::OutputSurface::BindToClient(client);
-  if (success) {
-    begin_frame_source_ = base::MakeUnique<cc::DelayBasedBeginFrameSource>(
-        base::MakeUnique<cc::DelayBasedTimeSource>(
-            base::ThreadTaskRunnerHandle::Get().get()));
-    client->SetBeginFrameSource(begin_frame_source_.get());
-
-    main_task_runner_->PostTask(
-        FROM_HERE, base::Bind(&BlimpOutputSurfaceClient::BindToOutputSurface,
-                              blimp_client_, weak_factory_.GetWeakPtr()));
-  }
-  return success;
-}
-
-void DelegatedOutputSurface::SwapBuffers(cc::CompositorFrame frame) {
-  DCHECK(client_thread_checker_.CalledOnValidThread());
-
-  main_task_runner_->PostTask(
-      FROM_HERE, base::Bind(&BlimpOutputSurfaceClient::SwapCompositorFrame,
-                            blimp_client_, base::Passed(&frame)));
-  cc::OutputSurface::PostSwapBuffersComplete();
-}
-
-void DelegatedOutputSurface::DetachFromClient() {
-  cc::OutputSurface::DetachFromClient();
-
-  if (bound_to_client_ == true) {
-    bound_to_client_ = false;
-    main_task_runner_->PostTask(
-        FROM_HERE, base::Bind(&BlimpOutputSurfaceClient::UnbindOutputSurface,
-                              blimp_client_));
-  }
-
-  weak_factory_.InvalidateWeakPtrs();
-}
-
-}  // namespace client
-}  // namespace blimp