| Index: cc/trees/layer_tree_host_common.h
|
| diff --git a/cc/trees/layer_tree_host_common.h b/cc/trees/layer_tree_host_common.h
|
| index fa1e6005279c0570a489e18b0b2d8e514aaf9a95..59acad1b46a750e5437a540f8e2e5af6fec8d8c3 100644
|
| --- a/cc/trees/layer_tree_host_common.h
|
| +++ b/cc/trees/layer_tree_host_common.h
|
| @@ -184,7 +184,7 @@ struct CC_EXPORT ScrollAndScaleSet {
|
| float page_scale_delta;
|
| gfx::Vector2dF elastic_overscroll_delta;
|
| float top_controls_delta;
|
| - std::vector<scoped_ptr<SwapPromise>> swap_promises;
|
| + std::vector<std::unique_ptr<SwapPromise>> swap_promises;
|
|
|
| bool EqualsForTesting(const ScrollAndScaleSet& other) const;
|
| void ToProtobuf(proto::ScrollAndScaleSet* proto) const;
|
|
|