Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5486)

Unified Diff: cc/test/layer_tree_json_parser.cc

Issue 2194833002: Overscroll and Elasticity for views::ScrollView Base URL: https://chromium.googlesource.com/chromium/src.git@20160728-MacViews-RouteThroughInputHandler
Patch Set: Restore functionality and fix bugs \o/ Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/proto/property_tree.proto ('k') | cc/test/layer_tree_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/layer_tree_json_parser.cc
diff --git a/cc/test/layer_tree_json_parser.cc b/cc/test/layer_tree_json_parser.cc
index 11645168b3c4ede8cad8abb8ebf734b0cb083cea..7bd90a1d9b238a9d3bae6f2507d82e7e3709ff8f 100644
--- a/cc/test/layer_tree_json_parser.cc
+++ b/cc/test/layer_tree_json_parser.cc
@@ -117,9 +117,10 @@ scoped_refptr<Layer> ParseTreeFromValue(const base::Value& val,
//
// 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)) {
« no previous file with comments | « cc/proto/property_tree.proto ('k') | cc/test/layer_tree_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698