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

Unified Diff: ppapi/proxy/compositor_layer_resource.cc

Issue 1609923002: Fix remaining incompatibilities between scoped_ptr and unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
Index: ppapi/proxy/compositor_layer_resource.cc
diff --git a/ppapi/proxy/compositor_layer_resource.cc b/ppapi/proxy/compositor_layer_resource.cc
index fc88f6a5f01b07d2e5dea9c0d73fb7a9860d71be..838a51389bc315ae6e8414d7e2fa8982ffa3784a 100644
--- a/ppapi/proxy/compositor_layer_resource.cc
+++ b/ppapi/proxy/compositor_layer_resource.cc
@@ -344,19 +344,19 @@ bool CompositorLayerResource::SetType(LayerType type) {
if (type == TYPE_COLOR) {
if (data_.is_null())
data_.color.reset(new CompositorLayerData::ColorLayer());
- return data_.color;
+ return !!data_.color;
}
if (type == TYPE_TEXTURE) {
if (data_.is_null())
data_.texture.reset(new CompositorLayerData::TextureLayer());
- return data_.texture;
+ return !!data_.texture;
}
if (type == TYPE_IMAGE) {
if (data_.is_null())
data_.image.reset(new CompositorLayerData::ImageLayer());
- return data_.image;
+ return !!data_.image;
}
// Should not be reached.

Powered by Google App Engine
This is Rietveld 408576698