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

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

Issue 1159983010: Record root layer's position in its TransformNode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix typo Created 5 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 | « cc/trees/layer_tree_host_common_unittest.cc ('k') | no next file » | 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 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 node->data.needs_sublayer_scale = true; 275 node->data.needs_sublayer_scale = true;
276 node->data.layer_scale_factor = data_from_ancestor.device_scale_factor; 276 node->data.layer_scale_factor = data_from_ancestor.device_scale_factor;
277 if (data_from_ancestor.in_subtree_of_page_scale_layer) 277 if (data_from_ancestor.in_subtree_of_page_scale_layer)
278 node->data.layer_scale_factor *= data_from_ancestor.page_scale_factor; 278 node->data.layer_scale_factor *= data_from_ancestor.page_scale_factor;
279 } 279 }
280 280
281 node->data.source_node_id = source_index; 281 node->data.source_node_id = source_index;
282 if (is_root) { 282 if (is_root) {
283 node->data.post_local.Scale(post_local_scale_factor, 283 node->data.post_local.Scale(post_local_scale_factor,
284 post_local_scale_factor); 284 post_local_scale_factor);
285 node->data.post_local.Translate(layer->position().x(),
286 layer->position().y());
285 } else { 287 } else {
286 node->data.post_local_scale_factor = post_local_scale_factor; 288 node->data.post_local_scale_factor = post_local_scale_factor;
287 node->data.source_offset = source_offset; 289 node->data.source_offset = source_offset;
288 node->data.update_post_local_transform(layer->position(), 290 node->data.update_post_local_transform(layer->position(),
289 layer->transform_origin()); 291 layer->transform_origin());
290 } 292 }
291 293
292 if (!layer->scroll_parent()) 294 if (!layer->scroll_parent())
293 node->data.scroll_offset = layer->CurrentScrollOffset(); 295 node->data.scroll_offset = layer->CurrentScrollOffset();
294 296
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 float device_scale_factor, 455 float device_scale_factor,
454 const gfx::Rect& viewport, 456 const gfx::Rect& viewport,
455 const gfx::Transform& device_transform, 457 const gfx::Transform& device_transform,
456 PropertyTrees* property_trees) { 458 PropertyTrees* property_trees) {
457 BuildPropertyTreesTopLevelInternal( 459 BuildPropertyTreesTopLevelInternal(
458 root_layer, page_scale_layer, page_scale_factor, device_scale_factor, 460 root_layer, page_scale_layer, page_scale_factor, device_scale_factor,
459 viewport, device_transform, property_trees); 461 viewport, device_transform, property_trees);
460 } 462 }
461 463
462 } // namespace cc 464 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_common_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698