Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: cc/trees/layer_tree_host.cc

Issue 24280009: Move tile-free-software render surface disabling to UpdateDrawProperties. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | cc/trees/layer_tree_host_common.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/trees/layer_tree_host.h" 5 #include "cc/trees/layer_tree_host.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <stack> 8 #include <stack>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 779 matching lines...) Expand 10 before | Expand all | Expand 10 after
790 Layer* page_scale_layer = page_scale_layer_; 790 Layer* page_scale_layer = page_scale_layer_;
791 if (!page_scale_layer && root_scroll) 791 if (!page_scale_layer && root_scroll)
792 page_scale_layer = root_scroll->parent(); 792 page_scale_layer = root_scroll->parent();
793 793
794 if (hud_layer_) { 794 if (hud_layer_) {
795 hud_layer_->PrepareForCalculateDrawProperties( 795 hud_layer_->PrepareForCalculateDrawProperties(
796 device_viewport_size(), device_scale_factor_); 796 device_viewport_size(), device_scale_factor_);
797 } 797 }
798 798
799 TRACE_EVENT0("cc", "LayerTreeHost::UpdateLayers::CalcDrawProps"); 799 TRACE_EVENT0("cc", "LayerTreeHost::UpdateLayers::CalcDrawProps");
800 bool can_render_to_separate_surface = true;
800 LayerTreeHostCommon::CalcDrawPropsMainInputs inputs( 801 LayerTreeHostCommon::CalcDrawPropsMainInputs inputs(
801 root_layer, 802 root_layer,
802 device_viewport_size(), 803 device_viewport_size(),
803 gfx::Transform(), 804 gfx::Transform(),
804 device_scale_factor_, 805 device_scale_factor_,
805 page_scale_factor_, 806 page_scale_factor_,
806 page_scale_layer, 807 page_scale_layer,
807 GetRendererCapabilities().max_texture_size, 808 GetRendererCapabilities().max_texture_size,
808 settings_.can_use_lcd_text, 809 settings_.can_use_lcd_text,
810 can_render_to_separate_surface,
809 settings_.layer_transforms_should_scale_layer_contents, 811 settings_.layer_transforms_should_scale_layer_contents,
810 &update_list); 812 &update_list);
811 LayerTreeHostCommon::CalculateDrawProperties(&inputs); 813 LayerTreeHostCommon::CalculateDrawProperties(&inputs);
812 814
813 if (total_frames_used_for_lcd_text_metrics_ <= 815 if (total_frames_used_for_lcd_text_metrics_ <=
814 kTotalFramesToUseForLCDTextMetrics) { 816 kTotalFramesToUseForLCDTextMetrics) {
815 LayerTreeHostCommon::CallFunctionForSubtree( 817 LayerTreeHostCommon::CallFunctionForSubtree(
816 root_layer, 818 root_layer,
817 base::Bind(&LayerTreeHost::CalculateLCDTextMetricsCallback, 819 base::Bind(&LayerTreeHost::CalculateLCDTextMetricsCallback,
818 base::Unretained(this))); 820 base::Unretained(this)));
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
1234 void LayerTreeHost::RegisterViewportLayers( 1236 void LayerTreeHost::RegisterViewportLayers(
1235 scoped_refptr<Layer> page_scale_layer, 1237 scoped_refptr<Layer> page_scale_layer,
1236 scoped_refptr<Layer> inner_viewport_scroll_layer, 1238 scoped_refptr<Layer> inner_viewport_scroll_layer,
1237 scoped_refptr<Layer> outer_viewport_scroll_layer) { 1239 scoped_refptr<Layer> outer_viewport_scroll_layer) {
1238 page_scale_layer_ = page_scale_layer; 1240 page_scale_layer_ = page_scale_layer;
1239 inner_viewport_scroll_layer_ = inner_viewport_scroll_layer; 1241 inner_viewport_scroll_layer_ = inner_viewport_scroll_layer;
1240 outer_viewport_scroll_layer_ = outer_viewport_scroll_layer; 1242 outer_viewport_scroll_layer_ = outer_viewport_scroll_layer;
1241 } 1243 }
1242 1244
1243 } // namespace cc 1245 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | cc/trees/layer_tree_host_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698