| Index: cc/layers/solid_color_scrollbar_layer.cc
|
| diff --git a/cc/layers/solid_color_scrollbar_layer.cc b/cc/layers/solid_color_scrollbar_layer.cc
|
| index 5c276b37ea4ddf0c318719df0a7422867d3a2723..2670fd3216541303f711bbbfcf22b8d98b3b3b29 100644
|
| --- a/cc/layers/solid_color_scrollbar_layer.cc
|
| +++ b/cc/layers/solid_color_scrollbar_layer.cc
|
| @@ -8,8 +8,6 @@
|
|
|
| #include "cc/layers/layer_impl.h"
|
| #include "cc/layers/solid_color_scrollbar_layer_impl.h"
|
| -#include "cc/proto/cc_conversions.h"
|
| -#include "cc/proto/layer.pb.h"
|
|
|
| namespace cc {
|
|
|
| @@ -70,22 +68,6 @@ ScrollbarLayerInterface* SolidColorScrollbarLayer::ToScrollbarLayer() {
|
| return this;
|
| }
|
|
|
| -void SolidColorScrollbarLayer::ToLayerNodeProto(proto::LayerNode* proto) const {
|
| - Layer::ToLayerNodeProto(proto);
|
| -
|
| - proto::SolidColorScrollbarLayerProperties* scrollbar =
|
| - proto->mutable_solid_scrollbar();
|
| - scrollbar->set_scroll_layer_id(
|
| - solid_color_scrollbar_layer_inputs_.scroll_layer_id);
|
| - scrollbar->set_thumb_thickness(
|
| - solid_color_scrollbar_layer_inputs_.thumb_thickness);
|
| - scrollbar->set_track_start(solid_color_scrollbar_layer_inputs_.track_start);
|
| - scrollbar->set_is_left_side_vertical_scrollbar(
|
| - solid_color_scrollbar_layer_inputs_.is_left_side_vertical_scrollbar);
|
| - scrollbar->set_orientation(ScrollbarOrientationToProto(
|
| - solid_color_scrollbar_layer_inputs_.orientation));
|
| -}
|
| -
|
| void SolidColorScrollbarLayer::SetOpacity(float opacity) {
|
| // The opacity of a solid color scrollbar layer is always 0 on main thread.
|
| DCHECK_EQ(opacity, 0.f);
|
| @@ -129,9 +111,4 @@ ScrollbarOrientation SolidColorScrollbarLayer::orientation() const {
|
| return solid_color_scrollbar_layer_inputs_.orientation;
|
| }
|
|
|
| -void SolidColorScrollbarLayer::SetTypeForProtoSerialization(
|
| - proto::LayerNode* proto) const {
|
| - proto->set_type(proto::LayerNode::SOLID_COLOR_SCROLLBAR_LAYER);
|
| -}
|
| -
|
| } // namespace cc
|
|
|