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

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

Issue 1142853003: cc: Make TransformNodeData scroll offset a ScrollOffset (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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/property_tree.h ('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.post_local.Scale(post_local_scale_factor, 275 node->data.post_local.Scale(post_local_scale_factor,
276 post_local_scale_factor); 276 post_local_scale_factor);
277 } else { 277 } else {
278 node->data.post_local_scale_factor = post_local_scale_factor; 278 node->data.post_local_scale_factor = post_local_scale_factor;
279 node->data.source_offset = source_offset; 279 node->data.source_offset = source_offset;
280 node->data.source_node_id = source_index; 280 node->data.source_node_id = source_index;
281 node->data.update_post_local_transform(layer->position(), 281 node->data.update_post_local_transform(layer->position(),
282 layer->transform_origin()); 282 layer->transform_origin());
283 } 283 }
284 284
285 if (!layer->scroll_parent()) { 285 if (!layer->scroll_parent())
286 node->data.scroll_offset = 286 node->data.scroll_offset = layer->CurrentScrollOffset();
287 gfx::ScrollOffsetToVector2dF(layer->CurrentScrollOffset());
288 }
289 287
290 node->data.local = layer->transform(); 288 node->data.local = layer->transform();
291 node->data.update_pre_local_transform(layer->transform_origin()); 289 node->data.update_pre_local_transform(layer->transform_origin());
292 290
293 node->data.needs_local_transform_update = true; 291 node->data.needs_local_transform_update = true;
294 data_from_ancestor.transform_tree->UpdateTransforms(node->id); 292 data_from_ancestor.transform_tree->UpdateTransforms(node->id);
295 293
296 layer->set_offset_to_transform_parent(gfx::Vector2dF()); 294 layer->set_offset_to_transform_parent(gfx::Vector2dF());
297 295
298 // Flattening (if needed) will be handled by |node|. 296 // Flattening (if needed) will be handled by |node|.
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 float device_scale_factor, 443 float device_scale_factor,
446 const gfx::Rect& viewport, 444 const gfx::Rect& viewport,
447 const gfx::Transform& device_transform, 445 const gfx::Transform& device_transform,
448 PropertyTrees* property_trees) { 446 PropertyTrees* property_trees) {
449 BuildPropertyTreesTopLevelInternal( 447 BuildPropertyTreesTopLevelInternal(
450 root_layer, page_scale_layer, page_scale_factor, device_scale_factor, 448 root_layer, page_scale_layer, page_scale_factor, device_scale_factor,
451 viewport, device_transform, property_trees); 449 viewport, device_transform, property_trees);
452 } 450 }
453 451
454 } // namespace cc 452 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/property_tree.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698