Overscroll and Elasticity for views::ScrollView

cc/test/layer_tree_json_parser.cc

 // Copyright 2013 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/test/layer_tree_json_parser.h"
 
 #include <stddef.h>
 
 #include "base/test/values_test_util.h"
 #include "base/values.h"
@@ skipping 99 matching lines @@
   // the parent pointer to this function and traversing the same number of
   // ancestors to determine the pointer to the clip layer. The LayerTreesMatch()
   // function should then check that both original and reconstructed layers
   // have the same positioning with respect to their clip layers.
   //
   // For now, we can safely indicate a layer is scrollable by giving it a
   // pointer to itself, something not normally allowed in a working tree.
   //
   // https://code.google.com/p/chromium/issues/detail?id=330622
   //
-  if (dict->GetBoolean("Scrollable", &scrollable))
-    new_layer->SetScrollClipLayerId(scrollable ? new_layer->id()
-                                               : Layer::INVALID_ID);
+  if (dict->GetBoolean("Scrollable", &scrollable)) {
+    new_layer->SetScrollClipAndCanOverscroll(
+        scrollable ? new_layer->id() : Layer::INVALID_ID, false);
+  }
 
   bool is_3d_sorted;
   if (dict->GetBoolean("Is3DSorted", &is_3d_sorted)) {
     // A non-zero context ID will put the layer into a 3D sorting context
     new_layer->Set3dSortingContextId(is_3d_sorted ? 1 : 0);
   }
 
   if (dict->HasKey("TouchRegion")) {
     success &= dict->GetList("TouchRegion", &list);
     Region touch_region;
@@ skipping 30 matching lines @@
 
 }  // namespace
 
 scoped_refptr<Layer> ParseTreeFromJson(std::string json,
                                        ContentLayerClient* content_client) {
   std::unique_ptr<base::Value> val = base::test::ParseJson(json);
   return ParseTreeFromValue(*val, content_client);
 }
 
 }  // namespace cc