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

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

Issue 1314943008: cc: Remove implicit conversions from Rect to RectF in src/cc/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rectfconvert-cc: rebase-and-sandwich-strategy Created 5 years, 3 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 475 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 data_for_recursion.should_flatten = false; 486 data_for_recursion.should_flatten = false;
487 data_for_recursion.ancestor_clips_subtree = true; 487 data_for_recursion.ancestor_clips_subtree = true;
488 data_for_recursion.device_transform = &device_transform; 488 data_for_recursion.device_transform = &device_transform;
489 489
490 data_for_recursion.transform_tree->clear(); 490 data_for_recursion.transform_tree->clear();
491 data_for_recursion.clip_tree->clear(); 491 data_for_recursion.clip_tree->clear();
492 data_for_recursion.effect_tree->clear(); 492 data_for_recursion.effect_tree->clear();
493 data_for_recursion.sequence_number = property_trees->sequence_number; 493 data_for_recursion.sequence_number = property_trees->sequence_number;
494 494
495 ClipNode root_clip; 495 ClipNode root_clip;
496 root_clip.data.clip = viewport; 496 root_clip.data.clip = gfx::RectF(viewport);
497 root_clip.data.transform_id = kRootPropertyTreeNodeId; 497 root_clip.data.transform_id = kRootPropertyTreeNodeId;
498 data_for_recursion.clip_tree_parent = data_for_recursion.clip_tree->Insert( 498 data_for_recursion.clip_tree_parent = data_for_recursion.clip_tree->Insert(
499 root_clip, kUnclippedRootClipTreeNodeId); 499 root_clip, kUnclippedRootClipTreeNodeId);
500 BuildPropertyTreesInternal(root_layer, data_for_recursion); 500 BuildPropertyTreesInternal(root_layer, data_for_recursion);
501 property_trees->needs_rebuild = false; 501 property_trees->needs_rebuild = false;
502 502
503 // The transform tree is kept up-to-date as it is built, but the 503 // The transform tree is kept up-to-date as it is built, but the
504 // combined_clips stored in the clip tree aren't computed during tree 504 // combined_clips stored in the clip tree aren't computed during tree
505 // building. 505 // building.
506 property_trees->transform_tree.set_needs_update(false); 506 property_trees->transform_tree.set_needs_update(false);
(...skipping 27 matching lines...) Expand all
534 const gfx::Rect& viewport, 534 const gfx::Rect& viewport,
535 const gfx::Transform& device_transform, 535 const gfx::Transform& device_transform,
536 PropertyTrees* property_trees) { 536 PropertyTrees* property_trees) {
537 BuildPropertyTreesTopLevelInternal( 537 BuildPropertyTreesTopLevelInternal(
538 root_layer, page_scale_layer, inner_viewport_scroll_layer, 538 root_layer, page_scale_layer, inner_viewport_scroll_layer,
539 outer_viewport_scroll_layer, page_scale_factor, device_scale_factor, 539 outer_viewport_scroll_layer, page_scale_factor, device_scale_factor,
540 viewport, device_transform, property_trees); 540 viewport, device_transform, property_trees);
541 } 541 }
542 542
543 } // namespace cc 543 } // 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