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

Side by Side Diff: cc/layers/layer_unittest.cc

Issue 1423523002: Add support for (de)serializing cc::Layer properties. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@serialize-layer-hierarchy
Patch Set: Addressed comments about raw pointers and new test. Created 5 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 unified diff | Download patch
« no previous file with comments | « cc/layers/layer_proto_converter_unittest.cc ('k') | cc/proto/layer.proto » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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/layers/layer.h" 5 #include "cc/layers/layer.h"
6 6
7 #include "base/thread_task_runner_handle.h" 7 #include "base/thread_task_runner_handle.h"
8 #include "cc/animation/keyframed_animation_curve.h" 8 #include "cc/animation/keyframed_animation_curve.h"
9 #include "cc/base/math_util.h" 9 #include "cc/base/math_util.h"
10 #include "cc/layers/layer_impl.h" 10 #include "cc/layers/layer_impl.h"
(...skipping 1549 matching lines...) Expand 10 before | Expand all | Expand 10 after
1560 proto::LayerNode proto2; 1560 proto::LayerNode proto2;
1561 layer_src_root->ToLayerNodeProto(&proto2); 1561 layer_src_root->ToLayerNodeProto(&proto2);
1562 1562
1563 // Deserialization 2. 1563 // Deserialization 2.
1564 layer_dest_root->FromLayerNodeProto(proto2, dest_layer_map); 1564 layer_dest_root->FromLayerNodeProto(proto2, dest_layer_map);
1565 1565
1566 EXPECT_EQ(nullptr, layer_dest_root->mask_layer()); 1566 EXPECT_EQ(nullptr, layer_dest_root->mask_layer());
1567 EXPECT_EQ(nullptr, layer_dest_root->replica_layer()); 1567 EXPECT_EQ(nullptr, layer_dest_root->replica_layer());
1568 } 1568 }
1569 1569
1570 TEST_F(LayerTest, SimplePropertiesSerialization) {
1571 /* Testing serialization of properties for a tree that looks like this:
1572 root+
1573 / \
1574 a* b*+[mask:*,replica]
1575 / \
1576 c d*
1577 Layers marked with * have changed properties.
1578 Layers marked with + have descendants with changed properties.
1579 Layer b also has a mask layer and a replica layer.
1580 */
1581 scoped_refptr<Layer> layer_src_root = Layer::Create(LayerSettings());
1582 scoped_refptr<Layer> layer_src_a = Layer::Create(LayerSettings());
1583 scoped_refptr<Layer> layer_src_b = Layer::Create(LayerSettings());
1584 scoped_refptr<Layer> layer_src_b_mask = Layer::Create(LayerSettings());
1585 scoped_refptr<Layer> layer_src_b_replica = Layer::Create(LayerSettings());
1586 scoped_refptr<Layer> layer_src_c = Layer::Create(LayerSettings());
1587 scoped_refptr<Layer> layer_src_d = Layer::Create(LayerSettings());
1588 layer_src_root->AddChild(layer_src_a);
1589 layer_src_root->AddChild(layer_src_b);
1590 layer_src_a->AddChild(layer_src_c);
1591 layer_src_b->AddChild(layer_src_d);
1592 layer_src_b->SetMaskLayer(layer_src_b_mask.get());
1593 layer_src_b->SetReplicaLayer(layer_src_b_replica.get());
1594
1595 layer_src_a->SetNeedsPushProperties();
1596 layer_src_b->SetNeedsPushProperties();
1597 layer_src_b_mask->SetNeedsPushProperties();
1598 layer_src_d->SetNeedsPushProperties();
1599
1600 // Only layers with descendants that require pushing properties will
1601 // return true from ToLayerPropertiesProto.
1602 proto::LayerUpdate layer_update_root;
1603 EXPECT_TRUE(layer_src_root->ToLayerPropertiesProto(&layer_update_root));
1604 proto::LayerUpdate layer_update_a;
1605 EXPECT_FALSE(layer_src_a->ToLayerPropertiesProto(&layer_update_a));
1606 proto::LayerUpdate layer_update_b;
1607 EXPECT_TRUE(layer_src_b->ToLayerPropertiesProto(&layer_update_b));
1608 proto::LayerUpdate layer_update_b_mask;
1609 EXPECT_FALSE(layer_src_b_mask->ToLayerPropertiesProto(&layer_update_b_mask));
1610 proto::LayerUpdate layer_update_b_replica;
1611 EXPECT_FALSE(
1612 layer_src_b_replica->ToLayerPropertiesProto(&layer_update_b_replica));
1613 proto::LayerUpdate layer_update_c;
1614 EXPECT_FALSE(layer_src_c->ToLayerPropertiesProto(&layer_update_c));
1615 proto::LayerUpdate layer_update_d;
1616 EXPECT_FALSE(layer_src_d->ToLayerPropertiesProto(&layer_update_d));
1617
1618 // All flags for pushing properties should have been cleared.
1619 EXPECT_FALSE(layer_src_root->needs_push_properties());
1620 EXPECT_FALSE(layer_src_root->descendant_needs_push_properties());
1621 EXPECT_FALSE(layer_src_a->needs_push_properties());
1622 EXPECT_FALSE(layer_src_a->descendant_needs_push_properties());
1623 EXPECT_FALSE(layer_src_b->needs_push_properties());
1624 EXPECT_FALSE(layer_src_b->descendant_needs_push_properties());
1625 EXPECT_FALSE(layer_src_b_mask->needs_push_properties());
1626 EXPECT_FALSE(layer_src_b_mask->descendant_needs_push_properties());
1627 EXPECT_FALSE(layer_src_b_replica->needs_push_properties());
1628 EXPECT_FALSE(layer_src_b_replica->descendant_needs_push_properties());
1629 EXPECT_FALSE(layer_src_c->needs_push_properties());
1630 EXPECT_FALSE(layer_src_c->descendant_needs_push_properties());
1631 EXPECT_FALSE(layer_src_d->needs_push_properties());
1632 EXPECT_FALSE(layer_src_d->descendant_needs_push_properties());
1633
1634 // Only 5 of the layers should have been serialized.
1635 ASSERT_EQ(1, layer_update_root.layers_size());
1636 EXPECT_EQ(layer_src_root->id(), layer_update_root.layers(0).id());
1637 proto::LayerProperties dest_root = layer_update_root.layers(0);
1638 ASSERT_EQ(1, layer_update_a.layers_size());
1639 EXPECT_EQ(layer_src_a->id(), layer_update_a.layers(0).id());
1640 proto::LayerProperties dest_a = layer_update_a.layers(0);
1641 ASSERT_EQ(1, layer_update_b.layers_size());
1642 EXPECT_EQ(layer_src_b->id(), layer_update_b.layers(0).id());
1643 proto::LayerProperties dest_b = layer_update_b.layers(0);
1644 ASSERT_EQ(1, layer_update_b_mask.layers_size());
1645 EXPECT_EQ(layer_src_b_mask->id(), layer_update_b_mask.layers(0).id());
1646 proto::LayerProperties dest_b_mask = layer_update_b_mask.layers(0);
1647 EXPECT_EQ(0, layer_update_b_replica.layers_size());
1648 EXPECT_EQ(0, layer_update_c.layers_size());
1649 ASSERT_EQ(1, layer_update_d.layers_size());
1650 EXPECT_EQ(layer_src_d->id(), layer_update_d.layers(0).id());
1651 proto::LayerProperties dest_d = layer_update_d.layers(0);
1652
1653 // Ensure the properties and dependants metadata is correctly serialized.
1654 EXPECT_FALSE(dest_root.needs_push_properties());
1655 EXPECT_EQ(2, dest_root.num_dependents_need_push_properties());
1656 EXPECT_FALSE(dest_root.has_base());
1657
1658 EXPECT_TRUE(dest_a.needs_push_properties());
1659 EXPECT_EQ(0, dest_a.num_dependents_need_push_properties());
1660 EXPECT_TRUE(dest_a.has_base());
1661
1662 EXPECT_TRUE(dest_b.needs_push_properties());
1663 EXPECT_EQ(2, dest_b.num_dependents_need_push_properties());
1664 EXPECT_TRUE(dest_b.has_base());
1665
1666 EXPECT_TRUE(dest_d.needs_push_properties());
1667 EXPECT_EQ(0, dest_d.num_dependents_need_push_properties());
1668 EXPECT_TRUE(dest_d.has_base());
1669
1670 EXPECT_TRUE(dest_b_mask.needs_push_properties());
1671 EXPECT_EQ(0, dest_b_mask.num_dependents_need_push_properties());
1672 EXPECT_TRUE(dest_b_mask.has_base());
1673 }
1674
1675 TEST_F(LayerTest, SimplePropertiesDeserialization) {
1676 scoped_refptr<Layer> layer = Layer::Create(LayerSettings());
1677 proto::LayerProperties properties;
1678 properties.set_id(layer->id());
1679
1680 properties.set_needs_push_properties(true);
1681 properties.set_num_dependents_need_push_properties(2);
1682 properties.mutable_base();
1683 layer->FromLayerPropertiesProto(properties);
1684 EXPECT_TRUE(layer->needs_push_properties());
1685 EXPECT_TRUE(layer->descendant_needs_push_properties());
1686
1687 properties.set_needs_push_properties(false);
1688 properties.mutable_base()->Clear();
1689 layer->FromLayerPropertiesProto(properties);
1690 EXPECT_FALSE(layer->needs_push_properties());
1691 EXPECT_TRUE(layer->descendant_needs_push_properties());
1692
1693 properties.set_num_dependents_need_push_properties(0);
1694 layer->FromLayerPropertiesProto(properties);
1695 EXPECT_FALSE(layer->needs_push_properties());
1696 EXPECT_FALSE(layer->descendant_needs_push_properties());
1697
1698 properties.set_needs_push_properties(true);
1699 properties.mutable_base();
1700 layer->FromLayerPropertiesProto(properties);
1701 EXPECT_TRUE(layer->needs_push_properties());
1702 EXPECT_FALSE(layer->descendant_needs_push_properties());
1703 }
1704
1570 } // namespace 1705 } // namespace
1571 } // namespace cc 1706 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/layer_proto_converter_unittest.cc ('k') | cc/proto/layer.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698