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..17802ed6a3ff26305b8a23f95e16c7a16e7fe54c 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; |
unsigned m_scrollOriginChanged : 1; |