From 9bc838a058f5e7e92dd8d7b6ad991dd888bb1853 Mon Sep 17 00:00:00 2001 From: "adam.treat@samsung.com" Date: Sat, 5 Oct 2013 00:27:01 +0000 Subject: LayerTreeHost should not modify the LayerTreeSettings object. Instead it should use a temporary variable wherever needed and leave the settings object const. This patch removes the last instance of this behavior and makes the settings object const. BUG=234233 Review URL: https://codereview.chromium.org/23463042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227149 0039d316-1c4b-4281-b951-d872f2087c98 --- cc/trees/layer_tree_host.cc | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'cc/trees/layer_tree_host.cc') diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc index 34f4d2f..7bece08 100644 --- a/cc/trees/layer_tree_host.cc +++ b/cc/trees/layer_tree_host.cc @@ -205,16 +205,6 @@ LayerTreeHost::OnCreateAndInitializeOutputSurfaceAttempted(bool success) { 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_ = @@ -1124,8 +1114,19 @@ bool LayerTreeHost::AlwaysUsePartialTextureUpdates() { return !proxy_->HasImplThread(); } +size_t LayerTreeHost::MaxPartialTextureUpdates() const { + 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()); + } + return max_partial_texture_updates; +} + bool LayerTreeHost::RequestPartialTextureUpdate() { - if (partial_texture_update_requests_ >= settings_.max_partial_texture_updates) + if (partial_texture_update_requests_ >= MaxPartialTextureUpdates()) return false; partial_texture_update_requests_++; -- cgit v1.1