1 files changed, 12 insertions, 54 deletions

diff --git a/chromium/cc/layers/solid_color_scrollbar_layer.cc b/chromium/cc/layers/solid_color_scrollbar_layer.cc
index e91ad78fd38..92e321f2d67 100644
--- a/chromium/cc/layers/solid_color_scrollbar_layer.cc
+++ b/chromium/cc/layers/solid_color_scrollbar_layer.cc
@@ -13,54 +13,31 @@ namespace cc {
 
 std::unique_ptr<LayerImpl> SolidColorScrollbarLayer::CreateLayerImpl(
     LayerTreeImpl* tree_impl) {
-  const bool kIsOverlayScrollbar = true;
-  return SolidColorScrollbarLayerImpl::Create(
-      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,
-      kIsOverlayScrollbar);
+  return SolidColorScrollbarLayerImpl::Create(tree_impl, id(), orientation_,
+                                              thumb_thickness_, track_start_,
+                                              is_left_side_vertical_scrollbar_);
 }
 
 scoped_refptr<SolidColorScrollbarLayer> SolidColorScrollbarLayer::Create(
     ScrollbarOrientation orientation,
     int thumb_thickness,
     int track_start,
-    bool is_left_side_vertical_scrollbar,
-    ElementId scroll_element_id) {
-  return base::WrapRefCounted(new SolidColorScrollbarLayer(
-      orientation, thumb_thickness, track_start,
-      is_left_side_vertical_scrollbar, scroll_element_id));
+    bool is_left_side_vertical_scrollbar) {
+  return base::WrapRefCounted(
+      new SolidColorScrollbarLayer(orientation, thumb_thickness, track_start,
+                                   is_left_side_vertical_scrollbar));
 }
 
-SolidColorScrollbarLayer::SolidColorScrollbarLayerInputs::
-    SolidColorScrollbarLayerInputs(ScrollbarOrientation orientation,
-                                   int thumb_thickness,
-                                   int track_start,
-                                   bool is_left_side_vertical_scrollbar,
-                                   ElementId scroll_element_id)
-    : scroll_element_id(scroll_element_id),
-      orientation(orientation),
-      thumb_thickness(thumb_thickness),
-      track_start(track_start),
-      is_left_side_vertical_scrollbar(is_left_side_vertical_scrollbar) {}
-
-SolidColorScrollbarLayer::SolidColorScrollbarLayerInputs::
-    ~SolidColorScrollbarLayerInputs() = default;
-
 SolidColorScrollbarLayer::SolidColorScrollbarLayer(
     ScrollbarOrientation orientation,
     int thumb_thickness,
     int track_start,
-    bool is_left_side_vertical_scrollbar,
-    ElementId scroll_element_id)
-    : solid_color_scrollbar_layer_inputs_(orientation,
-                                          thumb_thickness,
-                                          track_start,
-                                          is_left_side_vertical_scrollbar,
-                                          scroll_element_id) {
+    bool is_left_side_vertical_scrollbar)
+    : orientation_(orientation),
+      thumb_thickness_(thumb_thickness),
+      track_start_(track_start),
+      is_left_side_vertical_scrollbar_(is_left_side_vertical_scrollbar) {
   Layer::SetOpacity(0.f);
-  SetIsScrollbar(true);
 }
 
 SolidColorScrollbarLayer::~SolidColorScrollbarLayer() = default;
@@ -71,17 +48,6 @@ void SolidColorScrollbarLayer::SetOpacity(float opacity) {
   Layer::SetOpacity(opacity);
 }
 
-void SolidColorScrollbarLayer::PushPropertiesTo(LayerImpl* layer) {
-  Layer::PushPropertiesTo(layer);
-  SolidColorScrollbarLayerImpl* scrollbar_layer =
-      static_cast<SolidColorScrollbarLayerImpl*>(layer);
-
-  DCHECK(!scrollbar_layer->HitTestable());
-
-  scrollbar_layer->SetScrollElementId(
-      solid_color_scrollbar_layer_inputs_.scroll_element_id);
-}
-
 void SolidColorScrollbarLayer::SetNeedsDisplayRect(const gfx::Rect& rect) {
   // Never needs repaint.
 }
@@ -90,14 +56,6 @@ bool SolidColorScrollbarLayer::OpacityCanAnimateOnImplThread() const {
   return true;
 }
 
-void SolidColorScrollbarLayer::SetScrollElementId(ElementId element_id) {
-  if (element_id == solid_color_scrollbar_layer_inputs_.scroll_element_id)
-    return;
-
-  solid_color_scrollbar_layer_inputs_.scroll_element_id = element_id;
-  SetNeedsCommit();
-}
-
 bool SolidColorScrollbarLayer::HitTestable() const {
   // Android scrollbars can't be interacted with by user input. They should
   // avoid hit testing so we don't enter any scrollbar scrolling code paths.