| Index: cc/trees/property_tree_builder.cc
|
| diff --git a/cc/trees/property_tree_builder.cc b/cc/trees/property_tree_builder.cc
|
| index b717239d20181c4af65b1e2cc6193a1d0a65cdbf..d52f13951a4551e2d65ed6a2e4a284fdd312ee5f 100644
|
| --- a/cc/trees/property_tree_builder.cc
|
| +++ b/cc/trees/property_tree_builder.cc
|
| @@ -54,7 +54,7 @@ struct DataForRecursion {
|
| uint32_t main_thread_scrolling_reasons;
|
| bool scroll_tree_parent_created_by_uninheritable_criteria;
|
| const gfx::Transform* device_transform;
|
| - gfx::Vector2dF scroll_compensation_adjustment;
|
| + gfx::Vector2dF scroll_snap;
|
| gfx::Transform compound_transform_since_render_target;
|
| bool axis_align_since_render_target;
|
| int sequence_number;
|
| @@ -287,7 +287,7 @@ bool AddTransformNodeIfNeeded(
|
| ->offset_to_transform_parent();
|
| source_index =
|
| data_from_ancestor.transform_tree_parent->transform_tree_index();
|
| - source_offset += data_from_ancestor.scroll_compensation_adjustment;
|
| + source_offset -= data_from_ancestor.scroll_snap;
|
| }
|
| }
|
|
|
| @@ -307,7 +307,7 @@ bool AddTransformNodeIfNeeded(
|
| data_for_children->transform_tree_parent = layer;
|
|
|
| if (layer->IsContainerForFixedPositionLayers() || is_fixed)
|
| - data_for_children->scroll_compensation_adjustment = gfx::Vector2dF();
|
| + data_for_children->scroll_snap = gfx::Vector2dF();
|
|
|
| if (!requires_node) {
|
| data_for_children->should_flatten |= layer->should_flatten_transform();
|
| @@ -447,8 +447,7 @@ bool AddTransformNodeIfNeeded(
|
| // Flattening (if needed) will be handled by |node|.
|
| layer->set_should_flatten_transform_from_property_tree(false);
|
|
|
| - data_for_children->scroll_compensation_adjustment +=
|
| - layer->ScrollCompensationAdjustment() - node->data.scroll_snap;
|
| + data_for_children->scroll_snap += node->data.scroll_snap;
|
|
|
| node->owner_id = layer->id();
|
|
|
|
|