| Index: cc/layers/painted_scrollbar_layer.cc
|
| diff --git a/cc/layers/painted_scrollbar_layer.cc b/cc/layers/painted_scrollbar_layer.cc
|
| index 36c9f82f5a810e0bb424d64258462d313e49b6ee..fca96abb04a843b71a6fa937ae7daa4ffdfb115e 100644
|
| --- a/cc/layers/painted_scrollbar_layer.cc
|
| +++ b/cc/layers/painted_scrollbar_layer.cc
|
| @@ -31,15 +31,18 @@ scoped_ptr<LayerImpl> PaintedScrollbarLayer::CreateLayerImpl(
|
| }
|
|
|
| scoped_refptr<PaintedScrollbarLayer> PaintedScrollbarLayer::Create(
|
| + const LayerSettings& settings,
|
| scoped_ptr<Scrollbar> scrollbar,
|
| int scroll_layer_id) {
|
| return make_scoped_refptr(
|
| - new PaintedScrollbarLayer(scrollbar.Pass(), scroll_layer_id));
|
| + new PaintedScrollbarLayer(settings, scrollbar.Pass(), scroll_layer_id));
|
| }
|
|
|
| -PaintedScrollbarLayer::PaintedScrollbarLayer(scoped_ptr<Scrollbar> scrollbar,
|
| +PaintedScrollbarLayer::PaintedScrollbarLayer(const LayerSettings& settings,
|
| + scoped_ptr<Scrollbar> scrollbar,
|
| int scroll_layer_id)
|
| - : scrollbar_(scrollbar.Pass()),
|
| + : Layer(settings),
|
| + scrollbar_(scrollbar.Pass()),
|
| scroll_layer_id_(scroll_layer_id),
|
| clip_layer_id_(Layer::INVALID_ID),
|
| internal_contents_scale_(0.f),
|
|
|