| Index: cc/layers/video_layer_impl.cc
|
| diff --git a/cc/layers/video_layer_impl.cc b/cc/layers/video_layer_impl.cc
|
| index 4bfd1cd58030af5e1f72715966d31b7aa0ee097b..2edea947da42c07b0b00bb3db1ae402f44ab918e 100644
|
| --- a/cc/layers/video_layer_impl.cc
|
| +++ b/cc/layers/video_layer_impl.cc
|
| @@ -59,8 +59,7 @@ VideoLayerImpl::~VideoLayerImpl() {
|
|
|
| scoped_ptr<LayerImpl> VideoLayerImpl::CreateLayerImpl(
|
| LayerTreeImpl* tree_impl) {
|
| - VideoLayerImpl* impl = new VideoLayerImpl(tree_impl, id(), video_rotation_);
|
| - return scoped_ptr<LayerImpl>(impl);
|
| + return make_scoped_ptr(new VideoLayerImpl(tree_impl, id(), video_rotation_));
|
| }
|
|
|
| void VideoLayerImpl::PushPropertiesTo(LayerImpl* layer) {
|
| @@ -90,7 +89,7 @@ bool VideoLayerImpl::WillDraw(DrawMode draw_mode,
|
|
|
| if (!frame_.get()) {
|
| // Drop any resources used by the updater if there is no frame to display.
|
| - updater_.reset();
|
| + updater_ = nullptr;
|
|
|
| provider_client_impl_->ReleaseLock();
|
| return false;
|
| @@ -358,7 +357,7 @@ void VideoLayerImpl::DidDraw(ResourceProvider* resource_provider) {
|
| }
|
|
|
| void VideoLayerImpl::ReleaseResources() {
|
| - updater_.reset();
|
| + updater_ = nullptr;
|
| }
|
|
|
| void VideoLayerImpl::SetNeedsRedraw() {
|
|
|