| Index: cc/trees/layer_tree_host_impl.h
|
| diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h
|
| index e8d981acab4d03d19718a9d1af932bd6ce11d832..907428aa5dc16d3992e2f1d4e84fb90343857c9a 100644
|
| --- a/cc/trees/layer_tree_host_impl.h
|
| +++ b/cc/trees/layer_tree_host_impl.h
|
| @@ -738,7 +738,8 @@ class CC_EXPORT LayerTreeHostImpl
|
| bool wheel_scrolling_;
|
| bool scroll_affects_scroll_handler_;
|
| int scroll_layer_id_when_mouse_over_scrollbar_;
|
| - ScopedPtrVector<SwapPromise> swap_promises_for_main_thread_scroll_update_;
|
| + std::vector<scoped_ptr<SwapPromise>>
|
| + swap_promises_for_main_thread_scroll_update_;
|
|
|
| // An object to implement the ScrollElasticityHelper interface and
|
| // hold all state related to elasticity. May be NULL if never requested.
|
|
|