Fork cc::OutputSurface into cc::CompositorFrameSink.

cc/resources/resource_provider.cc

 // Copyright 2012 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/resources/resource_provider.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 380 matching lines @@
     int highp_threshold_min,
     size_t id_allocation_chunk_size,
     bool delegated_sync_points_required,
     bool use_gpu_memory_buffer_resources,
     bool enable_color_correct_rendering,
     const BufferToTextureTargetMap& buffer_to_texture_target_map)
     : compositor_context_provider_(compositor_context_provider),
       shared_bitmap_manager_(shared_bitmap_manager),
       gpu_memory_buffer_manager_(gpu_memory_buffer_manager),
       blocking_main_thread_task_runner_(blocking_main_thread_task_runner),
-      lost_output_surface_(false),
+      lost_context_provider_(false),
       highp_threshold_min_(highp_threshold_min),
       next_id_(1),
       next_child_(1),
       delegated_sync_points_required_(delegated_sync_points_required),
       default_resource_type_(use_gpu_memory_buffer_resources
                                  ? RESOURCE_TYPE_GPU_MEMORY_BUFFER
                                  : RESOURCE_TYPE_GL_TEXTURE),
       use_texture_storage_ext_(false),
       use_texture_format_bgra_(false),
       use_texture_usage_hint_(false),
@@ skipping 301 matching lines @@
 
 void ResourceProvider::DeleteResourceInternal(ResourceMap::iterator it,
                                               DeleteStyle style) {
   TRACE_EVENT0("cc", "ResourceProvider::DeleteResourceInternal");
   Resource* resource = &it->second;
   DCHECK(resource->exported_count == 0 || style != NORMAL);
 
   // Exported resources are lost on shutdown.
   bool exported_resource_lost =
       style == FOR_SHUTDOWN && resource->exported_count > 0;
-  // GPU resources are lost when output surface is lost.
+  // GPU resources are lost when context is lost.
   bool gpu_resource_lost =
-      IsGpuResourceType(resource->type) && lost_output_surface_;
+      IsGpuResourceType(resource->type) && lost_context_provider_;
   bool lost_resource =
       resource->lost || exported_resource_lost || gpu_resource_lost;
 
   // Wait on sync token before deleting resources we own.
   if (!lost_resource && resource->origin == Resource::INTERNAL &&
       resource->synchronization_state() == Resource::NEEDS_WAIT) {
     DCHECK(resource->allocated);
     DCHECK(IsGpuResourceType(resource->type));
     GLES2Interface* gl = ContextGL();
     DCHECK(gl);
@@ skipping 944 matching lines @@
     CHECK(it != resources_.end());
     Resource& resource = it->second;
 
     DCHECK(!resource.locked_for_write);
     DCHECK(child_info->parent_to_child_map.count(local_id));
 
     ResourceId child_id = child_info->parent_to_child_map[local_id];
     DCHECK(child_info->child_to_parent_map.count(child_id));
 
     bool is_lost = resource.lost ||
-                   (IsGpuResourceType(resource.type) && lost_output_surface_);
+                   (IsGpuResourceType(resource.type) && lost_context_provider_);
     if (resource.exported_count > 0 || resource.lock_for_read_count > 0) {
       if (style != FOR_SHUTDOWN) {
         // Defer this resource deletion.
         resource.marked_for_deletion = true;
         continue;
       }
       // We can't postpone the deletion, so we'll have to lose it.
       is_lost = true;
     } else if (!ReadLockFenceHasPassed(&resource)) {
       // TODO(dcastagna): see if it's possible to use this logic for
@@ skipping 338 matching lines @@
 
     const int kImportance = 2;
     pmd->CreateSharedGlobalAllocatorDump(guid);
     pmd->AddOwnershipEdge(dump->guid(), guid, kImportance);
   }
 
   return true;
 }
 
 }  // namespace cc