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/solid_color_layer_impl.cc | |
| 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/solid_color_layer_impl.cc')
| -rw-r--r-- | chromium/cc/layers/solid_color_layer_impl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/cc/layers/solid_color_layer_impl.cc b/chromium/cc/layers/solid_color_layer_impl.cc index 76cd3fc4229..322d9c8c19f 100644 --- a/chromium/cc/layers/solid_color_layer_impl.cc +++ b/chromium/cc/layers/solid_color_layer_impl.cc @@ -22,7 +22,7 @@ SolidColorLayerImpl::SolidColorLayerImpl(LayerTreeImpl* tree_impl, int id) SolidColorLayerImpl::~SolidColorLayerImpl() {} -scoped_ptr<LayerImpl> SolidColorLayerImpl::CreateLayerImpl( +std::unique_ptr<LayerImpl> SolidColorLayerImpl::CreateLayerImpl( LayerTreeImpl* tree_impl) { return SolidColorLayerImpl::Create(tree_impl, id()); } |