| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/test/fake_mask_layer_impl.h" | 5 #include "cc/test/fake_mask_layer_impl.h" |
| 6 | 6 |
| 7 #include "base/memory/ptr_util.h" |
| 8 |
| 7 namespace cc { | 9 namespace cc { |
| 8 | 10 |
| 9 FakeMaskLayerImpl::FakeMaskLayerImpl(LayerTreeImpl* tree_impl, int id) | 11 FakeMaskLayerImpl::FakeMaskLayerImpl(LayerTreeImpl* tree_impl, int id) |
| 10 : LayerImpl(tree_impl, id) {} | 12 : LayerImpl(tree_impl, id) {} |
| 11 | 13 |
| 12 scoped_ptr<FakeMaskLayerImpl> FakeMaskLayerImpl::Create( | 14 std::unique_ptr<FakeMaskLayerImpl> FakeMaskLayerImpl::Create( |
| 13 LayerTreeImpl* tree_impl, | 15 LayerTreeImpl* tree_impl, |
| 14 int id) { | 16 int id) { |
| 15 return make_scoped_ptr(new FakeMaskLayerImpl(tree_impl, id)); | 17 return base::WrapUnique(new FakeMaskLayerImpl(tree_impl, id)); |
| 16 } | 18 } |
| 17 | 19 |
| 18 void FakeMaskLayerImpl::GetContentsResourceId(ResourceId* resource_id, | 20 void FakeMaskLayerImpl::GetContentsResourceId(ResourceId* resource_id, |
| 19 gfx::Size* resource_size) const { | 21 gfx::Size* resource_size) const { |
| 20 *resource_id = 0; | 22 *resource_id = 0; |
| 21 } | 23 } |
| 22 | 24 |
| 23 } // namespace cc | 25 } // namespace cc |
| OLD | NEW |