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

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

Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b" (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 | « cc/trees/occlusion_tracker_perftest.cc ('k') | cc/trees/single_thread_proxy.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/property_tree_builder.h" 5 #include "cc/trees/property_tree_builder.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 9
10 #include "cc/base/math_util.h" 10 #include "cc/base/math_util.h"
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 const bool is_page_scale_application_layer = 111 const bool is_page_scale_application_layer =
112 layer->parent() && layer->parent() == data_from_ancestor.page_scale_layer; 112 layer->parent() && layer->parent() == data_from_ancestor.page_scale_layer;
113 const bool is_scrollable = layer->scrollable(); 113 const bool is_scrollable = layer->scrollable();
114 const bool is_fixed = layer->position_constraint().is_fixed_position(); 114 const bool is_fixed = layer->position_constraint().is_fixed_position();
115 115
116 const bool has_significant_transform = 116 const bool has_significant_transform =
117 !layer->transform().IsIdentityOr2DTranslation(); 117 !layer->transform().IsIdentityOr2DTranslation();
118 118
119 const bool has_animated_transform = 119 const bool has_animated_transform =
120 layer->layer_animation_controller()->IsAnimatingProperty( 120 layer->layer_animation_controller()->IsAnimatingProperty(
121 Animation::TRANSFORM); 121 Animation::Transform);
122 122
123 const bool has_transform_origin = layer->transform_origin() != gfx::Point3F(); 123 const bool has_transform_origin = layer->transform_origin() != gfx::Point3F();
124 124
125 const bool has_surface = !!layer->render_surface(); 125 const bool has_surface = !!layer->render_surface();
126 126
127 const bool flattening_change = layer->parent() && 127 const bool flattening_change = layer->parent() &&
128 layer->should_flatten_transform() && 128 layer->should_flatten_transform() &&
129 !layer->parent()->should_flatten_transform(); 129 !layer->parent()->should_flatten_transform();
130 130
131 bool requires_node = is_root || is_scrollable || is_fixed || 131 bool requires_node = is_root || is_scrollable || is_fixed ||
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 data_for_recursion.device_transform = &device_transform; 275 data_for_recursion.device_transform = &device_transform;
276 276
277 ClipNode root_clip; 277 ClipNode root_clip;
278 root_clip.data.clip = viewport; 278 root_clip.data.clip = viewport;
279 root_clip.data.transform_id = 0; 279 root_clip.data.transform_id = 0;
280 data_for_recursion.clip_tree_parent = clip_tree->Insert(root_clip, 0); 280 data_for_recursion.clip_tree_parent = clip_tree->Insert(root_clip, 0);
281 BuildPropertyTreesInternal(root_layer, data_for_recursion); 281 BuildPropertyTreesInternal(root_layer, data_for_recursion);
282 } 282 }
283 283
284 } // namespace cc 284 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/occlusion_tracker_perftest.cc ('k') | cc/trees/single_thread_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698