| Index: cc/layers/painted_scrollbar_layer.cc
|
| diff --git a/cc/layers/painted_scrollbar_layer.cc b/cc/layers/painted_scrollbar_layer.cc
|
| index d82ef9895890313040ed09f11ecc8250e5a363c8..100ada6ad7473962e29dcdc5a2ce2583aeb8b056 100644
|
| --- a/cc/layers/painted_scrollbar_layer.cc
|
| +++ b/cc/layers/painted_scrollbar_layer.cc
|
| @@ -32,15 +32,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),
|
|
|