| Index: cc/layers/layer_impl.cc
|
| diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
|
| index b40579bac737c479d9f1f49f82deaeb85f1f3c6d..d1073248b344f59b1744dc2e661c6e0c72c5fd31 100644
|
| --- a/cc/layers/layer_impl.cc
|
| +++ b/cc/layers/layer_impl.cc
|
| @@ -594,7 +594,7 @@ scoped_ptr<LayerImpl> LayerImpl::TakeReplicaLayer() {
|
| return replica_layer_.Pass();
|
| }
|
|
|
| -ScrollbarLayerImpl* LayerImpl::ToScrollbarLayer() {
|
| +ScrollbarLayerImplBase* LayerImpl::ToScrollbarLayerBase() {
|
| return NULL;
|
| }
|
|
|
| @@ -952,13 +952,14 @@ void LayerImpl::DidBecomeActive() {
|
| }
|
| }
|
| void LayerImpl::SetHorizontalScrollbarLayer(
|
| - ScrollbarLayerImpl* scrollbar_layer) {
|
| + ScrollbarLayerImplBase* scrollbar_layer) {
|
| horizontal_scrollbar_layer_ = scrollbar_layer;
|
| if (horizontal_scrollbar_layer_)
|
| horizontal_scrollbar_layer_->set_scroll_layer_id(id());
|
| }
|
|
|
| -void LayerImpl::SetVerticalScrollbarLayer(ScrollbarLayerImpl* scrollbar_layer) {
|
| +void LayerImpl::SetVerticalScrollbarLayer(
|
| + ScrollbarLayerImplBase* scrollbar_layer) {
|
| vertical_scrollbar_layer_ = scrollbar_layer;
|
| if (vertical_scrollbar_layer_)
|
| vertical_scrollbar_layer_->set_scroll_layer_id(id());
|
|
|