Update from https://crrev.com/309717

cc/layers/layer_impl.h

 // 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.
 
 #ifndef CC_LAYERS_LAYER_IMPL_H_
 #define CC_LAYERS_LAYER_IMPL_H_
 
 #include <set>
 #include <string>
 
@@ skipping 204 matching lines @@
   virtual ScrollbarLayerImplBase* ToScrollbarLayer();
 
   // Returns true if this layer has content to draw.
   void SetDrawsContent(bool draws_content);
   bool DrawsContent() const { return draws_content_; }
 
   int NumDescendantsThatDrawContent() const;
   void SetHideLayerAndSubtree(bool hide);
   bool hide_layer_and_subtree() const { return hide_layer_and_subtree_; }
 
-  bool force_render_surface() const { return force_render_surface_; }
-  void SetForceRenderSurface(bool force) { force_render_surface_ = force; }
-
   void SetTransformOrigin(const gfx::Point3F& transform_origin);
   gfx::Point3F transform_origin() const { return transform_origin_; }
 
   void SetBackgroundColor(SkColor background_color);
   SkColor background_color() const { return background_color_; }
   // If contents_opaque(), return an opaque color else return a
   // non-opaque color.  Tries to return background_color(), if possible.
   SkColor SafeOpaqueBackgroundColor() const;
 
   void SetFilters(const FilterOperations& filters);
@@ skipping 58 matching lines @@
   }
   bool use_parent_backface_visibility() const {
     return use_parent_backface_visibility_;
   }
 
   bool ShowDebugBorders() const;
 
   // These invalidate the host's render surface layer list.  The caller
   // is responsible for calling set_needs_update_draw_properties on the tree
   // so that its list can be recreated.
-  void CreateRenderSurface();
-  void ClearRenderSurface();
   void ClearRenderSurfaceLayerList();
+  void SetHasRenderSurface(bool has_render_surface);
+
+  RenderSurfaceImpl* render_surface() const { return render_surface_.get(); }
 
   DrawProperties<LayerImpl>& draw_properties() {
     return draw_properties_;
   }
   const DrawProperties<LayerImpl>& draw_properties() const {
     return draw_properties_;
   }
 
   // The following are shortcut accessors to get various information from
   // draw_properties_
@@ skipping 31 matching lines @@
   LayerImpl* render_target() {
     DCHECK(!draw_properties_.render_target ||
            draw_properties_.render_target->render_surface());
     return draw_properties_.render_target;
   }
   const LayerImpl* render_target() const {
     DCHECK(!draw_properties_.render_target ||
            draw_properties_.render_target->render_surface());
     return draw_properties_.render_target;
   }
-  RenderSurfaceImpl* render_surface() const {
-    return draw_properties_.render_surface.get();
-  }
+
   int num_unclipped_descendants() const {
     return draw_properties_.num_unclipped_descendants;
   }
 
   // The client should be responsible for setting bounds, content bounds and
   // contents scale to appropriate values. LayerImpl doesn't calculate any of
   // them from the other values.
 
   void SetBounds(const gfx::Size& bounds);
   gfx::Size bounds() const;
@@ skipping 187 matching lines @@
   virtual void RunMicroBenchmark(MicroBenchmarkImpl* benchmark);
 
   virtual void SetDebugInfo(
       scoped_refptr<base::debug::ConvertableToTraceFormat> other);
 
   bool IsDrawnRenderSurfaceLayerListMember() const;
 
   void Set3dSortingContextId(int id);
   int sorting_context_id() { return sorting_context_id_; }
 
-  // TODO(vollick): These is temporary and will be removed as soon as render
-  // surface determinations are moved out of CDP. They only exist because
-  // certain logic depends on whether or not a layer would render to a separate
-  // surface, but CDP destroys surfaces and targets it doesn't need, so without
-  // this boolean, this is impossible to determine after the fact without
-  // wastefully recomputing it.
-  void SetHasRenderSurface(bool value) {}
-
  protected:
   LayerImpl(LayerTreeImpl* layer_impl, int id);
 
   // Get the color and size of the layer's debug border.
   virtual void GetDebugBorderProperties(SkColor* color, float* width) const;
 
   void AppendDebugBorderQuad(RenderPass* render_pass,
                              const gfx::Size& content_bounds,
                              const SharedQuadState* shared_quad_state,
                              AppendQuadsData* append_quads_data) const;
@@ skipping 60 matching lines @@
   // Tracks if drawing-related properties have changed since last redraw.
   bool layer_property_changed_ : 1;
 
   bool masks_to_bounds_ : 1;
   bool contents_opaque_ : 1;
   bool is_root_for_isolated_group_ : 1;
   bool use_parent_backface_visibility_ : 1;
   bool draw_checkerboard_for_missing_tiles_ : 1;
   bool draws_content_ : 1;
   bool hide_layer_and_subtree_ : 1;
-  bool force_render_surface_ : 1;
 
   // Cache transform_'s invertibility.
   bool transform_is_invertible_ : 1;
 
   // Set for the layer that other layers are fixed to.
   bool is_container_for_fixed_position_layers_ : 1;
   Region non_fast_scrollable_region_;
   Region touch_event_handler_region_;
   SkColor background_color_;
 
@@ skipping 53 matching lines @@
 
   scoped_ptr<ScrollbarSet> scrollbars_;
 
   ScopedPtrVector<CopyOutputRequest> copy_requests_;
 
   // Group of properties that need to be computed based on the layer tree
   // hierarchy before layers can be drawn.
   DrawProperties<LayerImpl> draw_properties_;
 
   scoped_refptr<base::debug::ConvertableToTraceFormat> debug_info_;
-
+  scoped_ptr<RenderSurfaceImpl> render_surface_;
   DISALLOW_COPY_AND_ASSIGN(LayerImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_LAYER_IMPL_H_