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

cc/trees/layer_tree_host.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_host.h"
 
 #include <algorithm>
 #include <stack>
 
 #include "base/bind.h"
@@ skipping 164 matching lines @@
 LayerTreeHost::OnCreateAndInitializeOutputSurfaceAttempted(bool success) {
   TRACE_EVENT1("cc",
                "LayerTreeHost::OnCreateAndInitializeOutputSurfaceAttempted",
                "success",
                success);
 
   DCHECK(output_surface_lost_);
   if (success) {
     output_surface_lost_ = false;
 
-    // Update settings_ based on partial update capability.
-    size_t max_partial_texture_updates = 0;
-    if (proxy_->GetRendererCapabilities().allow_partial_texture_updates &&
-        !settings_.impl_side_painting) {
-      max_partial_texture_updates = std::min(
-          settings_.max_partial_texture_updates,
-          proxy_->MaxPartialTextureUpdates());
-    }
-    settings_.max_partial_texture_updates = max_partial_texture_updates;
-
     if (!contents_texture_manager_ &&
         (!settings_.impl_side_painting || !settings_.solid_color_scrollbars)) {
       contents_texture_manager_ =
           PrioritizedResourceManager::Create(proxy_.get());
       surface_memory_placeholder_ =
           contents_texture_manager_->CreateTexture(gfx::Size(), GL_RGBA);
     }
 
     client_->DidInitializeOutputSurface(true);
     return CreateSucceeded;
@@ skipping 873 matching lines @@
 }
 
 void LayerTreeHost::RateLimit() {
   // Force a no-op command on the compositor context, so that any ratelimiting
   // commands will wait for the compositing context, and therefore for the
   // SwapBuffers.
   proxy_->ForceSerializeOnSwapBuffers();
 }
 
 bool LayerTreeHost::RequestPartialTextureUpdate() {
-  if (partial_texture_update_requests_ >= settings_.max_partial_texture_updates)
+  size_t max_partial_texture_updates = settings_.max_partial_texture_updates;
+  if (proxy_->GetRendererCapabilities().allow_partial_texture_updates &&
+    !settings_.impl_side_painting) {

[danakj, 2013/09/17 21:11:19]

indenting is off, run "git cl format" before you upload?

+    max_partial_texture_updates = std::min(
+        max_partial_texture_updates,
+        proxy_->MaxPartialTextureUpdates());
+  }
+
+  if (partial_texture_update_requests_ >= max_partial_texture_updates)
     return false;
 
   partial_texture_update_requests_++;
   return true;
 }
 
 void LayerTreeHost::SetDeviceScaleFactor(float device_scale_factor) {
   if (device_scale_factor == device_scale_factor_)
     return;
   device_scale_factor_ = device_scale_factor;
@@ skipping 83 matching lines @@
     request.type = UIResourceRequest::UIResourceCreate;
     request.id = uid;
     bool resource_lost = true;
     request.bitmap = iter->second->GetBitmap(uid, resource_lost);
     DCHECK(request.bitmap.get());
     ui_resource_request_queue_.push_back(request);
   }
 }
 
 }  // namespace cc