summaryrefslogtreecommitdiffstats
path: root/cc/layers/layer.cc
diff options
context:
space:
mode:
authorsunxd <sunxd@chromium.org>2016-03-16 09:23:20 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-16 16:25:20 +0000
commitc044b11a0cdf5bfc7c13c1b2dfb41b6b415e18f5 (patch)
treef3e3e7e3422326e4dae307d3f08dfbab7bc4a3c3 /cc/layers/layer.cc
parentb18dcbd20c61ba22fd430bbbf0066f738d480a66 (diff)
downloadchromium_src-c044b11a0cdf5bfc7c13c1b2dfb41b6b415e18f5.zip
chromium_src-c044b11a0cdf5bfc7c13c1b2dfb41b6b415e18f5.tar.gz
chromium_src-c044b11a0cdf5bfc7c13c1b2dfb41b6b415e18f5.tar.bz2
Clean scroll logic in LayerTreeImpl:
* Move DidUpdateScrollOffset to LayerTreeImpl * Make SyncedScrollOffset transparent to LayerImpl BUG=568830 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1803643002 Cr-Commit-Position: refs/heads/master@{#381467}
Diffstat (limited to 'cc/layers/layer.cc')
-rw-r--r--cc/layers/layer.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc
index d8d7e51..b820387 100644
--- a/cc/layers/layer.cc
+++ b/cc/layers/layer.cc
@@ -1269,8 +1269,7 @@ void Layer::PushPropertiesTo(LayerImpl* layer) {
if (ScrollOffsetAnimationWasInterrupted())
layer_tree_host()
->property_trees()
- ->scroll_tree.synced_scroll_offset(layer->id())
- ->set_clobber_active_value();
+ ->scroll_tree.SetScrollOffsetClobberActiveValue(layer->id());
{
TRACE_EVENT0("cc", "Layer::PushPropertiesTo::CopyOutputRequests");