| 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 892521cd4bd9dee71f19736091fcdefa25ebbbe5..2b6d27d49cc92e52c921c27679a73e082f7d26e9 100644
|
| --- a/cc/trees/layer_tree_host_common.h
|
| +++ b/cc/trees/layer_tree_host_common.h
|
| @@ -175,7 +175,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;
|
|
|