| Index: cc/trees/property_tree_unittest.cc
|
| diff --git a/cc/trees/property_tree_unittest.cc b/cc/trees/property_tree_unittest.cc
|
| index 3761bd6a0ab9552e93882436c76be100ac93aa84..8d7701b86a9ffab2ad3637b98a5b9f549a8071fa 100644
|
| --- a/cc/trees/property_tree_unittest.cc
|
| +++ b/cc/trees/property_tree_unittest.cc
|
| @@ -260,7 +260,9 @@ TEST(PropertyTreeSerializationTest, ScrollNodeSerialization) {
|
| }
|
|
|
| TEST(PropertyTreeSerializationTest, ScrollTreeSerialization) {
|
| - ScrollTree original;
|
| + PropertyTrees property_trees;
|
| + property_trees.is_main_thread = true;
|
| + ScrollTree& original = property_trees.scroll_tree;
|
| ScrollNode second;
|
| second.data.scrollable = true;
|
| second.data.bounds = gfx::Size(15, 15);
|
| @@ -270,6 +272,9 @@ TEST(PropertyTreeSerializationTest, ScrollTreeSerialization) {
|
| original.Insert(second, 0);
|
| original.Insert(third, 1);
|
|
|
| + original.set_currently_scrolling_node(1);
|
| + original.synced_scroll_offset(1)->PushFromMainThread(gfx::ScrollOffset(1, 2));
|
| +
|
| proto::PropertyTree proto;
|
| original.ToProtobuf(&proto);
|
| ScrollTree result;
|
|
|