cc: Remove things from OutputSurface and CompositorFrameSink.

cc/output/compositor_frame_sink.cc

 // Copyright (c) 2013 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 "cc/output/compositor_frame_sink.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 103 matching lines @@
   base::trace_event::ProcessMemoryDump* pmd_;
   uint64_t share_group_tracing_guid_;
 
   DISALLOW_COPY_AND_ASSIGN(SkiaGpuTraceMemoryDump);
 };
 
 }  // namespace
 
 CompositorFrameSink::CompositorFrameSink(
     scoped_refptr<ContextProvider> context_provider,
-    scoped_refptr<ContextProvider> worker_context_provider,
-    std::unique_ptr<SoftwareOutputDevice> software_device)
+    scoped_refptr<ContextProvider> worker_context_provider)
     : context_provider_(std::move(context_provider)),
       worker_context_provider_(std::move(worker_context_provider)),
-      software_device_(std::move(software_device)),
       weak_ptr_factory_(this) {
   client_thread_checker_.DetachFromThread();
 }
 
 CompositorFrameSink::CompositorFrameSink(
     scoped_refptr<VulkanContextProvider> vulkan_context_provider)
     : vulkan_context_provider_(vulkan_context_provider),
       weak_ptr_factory_(this) {
   client_thread_checker_.DetachFromThread();
 }
 
 CompositorFrameSink::~CompositorFrameSink() {
   if (client_)
     DetachFromClientInternal();
 }
 
-bool CompositorFrameSink::HasExternalStencilTest() const {
-  return false;
-}
-
-void CompositorFrameSink::ApplyExternalStencil() {}
-
 bool CompositorFrameSink::BindToClient(CompositorFrameSinkClient* client) {
   DCHECK(client_thread_checker_.CalledOnValidThread());
   DCHECK(client);
   DCHECK(!client_);
   client_ = client;
   bool success = true;
 
   if (context_provider_.get()) {
     success = context_provider_->BindToCurrentThread();
     if (success) {
@@ skipping 16 matching lines @@
 
   if (!success)
     DetachFromClient();
   return success;
 }
 
 void CompositorFrameSink::DetachFromClient() {
   DetachFromClientInternal();
 }
 
-void CompositorFrameSink::EnsureBackbuffer() {
-  if (software_device_)
-    software_device_->EnsureBackbuffer();
-}
-
-void CompositorFrameSink::DiscardBackbuffer() {
-  if (context_provider_.get())
-    context_provider_->ContextGL()->DiscardBackbufferCHROMIUM();
-  if (software_device_)
-    software_device_->DiscardBackbuffer();
-}
-
-void CompositorFrameSink::Reshape(const gfx::Size& size,
-                                  float scale_factor,
-                                  const gfx::ColorSpace& color_space,
-                                  bool has_alpha) {
-  device_color_space_ = color_space;
-  if (size == surface_size_ && scale_factor == device_scale_factor_ &&
-      has_alpha == has_alpha_)
-    return;
-
-  surface_size_ = size;
-  device_scale_factor_ = scale_factor;
-  has_alpha_ = has_alpha;
-  if (context_provider_.get()) {
-    context_provider_->ContextGL()->ResizeCHROMIUM(size.width(), size.height(),
-                                                   scale_factor, has_alpha);
-  }
-  if (software_device_)
-    software_device_->Resize(size, scale_factor);
-}
-
-void CompositorFrameSink::BindFramebuffer() {
-  DCHECK(context_provider_.get());
-  context_provider_->ContextGL()->BindFramebuffer(GL_FRAMEBUFFER, 0);
-}
-
 void CompositorFrameSink::PostSwapBuffersComplete() {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&CompositorFrameSink::OnSwapBuffersComplete,
                             weak_ptr_factory_.GetWeakPtr()));
 }
 
 // We don't post tasks bound to the client directly since they might run
 // after the CompositorFrameSink has been destroyed.
 void CompositorFrameSink::OnSwapBuffersComplete() {
   client_->DidSwapBuffersComplete();
 }
 
-void CompositorFrameSink::DidReceiveTextureInUseResponses(
-    const gpu::TextureInUseResponses& responses) {
-  client_->DidReceiveTextureInUseResponses(responses);
-}
-
-OverlayCandidateValidator* CompositorFrameSink::GetOverlayCandidateValidator()
-    const {
-  return nullptr;
-}
-
-bool CompositorFrameSink::IsDisplayedAsOverlayPlane() const {
-  return false;
-}
-
-unsigned CompositorFrameSink::GetOverlayTextureId() const {
-  return 0;
-}
-
-bool CompositorFrameSink::SurfaceIsSuspendForRecycle() const {
-  return false;
-}
-
 bool CompositorFrameSink::OnMemoryDump(
     const base::trace_event::MemoryDumpArgs& args,
     base::trace_event::ProcessMemoryDump* pmd) {
   if (auto* context_provider = this->context_provider()) {
     // No need to lock, main context provider is not shared.
     if (auto* gr_context = context_provider->GrContext()) {
       SkiaGpuTraceMemoryDump trace_memory_dump(
           pmd, context_provider->ContextSupport()->ShareGroupTracingGUID());
       gr_context->dumpMemoryStatistics(&trace_memory_dump);
     }
@@ skipping 28 matching lines @@
   client_ = nullptr;
   weak_ptr_factory_.InvalidateWeakPtrs();
 }
 
 void CompositorFrameSink::DidLoseCompositorFrameSink() {
   TRACE_EVENT0("cc", "CompositorFrameSink::DidLoseCompositorFrameSink");
   client_->DidLoseCompositorFrameSink();
 }
 
 }  // namespace cc