Fork cc::OutputSurface into cc::CompositorFrameSink.

cc/trees/layer_tree_impl.cc

 // Copyright 2011 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/trees/layer_tree_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 912 matching lines @@
 bool LayerTreeImpl::UpdateDrawProperties(bool update_lcd_text) {
   if (!needs_update_draw_properties_)
     return true;
 
   // Calling UpdateDrawProperties must clear this flag, so there can be no
   // early outs before this.
   needs_update_draw_properties_ = false;
 
   // For max_texture_size. When a new output surface is received the needs
   // update draw properties flag is set again.
-  if (!layer_tree_host_impl_->output_surface())
+  if (!layer_tree_host_impl_->compositor_frame_sink())
     return false;
 
   // Clear this after the renderer early out, as it should still be
   // possible to hit test even without a renderer.
   render_surface_layer_list_.clear();
 
   if (layer_list_.empty())
     return false;
 
   {
@@ skipping 316 matching lines @@
 
 const LayerTreeSettings& LayerTreeImpl::settings() const {
   return layer_tree_host_impl_->settings();
 }
 
 const LayerTreeDebugState& LayerTreeImpl::debug_state() const {
   return layer_tree_host_impl_->debug_state();
 }
 
 ContextProvider* LayerTreeImpl::context_provider() const {
-  return output_surface()->context_provider();
-}
-
-OutputSurface* LayerTreeImpl::output_surface() const {
-  return layer_tree_host_impl_->output_surface();
+  return layer_tree_host_impl_->compositor_frame_sink()->context_provider();
 }
 
 ResourceProvider* LayerTreeImpl::resource_provider() const {
   return layer_tree_host_impl_->resource_provider();
 }
 
 TileManager* LayerTreeImpl::tile_manager() const {
   return layer_tree_host_impl_->tile_manager();
 }
 
@@ skipping 791 matching lines @@
 
 void LayerTreeImpl::ResetAllChangeTracking() {
   layers_that_should_push_properties_.clear();
   // Iterate over all layers, including masks and replicas.
   for (auto& layer : *layers_)
     layer->ResetChangeTracking();
   property_trees_.ResetAllChangeTracking();
 }
 
 }  // namespace cc