LayerTreeHost should not modify the LayerTreeSettings object. Instead it should use a temporary va…

cc/trees/layer_tree_host.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_TREES_LAYER_TREE_HOST_H_
 #define CC_TREES_LAYER_TREE_HOST_H_
 
 #include <limits>
 #include <list>
 #include <vector>
@@ skipping 254 matching lines @@
 
   void SetImplTransform(const gfx::Transform& transform);
   void SetLatencyInfo(const ui::LatencyInfo& latency_info);
 
   virtual void StartRateLimiter(WebKit::WebGraphicsContext3D* context3d);
   virtual void StopRateLimiter(WebKit::WebGraphicsContext3D* context3d);
 
   // RateLimiterClient implementation.
   virtual void RateLimit() OVERRIDE;
 
+  size_t MaxPartialTextureUpdates() const {

[danakj, 2013/10/03 17:42:26]

rename to max_partial_texture_updates()

+    return max_partial_texture_updates_;
+  }
   bool buffered_updates() const {
-    return settings_.max_partial_texture_updates !=
+    return max_partial_texture_updates_ !=
         std::numeric_limits<size_t>::max();
   }
   bool RequestPartialTextureUpdate();
 
   void SetDeviceScaleFactor(float device_scale_factor);
   float device_scale_factor() const { return device_scale_factor_; }
 
   void UpdateTopControlsState(TopControlsState constraints,
                               TopControlsState current,
                               bool animate);
@@ skipping 95 matching lines @@
 
   scoped_refptr<Layer> root_layer_;
   scoped_refptr<HeadsUpDisplayLayer> hud_layer_;
 
   scoped_ptr<PrioritizedResourceManager> contents_texture_manager_;
   scoped_ptr<PrioritizedResource> surface_memory_placeholder_;
 
   base::WeakPtr<InputHandler> input_handler_weak_ptr_;
   base::WeakPtr<TopControlsManager> top_controls_manager_weak_ptr_;
 
-  LayerTreeSettings settings_;
+  const LayerTreeSettings settings_;
   LayerTreeDebugState debug_state_;
 
   gfx::Size device_viewport_size_;
   float overdraw_bottom_height_;
   float device_scale_factor_;
 
   bool visible_;
 
   typedef base::hash_map<WebKit::WebGraphicsContext3D*,
                          scoped_refptr<RateLimiter> > RateLimiterMap;
   RateLimiterMap rate_limiters_;
 
   float page_scale_factor_;
   float min_page_scale_factor_;
   float max_page_scale_factor_;
   gfx::Transform impl_transform_;
   bool trigger_idle_updates_;
 
   SkColor background_color_;
   bool has_transparent_background_;
 
   // If set, this texture is used to fill in the parts of the screen not
   // covered by layers.
   scoped_ptr<ScopedUIResource> overhang_ui_resource_;
 
   typedef ScopedPtrVector<PrioritizedResource> TextureList;
   size_t partial_texture_update_requests_;
+  size_t max_partial_texture_updates_;
 
   scoped_ptr<AnimationRegistrar> animation_registrar_;
 
   struct PendingPageScaleAnimation {
     gfx::Vector2d target_offset;
     bool use_anchor;
     float scale;
     base::TimeDelta duration;
   };
   scoped_ptr<PendingPageScaleAnimation> pending_page_scale_animation_;
@@ skipping 21 matching lines @@
   scoped_refptr<Layer> page_scale_layer_;
   scoped_refptr<Layer> inner_viewport_scroll_layer_;
   scoped_refptr<Layer> outer_viewport_scroll_layer_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerTreeHost);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_LAYER_TREE_HOST_H_