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

Side by Side Diff: cc/trees/property_tree_unittest.cc

Issue 1886973005: cc: Clear the |layer_id_to_scroll_offset_map_| during ScrollTree deserialization . (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add back previous test expectation. Created 4 years, 8 months 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 unified diff | Download patch
« no previous file with comments | « cc/trees/property_tree.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/trees/property_tree.h" 5 #include "cc/trees/property_tree.h"
6 6
7 #include "cc/input/main_thread_scrolling_reason.h" 7 #include "cc/input/main_thread_scrolling_reason.h"
8 #include "cc/proto/property_tree.pb.h" 8 #include "cc/proto/property_tree.pb.h"
9 #include "cc/test/geometry_test_utils.h" 9 #include "cc/test/geometry_test_utils.h"
10 #include "cc/trees/draw_property_utils.h" 10 #include "cc/trees/draw_property_utils.h"
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 274
275 original.set_currently_scrolling_node(1); 275 original.set_currently_scrolling_node(1);
276 original.SetScrollOffset(1, gfx::ScrollOffset(1, 2)); 276 original.SetScrollOffset(1, gfx::ScrollOffset(1, 2));
277 277
278 proto::PropertyTree proto; 278 proto::PropertyTree proto;
279 original.ToProtobuf(&proto); 279 original.ToProtobuf(&proto);
280 ScrollTree result; 280 ScrollTree result;
281 result.FromProtobuf(proto); 281 result.FromProtobuf(proto);
282 282
283 EXPECT_EQ(original, result); 283 EXPECT_EQ(original, result);
284
285 original.clear();
286 original.set_currently_scrolling_node(0);
287 original.SetScrollOffset(2, gfx::ScrollOffset(1, 2));
288
289 proto::PropertyTree proto2;
290 original.ToProtobuf(&proto2);
291 result = ScrollTree();
292 result.FromProtobuf(proto2);
293
294 EXPECT_EQ(original, result);
284 } 295 }
285 296
286 TEST(PropertyTreeSerializationTest, PropertyTrees) { 297 TEST(PropertyTreeSerializationTest, PropertyTrees) {
287 PropertyTrees original; 298 PropertyTrees original;
288 original.transform_tree.Insert(TransformNode(), 0); 299 original.transform_tree.Insert(TransformNode(), 0);
289 original.transform_tree.Insert(TransformNode(), 1); 300 original.transform_tree.Insert(TransformNode(), 1);
290 original.clip_tree.Insert(ClipNode(), 0); 301 original.clip_tree.Insert(ClipNode(), 0);
291 original.clip_tree.Insert(ClipNode(), 1); 302 original.clip_tree.Insert(ClipNode(), 1);
292 original.effect_tree.Insert(EffectNode(), 0); 303 original.effect_tree.Insert(EffectNode(), 0);
293 original.effect_tree.Insert(EffectNode(), 1); 304 original.effect_tree.Insert(EffectNode(), 1);
(...skipping 791 matching lines...) Expand 10 before | Expand all | Expand 10 after
1085 1096
1086 DIRECT_AND_SERIALIZED_PROPERTY_TREE_TEST_F( 1097 DIRECT_AND_SERIALIZED_PROPERTY_TREE_TEST_F(
1087 PropertyTreeTestSingularTransformSnapTest); 1098 PropertyTreeTestSingularTransformSnapTest);
1088 1099
1089 #undef DIRECT_AND_SERIALIZED_PROPERTY_TREE_TEST_F 1100 #undef DIRECT_AND_SERIALIZED_PROPERTY_TREE_TEST_F
1090 #undef SERIALIZED_PROPERTY_TREE_TEST_F 1101 #undef SERIALIZED_PROPERTY_TREE_TEST_F
1091 #undef DIRECT_PROPERTY_TREE_TEST_F 1102 #undef DIRECT_PROPERTY_TREE_TEST_F
1092 1103
1093 } // namespace 1104 } // namespace
1094 } // namespace cc 1105 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/property_tree.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698