| Index: cc/trees/layer_tree_host_common.cc
|
| diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc
|
| index 072a7633324df615687ebc26a65fdc60f1c98e45..7d0d36d97b4cfbc7d12b8cd3c6edef4d8678d0fc 100644
|
| --- a/cc/trees/layer_tree_host_common.cc
|
| +++ b/cc/trees/layer_tree_host_common.cc
|
| @@ -65,8 +65,8 @@ static gfx::Vector2dF GetEffectiveScrollDelta(LayerType* layer) {
|
| }
|
|
|
| template <typename LayerType>
|
| -static gfx::ScrollOffset GetEffectiveTotalScrollOffset(LayerType* layer) {
|
| - gfx::ScrollOffset offset = layer->TotalScrollOffset();
|
| +static gfx::ScrollOffset GetEffectiveCurrentScrollOffset(LayerType* layer) {
|
| + gfx::ScrollOffset offset = layer->CurrentScrollOffset();
|
| // The scroll parent's total scroll offset (scroll offset + scroll delta)
|
| // can't be used because its scroll offset has already been applied to the
|
| // scroll children's positions by the main thread layer positioning code.
|
| @@ -1674,7 +1674,7 @@ static void CalculateDrawPropertiesInternal(
|
| layer->parent()->screen_space_transform_is_animating();
|
| }
|
| gfx::Point3F transform_origin = layer->transform_origin();
|
| - gfx::ScrollOffset scroll_offset = GetEffectiveTotalScrollOffset(layer);
|
| + gfx::ScrollOffset scroll_offset = GetEffectiveCurrentScrollOffset(layer);
|
| gfx::PointF position =
|
| layer->position() - ScrollOffsetToVector2dF(scroll_offset);
|
| gfx::Transform combined_transform = data_from_ancestor.parent_matrix;
|
|
|