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

Side by Side Diff: cc/layers/layer_impl.cc

Issue 2087963003: cc: Stop creating unused 0 property tree nodes other than transform Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
« no previous file with comments | « no previous file | cc/layers/render_surface_impl.cc » ('j') | cc/trees/draw_property_utils.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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/layers/layer_impl.h" 5 #include "cc/layers/layer_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 1223 matching lines...) Expand 10 before | Expand all | Expand 10 after
1234 EffectNode* node = effect_tree.Node(effect_tree_index_); 1234 EffectNode* node = effect_tree.Node(effect_tree_index_);
1235 return node->data.screen_space_opacity == 0.f; 1235 return node->data.screen_space_opacity == 0.f;
1236 } 1236 }
1237 1237
1238 bool LayerImpl::InsideReplica() const { 1238 bool LayerImpl::InsideReplica() const {
1239 // There are very few render targets so this should be cheap to do for each 1239 // There are very few render targets so this should be cheap to do for each
1240 // layer instead of something more complicated. 1240 // layer instead of something more complicated.
1241 EffectTree& effect_tree = layer_tree_impl_->property_trees()->effect_tree; 1241 EffectTree& effect_tree = layer_tree_impl_->property_trees()->effect_tree;
1242 EffectNode* node = effect_tree.Node(effect_tree_index_); 1242 EffectNode* node = effect_tree.Node(effect_tree_index_);
1243 1243
1244 while (node->id > 0) { 1244 while (node->id > EffectTree::kRootNodeId) {
1245 if (node->data.replica_layer_id != -1) 1245 if (node->data.replica_layer_id != EffectTree::kInvalidNodeId)
ajuma 2016/06/22 13:29:50 Layer::INVALID_ID since this is a layer id
1246 return true; 1246 return true;
1247 node = effect_tree.Node(node->data.target_id); 1247 node = effect_tree.Node(node->data.target_id);
1248 } 1248 }
1249 1249
1250 return false; 1250 return node->data.replica_layer_id != EffectTree::kInvalidNodeId;
ajuma 2016/06/22 13:29:50 Here too, Layer::INVALID_ID
1251 } 1251 }
1252 1252
1253 float LayerImpl::GetIdealContentsScale() const { 1253 float LayerImpl::GetIdealContentsScale() const {
1254 float page_scale = IsAffectedByPageScale() 1254 float page_scale = IsAffectedByPageScale()
1255 ? layer_tree_impl()->current_page_scale_factor() 1255 ? layer_tree_impl()->current_page_scale_factor()
1256 : 1.f; 1256 : 1.f;
1257 float device_scale = layer_tree_impl()->device_scale_factor(); 1257 float device_scale = layer_tree_impl()->device_scale_factor();
1258 1258
1259 float default_scale = page_scale * device_scale; 1259 float default_scale = page_scale * device_scale;
1260 if (!layer_tree_impl() 1260 if (!layer_tree_impl()
1261 ->settings() 1261 ->settings()
1262 .layer_transforms_should_scale_layer_contents) { 1262 .layer_transforms_should_scale_layer_contents) {
1263 return default_scale; 1263 return default_scale;
1264 } 1264 }
1265 1265
1266 gfx::Vector2dF transform_scales = MathUtil::ComputeTransform2dScaleComponents( 1266 gfx::Vector2dF transform_scales = MathUtil::ComputeTransform2dScaleComponents(
1267 ScreenSpaceTransform(), default_scale); 1267 ScreenSpaceTransform(), default_scale);
1268 return std::max(transform_scales.x(), transform_scales.y()); 1268 return std::max(transform_scales.x(), transform_scales.y());
1269 } 1269 }
1270 1270
1271 } // namespace cc 1271 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | cc/layers/render_surface_impl.cc » ('j') | cc/trees/draw_property_utils.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698