Update from https://crrev.com/314320

cc/trees/property_tree_builder.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/property_tree_builder.h"
 
 #include <map>
 #include <set>
 
 #include "cc/base/math_util.h"
@@ skipping 176 matching lines @@
   transform.Scale(device_and_page_scale_factors, device_and_page_scale_factors);
 
   // TODO(vollick): We've accounted for the scroll offset here but we haven't
   // taken into account snapping to screen space pixels. For the purposes of
   // computing rects we need to record, this should be fine (the visible rects
   // we compute may be slightly different than what we'd compute with snapping,
   // but since we significantly expand the visible rect when determining what to
   // record, the slight difference should be inconsequential).
   gfx::Vector2dF position = layer->position().OffsetFromOrigin();
   if (!layer->scroll_parent()) {
-    position -= gfx::Vector2dF(layer->TotalScrollOffset().x(),
-        layer->TotalScrollOffset().y());
+    position -= gfx::Vector2dF(layer->CurrentScrollOffset().x(),
+                               layer->CurrentScrollOffset().y());
   }
 
   position += parent_offset;
 
   transform.Translate3d(position.x() + layer->transform_origin().x(),
                         position.y() + layer->transform_origin().y(),
                         layer->transform_origin().z());
   transform.PreconcatTransform(layer->transform());
   transform.Translate3d(-layer->transform_origin().x(),
                         -layer->transform_origin().y(),
@@ skipping 62 matching lines @@
   data_for_recursion.clip_tree_parent = clip_tree->Insert(root_clip, 0);
 
   BuildPropertyTreesInternal(root_layer, data_for_recursion);
 
   TransformNode* transform_root = transform_tree->Node(transform_root_id);
   transform_root->data.set_to_parent(device_transform *
                                      transform_root->data.to_parent);
 }
 
 }  // namespace cc