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

Unified Diff: cc/trees/property_tree_builder.cc

Issue 2254543004: cc : Delete LayerImpl::transform (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: cc/trees/property_tree_builder.cc
diff --git a/cc/trees/property_tree_builder.cc b/cc/trees/property_tree_builder.cc
index b1a33d69e38866effd23650e3557a03cced75254..83bcbe27a59dad8e70d94f75a5d3939495b45caf 100644
--- a/cc/trees/property_tree_builder.cc
+++ b/cc/trees/property_tree_builder.cc
@@ -233,6 +233,14 @@ static LayerImpl* ReplicaLayer(LayerImpl* layer) {
return layer->test_properties()->replica_layer;
}
+static const gfx::Transform& Transform(Layer* layer) {
+ return layer->transform();
+}
+
+static const gfx::Transform& Transform(LayerImpl* layer) {
+ return layer->test_properties()->transform;
+}
+
// Methods to query state from the AnimationHost ----------------------
template <typename LayerType>
bool OpacityIsAnimating(LayerType* layer) {
@@ -486,7 +494,7 @@ bool AddTransformNodeIfNeeded(
const bool is_fixed = PositionConstraint(layer).is_fixed_position();
const bool has_significant_transform =
- !layer->transform().IsIdentityOr2DTranslation();
+ !Transform(layer).IsIdentityOr2DTranslation();
const bool has_potentially_animated_transform =
HasPotentiallyRunningTransformAnimation(layer);
@@ -549,7 +557,7 @@ bool AddTransformNodeIfNeeded(
layer == data_from_ancestor.outer_viewport_scroll_layer;
if (is_scrollable) {
DCHECK(!is_root);
- DCHECK(layer->transform().IsIdentity());
+ DCHECK(Transform(layer).IsIdentity());
data_for_children->transform_fixed_parent = Parent(layer);
} else {
data_for_children->transform_fixed_parent = layer;
@@ -560,7 +568,7 @@ bool AddTransformNodeIfNeeded(
if (!requires_node) {
data_for_children->should_flatten |= ShouldFlattenTransform(layer);
gfx::Vector2dF local_offset = layer->position().OffsetFromOrigin() +
- layer->transform().To2dTranslation();
+ Transform(layer).To2dTranslation();
gfx::Vector2dF source_to_parent;
if (source_index != parent_index) {
gfx::Transform to_parent;
@@ -678,7 +686,7 @@ bool AddTransformNodeIfNeeded(
}
}
- node->local = layer->transform();
+ node->local = Transform(layer);
node->update_pre_local_transform(TransformOrigin(layer));
node->needs_local_transform_update = true;
@@ -813,7 +821,7 @@ bool ShouldCreateRenderSurface(LayerType* layer,
gfx::Transform current_transform,
bool axis_aligned) {
const bool preserves_2d_axis_alignment =
- (current_transform * layer->transform()).Preserves2dAxisAlignment() &&
+ (current_transform * Transform(layer)).Preserves2dAxisAlignment() &&
axis_aligned && AnimationsPreserveAxisAlignment(layer);
const bool is_root = !Parent(layer);
if (is_root)
@@ -957,7 +965,7 @@ bool AddEffectNodeIfNeeded(
layer->SetEffectTreeIndex(parent_id);
data_for_children->effect_tree_parent = parent_id;
data_for_children->compound_transform_since_render_target *=
- layer->transform();
+ Transform(layer);
return false;
}

Powered by Google App Engine
This is Rietveld 408576698