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

Unified Diff: cc/layers/texture_layer_impl.cc

Issue 609663003: cc: Remove use of PassAs() and constructor-casting with scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cc-passas: PassAs-presubmit-warning Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layers/texture_layer.cc ('k') | cc/layers/texture_layer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/texture_layer_impl.cc
diff --git a/cc/layers/texture_layer_impl.cc b/cc/layers/texture_layer_impl.cc
index d02689f052a4921b066b807ac9041b4c13948529..206d8db1377eb59f01347eba0833bbca4eb0b4e1 100644
--- a/cc/layers/texture_layer_impl.cc
+++ b/cc/layers/texture_layer_impl.cc
@@ -49,7 +49,7 @@ void TextureLayerImpl::SetTextureMailbox(
scoped_ptr<LayerImpl> TextureLayerImpl::CreateLayerImpl(
LayerTreeImpl* tree_impl) {
- return TextureLayerImpl::Create(tree_impl, id()).PassAs<LayerImpl>();
+ return TextureLayerImpl::Create(tree_impl, id());
}
void TextureLayerImpl::PushPropertiesTo(LayerImpl* layer) {
@@ -83,7 +83,7 @@ bool TextureLayerImpl::WillDraw(DrawMode draw_mode,
resource_provider->CreateResourceFromTextureMailbox(
texture_mailbox_, release_callback_.Pass());
DCHECK(external_texture_resource_);
- texture_copy_.reset();
+ texture_copy_ = nullptr;
valid_texture_copy_ = false;
}
if (external_texture_resource_)
@@ -194,7 +194,7 @@ SimpleEnclosedRegion TextureLayerImpl::VisibleContentOpaqueRegion() const {
void TextureLayerImpl::ReleaseResources() {
FreeTextureMailbox();
- texture_copy_.reset();
+ texture_copy_ = nullptr;
external_texture_resource_ = 0;
valid_texture_copy_ = false;
}
@@ -248,7 +248,7 @@ void TextureLayerImpl::FreeTextureMailbox() {
layer_tree_impl()->BlockingMainThreadTaskRunner());
}
texture_mailbox_ = TextureMailbox();
- release_callback_.reset();
+ release_callback_ = nullptr;
} else if (external_texture_resource_) {
DCHECK(!own_mailbox_);
ResourceProvider* resource_provider =
« no previous file with comments | « cc/layers/texture_layer.cc ('k') | cc/layers/texture_layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698