Remove unused ScrollbarLayerInterface functions

This patch removes orientation() and scroll_element_id() from
ScrollbarLayerInterface as these are not used. The corresponding
getters/setters on ScrollbarLayerImplBase are needed but the Layer
interface is only used to pass these values along.

BUG: 723263
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel
Change-Id: I4631dc469b1f6776f3e6d4246bed39d94316822f
Reviewed-on: https://chromium-review.googlesource.com/530490Reviewed-by: Chris harrelson <chrishtr@chromium.org>
Commit-Queue: Philip Rogers <pdr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#478818}

cc/layers/painted_overlay_scrollbar_layer.cc

@@ -49,10 +49,6 @@ PaintedOverlayScrollbarLayer::PaintedOverlayScrollbarLayer(
 
 PaintedOverlayScrollbarLayer::~PaintedOverlayScrollbarLayer() {}
 
-ElementId PaintedOverlayScrollbarLayer::scroll_element_id() const {
-  return scroll_element_id_;
-}
-
 void PaintedOverlayScrollbarLayer::SetScrollElementId(ElementId element_id) {
   if (element_id == scroll_element_id_)
     return;
@@ -65,10 +61,6 @@ bool PaintedOverlayScrollbarLayer::OpacityCanAnimateOnImplThread() const {
   return scrollbar_->IsOverlay();
 }
 
-ScrollbarOrientation PaintedOverlayScrollbarLayer::orientation() const {
-  return scrollbar_->Orientation();
-}
-
 void PaintedOverlayScrollbarLayer::PushPropertiesTo(LayerImpl* layer) {
   Layer::PushPropertiesTo(layer);
 
@@ -79,7 +71,7 @@ void PaintedOverlayScrollbarLayer::PushPropertiesTo(LayerImpl* layer) {
 
   scrollbar_layer->SetThumbThickness(thumb_thickness_);
   scrollbar_layer->SetThumbLength(thumb_length_);
-  if (orientation() == HORIZONTAL) {
+  if (scrollbar_->Orientation() == HORIZONTAL) {
     scrollbar_layer->SetTrackStart(track_rect_.x() - location_.x());
     scrollbar_layer->SetTrackLength(track_rect_.width());
   } else {

cc/layers/painted_overlay_scrollbar_layer.h

@@ -28,9 +28,7 @@ class CC_EXPORT PaintedOverlayScrollbarLayer : public ScrollbarLayerInterface,
   ScrollbarLayerInterface* ToScrollbarLayer() override;
 
   // ScrollbarLayerInterface
-  ElementId scroll_element_id() const override;
   void SetScrollElementId(ElementId element_id) override;
-  ScrollbarOrientation orientation() const override;
 
   // Layer interface
   bool Update() override;

cc/layers/painted_scrollbar_layer.cc

@@ -57,10 +57,6 @@ PaintedScrollbarLayer::PaintedScrollbarLayer(
 
 PaintedScrollbarLayer::~PaintedScrollbarLayer() {}
 
-ElementId PaintedScrollbarLayer::scroll_element_id() const {
-  return scroll_element_id_;
-}
-
 void PaintedScrollbarLayer::SetScrollElementId(ElementId element_id) {
   if (element_id == scroll_element_id_)
     return;
@@ -73,10 +69,6 @@ bool PaintedScrollbarLayer::OpacityCanAnimateOnImplThread() const {
   return scrollbar_->IsOverlay();
 }
 
-ScrollbarOrientation PaintedScrollbarLayer::orientation() const {
-  return scrollbar_->Orientation();
-}
-
 void PaintedScrollbarLayer::PushPropertiesTo(LayerImpl* layer) {
   Layer::PushPropertiesTo(layer);
 
@@ -89,7 +81,7 @@ void PaintedScrollbarLayer::PushPropertiesTo(LayerImpl* layer) {
 
   scrollbar_layer->SetThumbThickness(thumb_thickness_);
   scrollbar_layer->SetThumbLength(thumb_length_);
-  if (orientation() == HORIZONTAL) {
+  if (scrollbar_->Orientation() == HORIZONTAL) {
     scrollbar_layer->SetTrackStart(
         track_rect_.x() - location_.x());
     scrollbar_layer->SetTrackLength(track_rect_.width());
@@ -143,7 +135,7 @@ gfx::Rect PaintedScrollbarLayer::ScrollbarLayerRectToContentRect(
 
 gfx::Rect PaintedScrollbarLayer::OriginThumbRect() const {
   gfx::Size thumb_size;
-  if (orientation() == HORIZONTAL) {
+  if (scrollbar_->Orientation() == HORIZONTAL) {
     thumb_size =
         gfx::Size(scrollbar_->ThumbLength(), scrollbar_->ThumbThickness());
   } else {

cc/layers/painted_scrollbar_layer.h

@@ -28,11 +28,8 @@ class CC_EXPORT PaintedScrollbarLayer : public ScrollbarLayerInterface,
   ScrollbarLayerInterface* ToScrollbarLayer() override;
 
   // ScrollbarLayerInterface
-  ElementId scroll_element_id() const override;
   void SetScrollElementId(ElementId element_id) override;
 
-  ScrollbarOrientation orientation() const override;
-
   // Layer interface
   bool Update() override;
   void SetLayerTreeHost(LayerTreeHost* host) override;

cc/layers/scrollbar_layer_interface.h

@@ -13,11 +13,8 @@ namespace cc {
 
 class CC_EXPORT ScrollbarLayerInterface {
  public:
-  virtual ElementId scroll_element_id() const = 0;
   virtual void SetScrollElementId(ElementId element_id) = 0;
 
-  virtual ScrollbarOrientation orientation() const = 0;
-
  protected:
   ScrollbarLayerInterface() {}
   virtual ~ScrollbarLayerInterface() {}

cc/layers/solid_color_scrollbar_layer.cc

@@ -15,7 +15,7 @@ std::unique_ptr<LayerImpl> SolidColorScrollbarLayer::CreateLayerImpl(
     LayerTreeImpl* tree_impl) {
   const bool kIsOverlayScrollbar = true;
   return SolidColorScrollbarLayerImpl::Create(
-      tree_impl, id(), orientation(),
+      tree_impl, id(), solid_color_scrollbar_layer_inputs_.orientation,
       solid_color_scrollbar_layer_inputs_.thumb_thickness,
       solid_color_scrollbar_layer_inputs_.track_start,
       solid_color_scrollbar_layer_inputs_.is_left_side_vertical_scrollbar,
@@ -91,10 +91,6 @@ bool SolidColorScrollbarLayer::OpacityCanAnimateOnImplThread() const {
   return true;
 }
 
-ElementId SolidColorScrollbarLayer::scroll_element_id() const {
-  return solid_color_scrollbar_layer_inputs_.scroll_element_id;
-}
-
 void SolidColorScrollbarLayer::SetScrollElementId(ElementId element_id) {
   if (element_id == solid_color_scrollbar_layer_inputs_.scroll_element_id)
     return;
@@ -103,8 +99,4 @@ void SolidColorScrollbarLayer::SetScrollElementId(ElementId element_id) {
   SetNeedsFullTreeSync();
 }
 
-ScrollbarOrientation SolidColorScrollbarLayer::orientation() const {
-  return solid_color_scrollbar_layer_inputs_.orientation;
-}
-
 }  // namespace cc

cc/layers/solid_color_scrollbar_layer.h

@@ -34,23 +34,8 @@ class CC_EXPORT SolidColorScrollbarLayer : public ScrollbarLayerInterface,
   void SetNeedsDisplayRect(const gfx::Rect& rect) override;
 
   // ScrollbarLayerInterface
-  ElementId scroll_element_id() const override;
   void SetScrollElementId(ElementId element_id) override;
 
-  ScrollbarOrientation orientation() const override;
-
-  int thumb_thickness() const {
-    return solid_color_scrollbar_layer_inputs_.thumb_thickness;
-  }
-
-  int track_start() const {
-    return solid_color_scrollbar_layer_inputs_.track_start;
-  }
-
-  bool is_left_side_vertical_scrollbar() const {
-    return solid_color_scrollbar_layer_inputs_.is_left_side_vertical_scrollbar;
-  }
-
  protected:
   SolidColorScrollbarLayer(ScrollbarOrientation orientation,
                            int thumb_thickness,