Chromium Code Reviews| Index: third_party/WebKit/Source/platform/scroll/ScrollableArea.h |
| diff --git a/third_party/WebKit/Source/platform/scroll/ScrollableArea.h b/third_party/WebKit/Source/platform/scroll/ScrollableArea.h |
| index d921b2d2da5ffc99455b6c1fbf51ea7aba599a2b..20be1dce0515c008e5547ee633e45aa352504841 100644 |
| --- a/third_party/WebKit/Source/platform/scroll/ScrollableArea.h |
| +++ b/third_party/WebKit/Source/platform/scroll/ScrollableArea.h |
| @@ -120,10 +120,11 @@ class PLATFORM_EXPORT ScrollableArea : public GarbageCollectedMixin { |
| virtual void contentsResized(); |
| bool hasOverlayScrollbars() const; |
| - void setScrollbarOverlayStyle(ScrollbarOverlayStyle); |
| - void recalculateScrollbarOverlayStyle(Color); |
| - ScrollbarOverlayStyle getScrollbarOverlayStyle() const { |
| - return static_cast<ScrollbarOverlayStyle>(m_scrollbarOverlayStyle); |
| + void setScrollbarOverlayColorTheme(ScrollbarOverlayColorTheme); |
| + void recalculateScrollbarOverlayColorTheme(Color); |
| + ScrollbarOverlayColorTheme getScrollbarOverlayColorTheme() const { |
| + return static_cast<ScrollbarOverlayColorTheme>( |
| + m_scrollbarOverlayColorTheme); |
| } |
| // This getter will create a ScrollAnimatorBase if it doesn't already exist. |
| @@ -390,7 +391,7 @@ class PLATFORM_EXPORT ScrollableArea : public GarbageCollectedMixin { |
| mutable Member<ScrollAnimatorBase> m_scrollAnimator; |
| mutable Member<ProgrammaticScrollAnimator> m_programmaticScrollAnimator; |
| - unsigned m_scrollbarOverlayStyle : 2; // ScrollbarOverlayStyle |
| + unsigned m_scrollbarOverlayColorTheme : 2; // ScrollbarOverlayColorTheme |
|
bokan
2016/10/21 16:57:14
Just remove the comment, it adds nothing.
|
| unsigned m_scrollOriginChanged : 1; |