cc: Remove things from OutputSurface and CompositorFrameSink.

blimp/client/core/compositor/blimp_compositor_frame_sink.cc

Index: blimp/client/core/compositor/blimp_compositor_frame_sink.cc
diff --git a/blimp/client/core/compositor/blimp_compositor_frame_sink.cc b/blimp/client/core/compositor/blimp_compositor_frame_sink.cc
index 79b467dd3fe072ce053eb528dd36013a2a140ac0..716a8e55f368a2a8cd12cfe720b73ed2e1bc1cec 100644
--- a/blimp/client/core/compositor/blimp_compositor_frame_sink.cc
+++ b/blimp/client/core/compositor/blimp_compositor_frame_sink.cc
@@ -24,14 +24,12 @@ BlimpCompositorFrameSink::BlimpCompositorFrameSink(
     scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
     base::WeakPtr<BlimpCompositorFrameSinkProxy> main_thread_proxy)
     : cc::CompositorFrameSink(std::move(compositor_context_provider),
-                              std::move(worker_context_provider),
-                              nullptr),
+                              std::move(worker_context_provider)),
       main_task_runner_(std::move(main_task_runner)),
       main_thread_proxy_(main_thread_proxy),
       bound_to_client_(false),
       weak_factory_(this) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
-  capabilities_.delegated_rendering = true;
 }
 
 BlimpCompositorFrameSink::~BlimpCompositorFrameSink() = default;
@@ -42,11 +40,6 @@ void BlimpCompositorFrameSink::ReclaimCompositorResources(
   client_->ReclaimResources(resources);
 }
 
-uint32_t BlimpCompositorFrameSink::GetFramebufferCopyTextureFormat() {
-  NOTREACHED() << "Should not be called on delegated output surface";
-  return 0;
-}
-
 bool BlimpCompositorFrameSink::BindToClient(
     cc::CompositorFrameSinkClient* client) {
   bool success = cc::CompositorFrameSink::BindToClient(client);
@@ -63,15 +56,6 @@ bool BlimpCompositorFrameSink::BindToClient(
   return success;
 }
 
-void BlimpCompositorFrameSink::SwapBuffers(cc::CompositorFrame frame) {
-  DCHECK(client_thread_checker_.CalledOnValidThread());
-
-  main_task_runner_->PostTask(
-      FROM_HERE, base::Bind(&BlimpCompositorFrameSinkProxy::SwapCompositorFrame,
-                            main_thread_proxy_, base::Passed(&frame)));
-  cc::CompositorFrameSink::PostSwapBuffersComplete();
-}
-
 void BlimpCompositorFrameSink::DetachFromClient() {
   cc::CompositorFrameSink::DetachFromClient();
 
@@ -85,5 +69,14 @@ void BlimpCompositorFrameSink::DetachFromClient() {
   weak_factory_.InvalidateWeakPtrs();
 }
 
+void BlimpCompositorFrameSink::SwapBuffers(cc::CompositorFrame frame) {
+  DCHECK(client_thread_checker_.CalledOnValidThread());
+
+  main_task_runner_->PostTask(
+      FROM_HERE, base::Bind(&BlimpCompositorFrameSinkProxy::SwapCompositorFrame,
+                            main_thread_proxy_, base::Passed(&frame)));
+  cc::CompositorFrameSink::PostSwapBuffersComplete();
+}
+
 }  // namespace client
 }  // namespace blimp