Chromium Code Reviews| Index: cc/layers/layer.cc |
| diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc |
| index d016571e9094b6ea052661a4dbcee33e80a4d6c5..e2469c34a7d4e3b6991fee38eff4a56271d0a34a 100644 |
| --- a/cc/layers/layer.cc |
| +++ b/cc/layers/layer.cc |
| @@ -674,7 +674,11 @@ void Layer::RemoveClipChild(Layer* child) { |
| void Layer::SetScrollOffset(gfx::Vector2d scroll_offset) { |
| DCHECK(IsPropertyChangeAllowed()); |
| - if (layer_tree_host()) { |
| + // TODO(bokan): Virtual viewport pinch doesn't need manual updates of main |
| + // frame and pinch viewport layers. Remove once old-style pinch is no longer |
| + // supported. |
| + if (layer_tree_host() && |
| + !layer_tree_host()->settings().use_pinch_virtual_viewport) { |
| scroll_offset = layer_tree_host()->DistributeScrollOffsetToViewports( |
|
aelias_OOO_until_Jul13
2014/03/25 00:09:23
It looks like this method just does "return offset
|
| scroll_offset, this); |
| } |