cc: Make most of cc::OutputSurface abstract.

cc/output/output_surface.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/output_surface.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 104 matching lines @@
   uint64_t share_group_tracing_guid_;
 
   DISALLOW_COPY_AND_ASSIGN(SkiaGpuTraceMemoryDump);
 };
 
 }  // namespace
 
 OutputSurface::OutputSurface(scoped_refptr<ContextProvider> context_provider)
     : context_provider_(std::move(context_provider)), weak_ptr_factory_(this) {
   DCHECK(context_provider_);
-  client_thread_checker_.DetachFromThread();
+  thread_checker_.DetachFromThread();
 }
 
 OutputSurface::OutputSurface(
     std::unique_ptr<SoftwareOutputDevice> software_device)
     : software_device_(std::move(software_device)), weak_ptr_factory_(this) {
   DCHECK(software_device_);
-  client_thread_checker_.DetachFromThread();
+  thread_checker_.DetachFromThread();
 }
 
 OutputSurface::OutputSurface(
     scoped_refptr<VulkanContextProvider> vulkan_context_provider)
     : vulkan_context_provider_(vulkan_context_provider),
       weak_ptr_factory_(this) {
   DCHECK(vulkan_context_provider_);
-  client_thread_checker_.DetachFromThread();
+  thread_checker_.DetachFromThread();
 }
 
 OutputSurface::~OutputSurface() {
-  if (client_)
-    DetachFromClientInternal();
+  // Is destroyed on the thread it is bound to.
+  DCHECK(thread_checker_.CalledOnValidThread());
+
+  if (!client_)
+    return;
+
+  // Unregister any dump provider. Safe to call (no-op) if we have not yet
+  // registered.
+  if (base::ThreadTaskRunnerHandle::IsSet()) {
+    base::trace_event::MemoryDumpManager::GetInstance()->UnregisterDumpProvider(
+        this);
+  }
+
+  if (context_provider_) {
+    context_provider_->SetLostContextCallback(
+        ContextProvider::LostContextCallback());
+  }
 }
 
-bool OutputSurface::HasExternalStencilTest() const {
-  return false;
-}
-
-void OutputSurface::ApplyExternalStencil() {}
-
 bool OutputSurface::BindToClient(OutputSurfaceClient* client) {
-  DCHECK(client_thread_checker_.CalledOnValidThread());
+  DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(client);
   DCHECK(!client_);
   client_ = client;
-  bool success = true;
 
-  if (context_provider_.get()) {
-    success = context_provider_->BindToCurrentThread();
-    if (success) {
-      context_provider_->SetLostContextCallback(base::Bind(
-          &OutputSurface::DidLoseOutputSurface, base::Unretained(this)));
-    }
+  if (context_provider_) {
+    if (!context_provider_->BindToCurrentThread())
+      return false;
+
+    context_provider_->SetLostContextCallback(base::Bind(
+        &OutputSurface::DidLoseOutputSurface, base::Unretained(this)));
   }
 
   // In certain cases, ThreadTaskRunnerHandle isn't set (Android Webview).
   // Don't register a dump provider in these cases.
   // TODO(ericrk): Get this working in Android Webview. crbug.com/517156
   if (base::ThreadTaskRunnerHandle::IsSet()) {
     // Now that we are on the context thread, register a dump provider with this
     // thread's task runner. This will overwrite any previous dump provider
     // registered.
     base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
         this, "OutputSurface", base::ThreadTaskRunnerHandle::Get());
   }
-
-  if (!success)
-    DetachFromClient();
-  return success;
-}
-
-void OutputSurface::DetachFromClient() {
-  DetachFromClientInternal();
-}
-
-void OutputSurface::EnsureBackbuffer() {
-  if (software_device_)
-    software_device_->EnsureBackbuffer();
-}
-
-void OutputSurface::DiscardBackbuffer() {
-  if (context_provider_.get())
-    context_provider_->ContextGL()->DiscardBackbufferCHROMIUM();
-  if (software_device_)
-    software_device_->DiscardBackbuffer();
+  return true;
 }
 
 void OutputSurface::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 OutputSurface::BindFramebuffer() {
-  DCHECK(context_provider_.get());
-  context_provider_->ContextGL()->BindFramebuffer(GL_FRAMEBUFFER, 0);
-}
-
 void OutputSurface::PostSwapBuffersComplete() {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&OutputSurface::OnSwapBuffersComplete,
                             weak_ptr_factory_.GetWeakPtr()));
 }
 
 // We don't post tasks bound to the client directly since they might run
 // after the OutputSurface has been destroyed.
 void OutputSurface::OnSwapBuffersComplete() {
   client_->DidSwapBuffersComplete();
 }
 
-void OutputSurface::DidReceiveTextureInUseResponses(
-    const gpu::TextureInUseResponses& responses) {
-  client_->DidReceiveTextureInUseResponses(responses);
-}
-
-OverlayCandidateValidator* OutputSurface::GetOverlayCandidateValidator() const {
-  return nullptr;
-}
-
-bool OutputSurface::IsDisplayedAsOverlayPlane() const {
-  return false;
-}
-
-unsigned OutputSurface::GetOverlayTextureId() const {
-  return 0;
-}
-
-bool OutputSurface::SurfaceIsSuspendForRecycle() const {
-  return false;
-}
-
 bool OutputSurface::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);
     }
   }
   return true;
 }
 
-void OutputSurface::DetachFromClientInternal() {
-  DCHECK(client_thread_checker_.CalledOnValidThread());
-  DCHECK(client_);
-
-  // Unregister any dump provider. Safe to call (no-op) if we have not yet
-  // registered.
-  base::trace_event::MemoryDumpManager::GetInstance()->UnregisterDumpProvider(
-      this);
-
-  if (context_provider_.get()) {
-    context_provider_->SetLostContextCallback(
-        ContextProvider::LostContextCallback());
-  }
-  context_provider_ = nullptr;
-  client_ = nullptr;
-  weak_ptr_factory_.InvalidateWeakPtrs();
-}
-
 void OutputSurface::DidLoseOutputSurface() {
   TRACE_EVENT0("cc", "OutputSurface::DidLoseOutputSurface");
   client_->DidLoseOutputSurface();
 }
 
 }  // namespace cc