cc: Remove things from OutputSurface and CompositorFrameSink.

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 101 matching lines @@
   }
 
   base::trace_event::ProcessMemoryDump* pmd_;
   uint64_t share_group_tracing_guid_;
 
   DISALLOW_COPY_AND_ASSIGN(SkiaGpuTraceMemoryDump);
 };
 
 }  // namespace
 
-OutputSurface::OutputSurface(
-    scoped_refptr<ContextProvider> context_provider,
-    scoped_refptr<ContextProvider> worker_context_provider,
-    std::unique_ptr<SoftwareOutputDevice> software_device)
-    : context_provider_(std::move(context_provider)),
-      worker_context_provider_(std::move(worker_context_provider)),
-      software_device_(std::move(software_device)),
-      weak_ptr_factory_(this) {
+OutputSurface::OutputSurface(scoped_refptr<ContextProvider> context_provider)
+    : context_provider_(std::move(context_provider)), weak_ptr_factory_(this) {
+  DCHECK(context_provider_);
   client_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();
+}
+
 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();
 }
 
 OutputSurface::~OutputSurface() {
   if (client_)
     DetachFromClientInternal();
 }
 
 bool OutputSurface::HasExternalStencilTest() const {
   return false;
@@ skipping 109 matching lines @@
 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);
     }
   }
-  if (auto* context_provider = worker_context_provider()) {
-    ContextProvider::ScopedContextLock scoped_context(context_provider);
-
-    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