| Index: cc/blink/web_scrollbar_layer_impl.cc
|
| diff --git a/cc/blink/web_scrollbar_layer_impl.cc b/cc/blink/web_scrollbar_layer_impl.cc
|
| index 905d36bdaa136edbbf276d7b0a0b09be93a1e154..e31f5c6d59eac2a84c139a885830c5fc7713cfcc 100644
|
| --- a/cc/blink/web_scrollbar_layer_impl.cc
|
| +++ b/cc/blink/web_scrollbar_layer_impl.cc
|
| @@ -7,7 +7,6 @@
|
| #include "cc/blink/scrollbar_impl.h"
|
| #include "cc/blink/web_layer_impl.h"
|
| #include "cc/layers/layer.h"
|
| -#include "cc/layers/layer_settings.h"
|
| #include "cc/layers/painted_scrollbar_layer.h"
|
| #include "cc/layers/scrollbar_layer_interface.h"
|
| #include "cc/layers/solid_color_scrollbar_layer.h"
|
| @@ -32,7 +31,7 @@ WebScrollbarLayerImpl::WebScrollbarLayerImpl(
|
| blink::WebScrollbarThemePainter painter,
|
| blink::WebScrollbarThemeGeometry* geometry)
|
| : layer_(new WebLayerImpl(PaintedScrollbarLayer::Create(
|
| - cc::LayerSettings(),
|
| +
|
| scoped_ptr<cc::Scrollbar>(
|
| new ScrollbarImpl(make_scoped_ptr(scrollbar),
|
| painter,
|
| @@ -45,8 +44,7 @@ WebScrollbarLayerImpl::WebScrollbarLayerImpl(
|
| int track_start,
|
| bool is_left_side_vertical_scrollbar)
|
| : layer_(new WebLayerImpl(
|
| - SolidColorScrollbarLayer::Create(cc::LayerSettings(),
|
| - ConvertOrientation(orientation),
|
| + SolidColorScrollbarLayer::Create(ConvertOrientation(orientation),
|
| thumb_thickness,
|
| track_start,
|
| is_left_side_vertical_scrollbar,
|
|
|