| Index: cc/layers/heads_up_display_layer_impl.cc
|
| diff --git a/cc/layers/heads_up_display_layer_impl.cc b/cc/layers/heads_up_display_layer_impl.cc
|
| index 610be60ebb0565bb29d0f7f548e767e5be55b891..434c931efde156a6f4ea167afdae19adcd936953 100644
|
| --- a/cc/layers/heads_up_display_layer_impl.cc
|
| +++ b/cc/layers/heads_up_display_layer_impl.cc
|
| @@ -80,7 +80,7 @@ HeadsUpDisplayLayerImpl::HeadsUpDisplayLayerImpl(LayerTreeImpl* tree_impl,
|
|
|
| HeadsUpDisplayLayerImpl::~HeadsUpDisplayLayerImpl() {}
|
|
|
| -scoped_ptr<LayerImpl> HeadsUpDisplayLayerImpl::CreateLayerImpl(
|
| +std::unique_ptr<LayerImpl> HeadsUpDisplayLayerImpl::CreateLayerImpl(
|
| LayerTreeImpl* tree_impl) {
|
| return HeadsUpDisplayLayerImpl::Create(tree_impl, id());
|
| }
|
| @@ -94,7 +94,7 @@ void HeadsUpDisplayLayerImpl::AcquireResource(
|
| }
|
| }
|
|
|
| - scoped_ptr<ScopedResource> resource =
|
| + std::unique_ptr<ScopedResource> resource =
|
| ScopedResource::Create(resource_provider);
|
| resource->Allocate(internal_content_bounds_,
|
| ResourceProvider::TEXTURE_HINT_IMMUTABLE,
|
| @@ -106,7 +106,7 @@ void HeadsUpDisplayLayerImpl::ReleaseUnmatchedSizeResources(
|
| ResourceProvider* resource_provider) {
|
| auto it_erase =
|
| std::remove_if(resources_.begin(), resources_.end(),
|
| - [this](const scoped_ptr<ScopedResource>& resource) {
|
| + [this](const std::unique_ptr<ScopedResource>& resource) {
|
| return internal_content_bounds_ != resource->size();
|
| });
|
| resources_.erase(it_erase, resources_.end());
|
|
|