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

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

Issue 1357423009: gfx: Make conversions from Size to SizeF be explicit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sizefconvert-gfx: . Created 5 years, 2 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
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 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 ancestor_clips_subtree)) { 129 ancestor_clips_subtree)) {
130 // Unclipped surfaces reset the clip rect. 130 // Unclipped surfaces reset the clip rect.
131 data_for_children->clip_tree_parent = parent_id; 131 data_for_children->clip_tree_parent = parent_id;
132 } else { 132 } else {
133 LayerType* transform_parent = data_for_children->transform_tree_parent; 133 LayerType* transform_parent = data_for_children->transform_tree_parent;
134 if (layer->position_constraint().is_fixed_position() && 134 if (layer->position_constraint().is_fixed_position() &&
135 !created_transform_node) { 135 !created_transform_node) {
136 transform_parent = data_for_children->transform_fixed_parent; 136 transform_parent = data_for_children->transform_fixed_parent;
137 } 137 }
138 ClipNode node; 138 ClipNode node;
139 node.data.clip = gfx::RectF( 139 node.data.clip =
140 gfx::PointF() + layer->offset_to_transform_parent(), layer->bounds()); 140 gfx::RectF(gfx::PointF() + layer->offset_to_transform_parent(),
141 gfx::SizeF(layer->bounds()));
141 node.data.transform_id = transform_parent->transform_tree_index(); 142 node.data.transform_id = transform_parent->transform_tree_index();
142 node.data.target_id = 143 node.data.target_id =
143 data_for_children->effect_tree->Node(data_for_children->render_target) 144 data_for_children->effect_tree->Node(data_for_children->render_target)
144 ->data.transform_id; 145 ->data.transform_id;
145 node.owner_id = layer->id(); 146 node.owner_id = layer->id();
146 node.data.inherit_parent_target_space_clip = !layer_clips_subtree && 147 node.data.inherit_parent_target_space_clip = !layer_clips_subtree &&
147 layer->has_render_surface() && 148 layer->has_render_surface() &&
148 ancestor_clips_subtree; 149 ancestor_clips_subtree;
149 node.data.requires_tight_clip_rect = 150 node.data.requires_tight_clip_rect =
150 ancestor_clips_subtree && 151 ancestor_clips_subtree &&
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 const gfx::Rect& viewport, 567 const gfx::Rect& viewport,
567 const gfx::Transform& device_transform, 568 const gfx::Transform& device_transform,
568 PropertyTrees* property_trees) { 569 PropertyTrees* property_trees) {
569 BuildPropertyTreesTopLevelInternal( 570 BuildPropertyTreesTopLevelInternal(
570 root_layer, page_scale_layer, inner_viewport_scroll_layer, 571 root_layer, page_scale_layer, inner_viewport_scroll_layer,
571 outer_viewport_scroll_layer, page_scale_factor, device_scale_factor, 572 outer_viewport_scroll_layer, page_scale_factor, device_scale_factor,
572 viewport, device_transform, property_trees); 573 viewport, device_transform, property_trees);
573 } 574 }
574 575
575 } // namespace cc 576 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_impl_unittest.cc ('k') | chrome/browser/android/compositor/layer/thumbnail_layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698