1 files changed, 8 insertions, 34 deletions
diff --git a/chromium/cc/layers/solid_color_scrollbar_layer.h b/chromium/cc/layers/solid_color_scrollbar_layer.h
index 0b937b48b09..8aed2f50026 100644
--- a/chromium/cc/layers/solid_color_scrollbar_layer.h
+++ b/chromium/cc/layers/solid_color_scrollbar_layer.h
@@ -7,12 +7,11 @@
 
 #include "cc/cc_export.h"
 #include "cc/layers/layer.h"
-#include "cc/layers/scrollbar_layer_interface.h"
+#include "cc/layers/scrollbar_layer_base.h"
 
 namespace cc {
 
-class CC_EXPORT SolidColorScrollbarLayer : public ScrollbarLayerInterface,
-                                           public Layer {
+class CC_EXPORT SolidColorScrollbarLayer : public ScrollbarLayerBase {
  public:
   std::unique_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
 
@@ -20,53 +19,28 @@ class CC_EXPORT SolidColorScrollbarLayer : public ScrollbarLayerInterface,
       ScrollbarOrientation orientation,
       int thumb_thickness,
       int track_start,
-      bool is_left_side_vertical_scrollbar,
-      ElementId scroll_element_id);
+      bool is_left_side_vertical_scrollbar);
 
   SolidColorScrollbarLayer(const SolidColorScrollbarLayer&) = delete;
   SolidColorScrollbarLayer& operator=(const SolidColorScrollbarLayer&) = delete;
 
   // Layer overrides.
   bool OpacityCanAnimateOnImplThread() const override;
-
   void SetOpacity(float opacity) override;
-  void PushPropertiesTo(LayerImpl* layer) override;
-
   void SetNeedsDisplayRect(const gfx::Rect& rect) override;
-
   bool HitTestable() const override;
 
-  // ScrollbarLayerInterface
-  void SetScrollElementId(ElementId element_id) override;
-
  protected:
   SolidColorScrollbarLayer(ScrollbarOrientation orientation,
                            int thumb_thickness,
                            int track_start,
-                           bool is_left_side_vertical_scrollbar,
-                           ElementId scroll_element_id);
+                           bool is_left_side_vertical_scrollbar);
   ~SolidColorScrollbarLayer() override;
 
- private:
-  friend class LayerSerializationTest;
-
-  // Encapsulate all data, callbacks, interfaces received from the embedder.
-  struct SolidColorScrollbarLayerInputs {
-    SolidColorScrollbarLayerInputs(ScrollbarOrientation orientation,
-                                   int thumb_thickness,
-                                   int track_start,
-                                   bool is_left_side_vertical_scrollbar,
-                                   ElementId scroll_element_id);
-    ~SolidColorScrollbarLayerInputs();
-
-    ElementId scroll_element_id;
-    ScrollbarOrientation orientation;
-    int thumb_thickness;
-    int track_start;
-    bool is_left_side_vertical_scrollbar;
-  };
-
-  SolidColorScrollbarLayerInputs solid_color_scrollbar_layer_inputs_;
+  ScrollbarOrientation orientation_;
+  int thumb_thickness_;
+  int track_start_;
+  bool is_left_side_vertical_scrollbar_;
 };
 
 }  // namespace cc