| Index: third_party/WebKit/Source/platform/scroll/Scrollbar.h
|
| diff --git a/third_party/WebKit/Source/platform/scroll/Scrollbar.h b/third_party/WebKit/Source/platform/scroll/Scrollbar.h
|
| index 0ec1b88e8a8197190e3287423addafd2e9c8618f..4f6596d06935f5de54000c24b51eb0e51b686528 100644
|
| --- a/third_party/WebKit/Source/platform/scroll/Scrollbar.h
|
| +++ b/third_party/WebKit/Source/platform/scroll/Scrollbar.h
|
| @@ -65,6 +65,9 @@
|
| void setFrameRect(const IntRect&) override;
|
| IntRect frameRect() const override { return Widget::frameRect(); }
|
|
|
| + void invalidate() override { Widget::invalidate(); }
|
| + void invalidateRect(const IntRect&) override;
|
| +
|
| ScrollbarOverlayStyle scrollbarOverlayStyle() const override;
|
| void getTickmarks(Vector<IntRect>&) const override;
|
| bool isScrollableAreaActive() const override;
|
| @@ -126,6 +129,9 @@
|
|
|
| ScrollbarTheme* theme() const { return m_theme; }
|
|
|
| + bool suppressInvalidation() const { return m_suppressInvalidation; }
|
| + void setSuppressInvalidation(bool s) { m_suppressInvalidation = s; }
|
| +
|
| IntRect convertToContainingView(const IntRect&) const override;
|
| IntRect convertFromContainingView(const IntRect&) const override;
|
|
|
| @@ -145,8 +151,6 @@
|
|
|
| DisplayItemClient displayItemClient() const override { return toDisplayItemClient(this); }
|
| String debugName() const override { return m_orientation == HorizontalScrollbar ? "HorizontalScrollbar" : "VerticalScrollbar"; }
|
| -
|
| - void setNeedsPaintInvalidation();
|
|
|
| // Promptly unregister from the theme manager + run finalizers of derived Scrollbars.
|
| EAGERLY_FINALIZE();
|
| @@ -191,6 +195,8 @@
|
| Timer<Scrollbar> m_scrollTimer;
|
| bool m_overlapsResizer;
|
|
|
| + bool m_suppressInvalidation;
|
| +
|
| bool m_isAlphaLocked;
|
|
|
| float m_elasticOverscroll;
|
| @@ -198,9 +204,6 @@
|
| private:
|
| bool isScrollbar() const override { return true; }
|
|
|
| - void invalidate() override { setNeedsPaintInvalidation(); }
|
| - void invalidateRect(const IntRect&) override { setNeedsPaintInvalidation(); }
|
| -
|
| float scrollableAreaCurrentPos() const;
|
| };
|
|
|
|
|