diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-23 17:21:03 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-23 16:25:15 +0000 |
commit | c551f43206405019121bd2b2c93714319a0a3300 (patch) | |
tree | 1f48c30631c421fd4bbb3c36da20183c8a2ed7d7 /chromium/cc/layers/painted_scrollbar_layer.h | |
parent | 7961cea6d1041e3e454dae6a1da660b453efd238 (diff) |
BASELINE: Update Chromium to 79.0.3945.139
Change-Id: I336b7182fab9bca80b709682489c07db112eaca5
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/cc/layers/painted_scrollbar_layer.h')
-rw-r--r-- | chromium/cc/layers/painted_scrollbar_layer.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/chromium/cc/layers/painted_scrollbar_layer.h b/chromium/cc/layers/painted_scrollbar_layer.h index 1062ada84d6..444c042d0d3 100644 --- a/chromium/cc/layers/painted_scrollbar_layer.h +++ b/chromium/cc/layers/painted_scrollbar_layer.h @@ -8,30 +8,22 @@ #include "cc/cc_export.h" #include "cc/input/scrollbar.h" #include "cc/layers/layer.h" -#include "cc/layers/scrollbar_layer_interface.h" -#include "cc/layers/scrollbar_theme_painter.h" +#include "cc/layers/scrollbar_layer_base.h" #include "cc/resources/scoped_ui_resource.h" namespace cc { -class CC_EXPORT PaintedScrollbarLayer : public ScrollbarLayerInterface, - public Layer { +class CC_EXPORT PaintedScrollbarLayer : public ScrollbarLayerBase { public: std::unique_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override; static scoped_refptr<PaintedScrollbarLayer> Create( - std::unique_ptr<Scrollbar> scrollbar, - ElementId element_id = ElementId()); + std::unique_ptr<Scrollbar> scrollbar); PaintedScrollbarLayer(const PaintedScrollbarLayer&) = delete; PaintedScrollbarLayer& operator=(const PaintedScrollbarLayer&) = delete; bool OpacityCanAnimateOnImplThread() const override; - - // ScrollbarLayerInterface - void SetScrollElementId(ElementId element_id) override; - - // Layer interface bool Update() override; void SetLayerTreeHost(LayerTreeHost* host) override; void PushPropertiesTo(LayerImpl* layer) override; @@ -41,8 +33,7 @@ class CC_EXPORT PaintedScrollbarLayer : public ScrollbarLayerInterface, } protected: - PaintedScrollbarLayer(std::unique_ptr<Scrollbar> scrollbar, - ElementId scroll_element_id); + explicit PaintedScrollbarLayer(std::unique_ptr<Scrollbar> scrollbar); ~PaintedScrollbarLayer() override; // For unit tests @@ -80,6 +71,7 @@ class CC_EXPORT PaintedScrollbarLayer : public ScrollbarLayerInterface, // Snapshot of properties taken in UpdateThumbAndTrackGeometry and used in // PushPropertiesTo. + bool supports_drag_snap_back_; int thumb_thickness_; int thumb_length_; gfx::Point location_; |