| Index: ui/compositor/layer.h
|
| diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h
|
| index 2dcb9c765be1bdd098bcb1d43b0098988428ac9f..3f8ad218d9e1476482b9a3e3f0dbddc418a84cb9 100644
|
| --- a/ui/compositor/layer.h
|
| +++ b/ui/compositor/layer.h
|
| @@ -7,13 +7,13 @@
|
|
|
| #include <stddef.h>
|
|
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "cc/base/region.h"
|
| #include "cc/layers/content_layer_client.h"
|
| @@ -212,7 +212,7 @@ class COMPOSITOR_EXPORT Layer
|
|
|
| // Set the shape of this layer.
|
| SkRegion* alpha_shape() const { return alpha_shape_.get(); }
|
| - void SetAlphaShape(scoped_ptr<SkRegion> region);
|
| + void SetAlphaShape(std::unique_ptr<SkRegion> region);
|
|
|
| // Invert the layer.
|
| bool layer_inverted() const { return layer_inverted_; }
|
| @@ -273,9 +273,10 @@ class COMPOSITOR_EXPORT Layer
|
|
|
| // Set new TextureMailbox for this layer. Note that |mailbox| may hold a
|
| // shared memory resource or an actual mailbox for a texture.
|
| - void SetTextureMailbox(const cc::TextureMailbox& mailbox,
|
| - scoped_ptr<cc::SingleReleaseCallback> release_callback,
|
| - gfx::Size texture_size_in_dip);
|
| + void SetTextureMailbox(
|
| + const cc::TextureMailbox& mailbox,
|
| + std::unique_ptr<cc::SingleReleaseCallback> release_callback,
|
| + gfx::Size texture_size_in_dip);
|
| void SetTextureSize(gfx::Size texture_size_in_dip);
|
| void SetTextureFlipped(bool flipped);
|
| bool TextureFlipped() const;
|
| @@ -335,7 +336,7 @@ class COMPOSITOR_EXPORT Layer
|
| void OnDelegatedFrameDamage(const gfx::Rect& damage_rect_in_dip);
|
|
|
| // Requets a copy of the layer's output as a texture or bitmap.
|
| - void RequestCopyOfOutput(scoped_ptr<cc::CopyOutputRequest> request);
|
| + void RequestCopyOfOutput(std::unique_ptr<cc::CopyOutputRequest> request);
|
|
|
| // ContentLayerClient
|
| gfx::Rect PaintableRegion() override;
|
| @@ -349,7 +350,7 @@ class COMPOSITOR_EXPORT Layer
|
| // TextureLayerClient
|
| bool PrepareTextureMailbox(
|
| cc::TextureMailbox* mailbox,
|
| - scoped_ptr<cc::SingleReleaseCallback>* release_callback,
|
| + std::unique_ptr<cc::SingleReleaseCallback>* release_callback,
|
| bool use_shared_memory) override;
|
|
|
| float device_scale_factor() const { return device_scale_factor_; }
|
| @@ -360,7 +361,7 @@ class COMPOSITOR_EXPORT Layer
|
| bool force_render_surface() const { return force_render_surface_; }
|
|
|
| // LayerClient
|
| - scoped_ptr<base::trace_event::ConvertableToTraceFormat> TakeDebugInfo(
|
| + std::unique_ptr<base::trace_event::ConvertableToTraceFormat> TakeDebugInfo(
|
| cc::Layer* layer) override;
|
|
|
| // Whether this layer has animations waiting to get sent to its cc::Layer.
|
| @@ -469,7 +470,7 @@ class COMPOSITOR_EXPORT Layer
|
| int zoom_inset_;
|
|
|
| // Shape of the window.
|
| - scoped_ptr<SkRegion> alpha_shape_;
|
| + std::unique_ptr<SkRegion> alpha_shape_;
|
|
|
| std::string name_;
|
|
|
| @@ -501,7 +502,7 @@ class COMPOSITOR_EXPORT Layer
|
|
|
| // The callback to release the mailbox. This is only set after
|
| // SetTextureMailbox is called, before we give it to the TextureLayer.
|
| - scoped_ptr<cc::SingleReleaseCallback> mailbox_release_callback_;
|
| + std::unique_ptr<cc::SingleReleaseCallback> mailbox_release_callback_;
|
|
|
| // The size of the frame or texture in DIP, set when SetShowDelegatedContent
|
| // or SetTextureMailbox was called.
|
|
|