Fork cc::OutputSurface into cc::CompositorFrameSink.

cc/resources/resource_provider.h

Index: cc/resources/resource_provider.h
diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h
index f7732d755d92f8f911f14e147ef2cd978fec1f2b..ec4e53810564a9549a065d876246c9590da9e1c5 100644
--- a/cc/resources/resource_provider.h
+++ b/cc/resources/resource_provider.h
@@ -102,7 +102,7 @@ class CC_EXPORT ResourceProvider
 
   void Initialize();
 
-  void DidLoseOutputSurface() { lost_output_surface_ = true; }
+  void DidLoseContextProvider() { lost_context_provider_ = true; }
 
   int max_texture_size() const { return max_texture_size_; }
   ResourceFormat best_texture_format() const { return best_texture_format_; }
@@ -680,7 +680,7 @@ class CC_EXPORT ResourceProvider
   SharedBitmapManager* shared_bitmap_manager_;
   gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager_;
   BlockingTaskRunner* blocking_main_thread_task_runner_;
-  bool lost_output_surface_;
+  bool lost_context_provider_;
   int highp_threshold_min_;
   ResourceId next_id_;
   ResourceMap resources_;