| Index: cc/trees/property_tree.cc
|
| diff --git a/cc/trees/property_tree.cc b/cc/trees/property_tree.cc
|
| index a9ea87e147362b70be9eb0c2a90461a70d567eb4..6524f3af3a4ea19a661632dbe01a9aef58109eb6 100644
|
| --- a/cc/trees/property_tree.cc
|
| +++ b/cc/trees/property_tree.cc
|
| @@ -7,8 +7,19 @@
|
|
|
| namespace cc {
|
|
|
| -template <typename T>
|
| -PropertyTree<T>::PropertyTree() {
|
| +template <>
|
| +PropertyTree<OpacityNode>::PropertyTree(Layer* layer) {
|
| + InsertRootNode(OpacityNode(layer, 1.0));
|
| +}
|
| +
|
| +template <>
|
| +PropertyTree<TransformNode>::PropertyTree(Layer* layer) {
|
| + InsertRootNode(TransformNode(layer, gfx::Transform()));
|
| +}
|
| +
|
| +template <>
|
| +PropertyTree<ClipNode>::PropertyTree(Layer* layer) {
|
| + InsertRootNode(ClipNode(layer, gfx::RectF(), false));
|
| }
|
|
|
| template <typename T>
|
| @@ -52,28 +63,27 @@ int PropertyTree<T>::GetLastNodeID() const {
|
| return static_cast<int>(nodes_.size()) - 1;
|
| }
|
|
|
| -TransformTreeNode::TransformTreeNode(Layer* layer,
|
| - const gfx::Transform& transform)
|
| +TransformNode::TransformNode(Layer* layer, const gfx::Transform& transform)
|
| : TreeNode<gfx::Transform>(layer, transform) {
|
| }
|
|
|
| -TransformTreeNode::~TransformTreeNode() {
|
| +TransformNode::~TransformNode() {
|
| }
|
|
|
| -ClipTreeNode::ClipTreeNode(Layer* layer, const gfx::RectF& rect)
|
| +ClipNode::ClipNode(Layer* layer, const gfx::RectF& rect)
|
| : TreeNode<gfx::RectF>(layer, rect), clips(true) {
|
| }
|
|
|
| -ClipTreeNode::ClipTreeNode(Layer* layer, const gfx::RectF& rect,
|
| +ClipNode::ClipNode(Layer* layer, const gfx::RectF& rect,
|
| bool clips)
|
| : TreeNode<gfx::RectF>(layer, rect), clips(clips) {
|
| }
|
|
|
| -ClipTreeNode::~ClipTreeNode() {
|
| +ClipNode::~ClipNode() {
|
| }
|
|
|
| -template class PropertyTree<TransformTreeNode>;
|
| -template class PropertyTree<OpacityTreeNode>;
|
| -template class PropertyTree<ClipTreeNode>;
|
| +template class PropertyTree<TransformNode>;
|
| +template class PropertyTree<OpacityNode>;
|
| +template class PropertyTree<ClipNode>;
|
|
|
| } // namespace cc
|
|
|