cc : Stop pushing properties not used by LayerImpl to LayerImpl. (2)

cc/layers/layer.h

 // Copyright 2010 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_H_
 #define CC_LAYERS_LAYER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 270 matching lines @@
 
   void SetTouchEventHandlerRegion(const Region& touch_event_handler_region);
   const Region& touch_event_handler_region() const {
     return touch_event_handler_region_;
   }
 
   void set_did_scroll_callback(const base::Closure& callback) {
     did_scroll_callback_ = callback;
   }
 
-  void SetForceRenderSurface(bool force_render_surface);
-  bool force_render_surface() const { return force_render_surface_; }
+  void SetForceRenderSurfaceForTesting(bool force_render_surface);
+  bool force_render_surface_for_testing() const {
+    return force_render_surface_for_testing_;
+  }
 
   gfx::ScrollOffset CurrentScrollOffset() const { return scroll_offset_; }
 
   void SetDoubleSided(bool double_sided);
   bool double_sided() const { return double_sided_; }
 
   void SetShouldFlattenTransform(bool flatten);
   bool should_flatten_transform() const { return should_flatten_transform_; }
 
   bool Is3dSorted() const { return sorting_context_id_ != 0; }
@@ skipping 329 matching lines @@
   bool is_drawable_ : 1;
   bool draws_content_ : 1;
   bool hide_layer_and_subtree_ : 1;
   bool masks_to_bounds_ : 1;
   bool contents_opaque_ : 1;
   bool double_sided_ : 1;
   bool should_flatten_transform_ : 1;
   bool use_parent_backface_visibility_ : 1;
   bool use_local_transform_for_backface_visibility_ : 1;
   bool should_check_backface_visibility_ : 1;
-  bool force_render_surface_ : 1;
+  bool force_render_surface_for_testing_ : 1;
   bool transform_is_invertible_ : 1;
   bool has_render_surface_ : 1;
   bool subtree_property_changed_ : 1;
   Region non_fast_scrollable_region_;
   Region touch_event_handler_region_;
   gfx::PointF position_;
   SkColor background_color_;
   SkColor safe_opaque_background_color_;
   float opacity_;
   SkXfermode::Mode blend_mode_;
@@ skipping 26 matching lines @@
   // These all act like draw properties, so don't need push properties.
   gfx::Rect visible_layer_rect_;
   size_t num_unclipped_descendants_;
 
   DISALLOW_COPY_AND_ASSIGN(Layer);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_LAYER_H_