diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-14 17:41:05 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:37:36 +0000 |
| commit | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch) | |
| tree | 6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/cc/layers/ui_resource_layer_impl.h | |
| parent | 7366110654eec46f21b6824f302356426f48cd74 (diff) | |
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/cc/layers/ui_resource_layer_impl.h')
| -rw-r--r-- | chromium/cc/layers/ui_resource_layer_impl.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chromium/cc/layers/ui_resource_layer_impl.h b/chromium/cc/layers/ui_resource_layer_impl.h index 05293e67778..129c5cd2cce 100644 --- a/chromium/cc/layers/ui_resource_layer_impl.h +++ b/chromium/cc/layers/ui_resource_layer_impl.h @@ -8,6 +8,7 @@ #include <string> #include "base/macros.h" +#include "base/memory/ptr_util.h" #include "cc/base/cc_export.h" #include "cc/layers/layer_impl.h" #include "cc/resources/resource_provider.h" @@ -23,9 +24,9 @@ namespace cc { class CC_EXPORT UIResourceLayerImpl : public LayerImpl { public: - static scoped_ptr<UIResourceLayerImpl> Create(LayerTreeImpl* tree_impl, - int id) { - return make_scoped_ptr(new UIResourceLayerImpl(tree_impl, id)); + static std::unique_ptr<UIResourceLayerImpl> Create(LayerTreeImpl* tree_impl, + int id) { + return base::WrapUnique(new UIResourceLayerImpl(tree_impl, id)); } ~UIResourceLayerImpl() override; @@ -40,7 +41,7 @@ class CC_EXPORT UIResourceLayerImpl : public LayerImpl { // opacity value. void SetVertexOpacity(const float vertex_opacity[4]); - scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override; + std::unique_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override; void PushPropertiesTo(LayerImpl* layer) override; bool WillDraw(DrawMode draw_mode, |