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

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

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase Created 4 years, 8 months 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/texture_layer_impl.h ('k') | cc/layers/texture_layer_unittest.cc » ('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/texture_layer_impl.h" 5 #include "cc/layers/texture_layer_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <vector> 10 #include <vector>
(...skipping 25 matching lines...) Expand all
36 vertex_opacity_[0] = 1.0f; 36 vertex_opacity_[0] = 1.0f;
37 vertex_opacity_[1] = 1.0f; 37 vertex_opacity_[1] = 1.0f;
38 vertex_opacity_[2] = 1.0f; 38 vertex_opacity_[2] = 1.0f;
39 vertex_opacity_[3] = 1.0f; 39 vertex_opacity_[3] = 1.0f;
40 } 40 }
41 41
42 TextureLayerImpl::~TextureLayerImpl() { FreeTextureMailbox(); } 42 TextureLayerImpl::~TextureLayerImpl() { FreeTextureMailbox(); }
43 43
44 void TextureLayerImpl::SetTextureMailbox( 44 void TextureLayerImpl::SetTextureMailbox(
45 const TextureMailbox& mailbox, 45 const TextureMailbox& mailbox,
46 scoped_ptr<SingleReleaseCallbackImpl> release_callback) { 46 std::unique_ptr<SingleReleaseCallbackImpl> release_callback) {
47 DCHECK_EQ(mailbox.IsValid(), !!release_callback); 47 DCHECK_EQ(mailbox.IsValid(), !!release_callback);
48 FreeTextureMailbox(); 48 FreeTextureMailbox();
49 texture_mailbox_ = mailbox; 49 texture_mailbox_ = mailbox;
50 release_callback_ = std::move(release_callback); 50 release_callback_ = std::move(release_callback);
51 own_mailbox_ = true; 51 own_mailbox_ = true;
52 valid_texture_copy_ = false; 52 valid_texture_copy_ = false;
53 SetNeedsPushProperties(); 53 SetNeedsPushProperties();
54 } 54 }
55 55
56 scoped_ptr<LayerImpl> TextureLayerImpl::CreateLayerImpl( 56 std::unique_ptr<LayerImpl> TextureLayerImpl::CreateLayerImpl(
57 LayerTreeImpl* tree_impl) { 57 LayerTreeImpl* tree_impl) {
58 return TextureLayerImpl::Create(tree_impl, id()); 58 return TextureLayerImpl::Create(tree_impl, id());
59 } 59 }
60 60
61 void TextureLayerImpl::PushPropertiesTo(LayerImpl* layer) { 61 void TextureLayerImpl::PushPropertiesTo(LayerImpl* layer) {
62 LayerImpl::PushPropertiesTo(layer); 62 LayerImpl::PushPropertiesTo(layer);
63 63
64 TextureLayerImpl* texture_layer = static_cast<TextureLayerImpl*>(layer); 64 TextureLayerImpl* texture_layer = static_cast<TextureLayerImpl*>(layer);
65 texture_layer->SetFlipped(flipped_); 65 texture_layer->SetFlipped(flipped_);
66 texture_layer->SetUVTopLeft(uv_top_left_); 66 texture_layer->SetUVTopLeft(uv_top_left_);
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 } else if (external_texture_resource_) { 262 } else if (external_texture_resource_) {
263 DCHECK(!own_mailbox_); 263 DCHECK(!own_mailbox_);
264 ResourceProvider* resource_provider = 264 ResourceProvider* resource_provider =
265 layer_tree_impl()->resource_provider(); 265 layer_tree_impl()->resource_provider();
266 resource_provider->DeleteResource(external_texture_resource_); 266 resource_provider->DeleteResource(external_texture_resource_);
267 external_texture_resource_ = 0; 267 external_texture_resource_ = 0;
268 } 268 }
269 } 269 }
270 270
271 } // namespace cc 271 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/texture_layer_impl.h ('k') | cc/layers/texture_layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698