cc: Move SyncedScrollOffset to scroll tree

cc/layers/layer.cc

Index: cc/layers/layer.cc
diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc
index 38427416ddb98f0ad442ed2d10bca8a819db13f7..3943bebd3ce6464f5c499b67192d6b15c7cf026c 100644
--- a/cc/layers/layer.cc
+++ b/cc/layers/layer.cc
@@ -884,6 +884,11 @@ void Layer::SetScrollOffset(const gfx::ScrollOffset& scroll_offset) {
   if (!layer_tree_host_)
     return;
 
+  if (scroll_tree_index() != -1 && scrollable())
+    layer_tree_host_->property_trees()
+        ->scroll_tree.synced_scroll_offset(id())
+        ->PushFromMainThread(scroll_offset);
+
   if (TransformNode* transform_node =
           layer_tree_host_->property_trees()->transform_tree.Node(
               transform_tree_index())) {
@@ -923,6 +928,12 @@ void Layer::SetScrollOffsetFromImplSide(
   SetNeedsPushProperties();
 
   bool needs_rebuild = true;
+
+  if (scroll_tree_index() != -1 && scrollable())
+    layer_tree_host_->property_trees()
+        ->scroll_tree.synced_scroll_offset(id())
+        ->PushFromMainThread(scroll_offset);
+
   if (TransformNode* transform_node =
           layer_tree_host_->property_trees()->transform_tree.Node(
               transform_tree_index())) {
@@ -1337,9 +1348,10 @@ void Layer::PushPropertiesTo(LayerImpl* layer) {
   // active tree. To do so, avoid scrolling the pending tree along with it
   // instead of trying to undo that scrolling later.
   if (ScrollOffsetAnimationWasInterrupted())
-    layer->PushScrollOffsetFromMainThreadAndClobberActiveValue(scroll_offset_);
-  else
-    layer->PushScrollOffsetFromMainThread(scroll_offset_);
+    layer_tree_host()
+        ->property_trees()
+        ->scroll_tree.synced_scroll_offset(layer->id())
+        ->set_clobber_active_value();
   layer->SetScrollCompensationAdjustment(ScrollCompensationAdjustment());
 
   {