| Index: cc/layers/painted_scrollbar_layer.cc
|
| diff --git a/cc/layers/painted_scrollbar_layer.cc b/cc/layers/painted_scrollbar_layer.cc
|
| index 8815abb999556aa7136ae2d725435716fe2d7286..e0e0859e77814dd2a063ab945e3ebc1f768ab698 100644
|
| --- a/cc/layers/painted_scrollbar_layer.cc
|
| +++ b/cc/layers/painted_scrollbar_layer.cc
|
| @@ -31,18 +31,15 @@ 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(
|
| - settings, std::move(scrollbar), scroll_layer_id));
|
| + return make_scoped_refptr(
|
| + new PaintedScrollbarLayer(std::move(scrollbar), scroll_layer_id));
|
| }
|
|
|
| -PaintedScrollbarLayer::PaintedScrollbarLayer(const LayerSettings& settings,
|
| - scoped_ptr<Scrollbar> scrollbar,
|
| +PaintedScrollbarLayer::PaintedScrollbarLayer(scoped_ptr<Scrollbar> scrollbar,
|
| int scroll_layer_id)
|
| - : Layer(settings),
|
| - scrollbar_(std::move(scrollbar)),
|
| + : scrollbar_(std::move(scrollbar)),
|
| scroll_layer_id_(scroll_layer_id),
|
| internal_contents_scale_(1.f),
|
| thumb_thickness_(scrollbar_->ThumbThickness()),
|
|
|