| 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 13687f6023ae1c88178255d75123d9902d1bf096..24432f9a300e1d6e3bdc48b2d39399f5c1770567 100644
|
| --- a/third_party/WebKit/Source/platform/scroll/ScrollableArea.h
|
| +++ b/third_party/WebKit/Source/platform/scroll/ScrollableArea.h
|
| @@ -100,10 +100,6 @@ public:
|
|
|
| static bool scrollBehaviorFromString(const String&, ScrollBehavior&);
|
|
|
| - bool inLiveResize() const { return m_inLiveResize; }
|
| - void willStartLiveResize();
|
| - void willEndLiveResize();
|
| -
|
| void contentAreaWillPaint() const;
|
| void mouseEnteredContentArea() const;
|
| void mouseExitedContentArea() const;
|
| @@ -338,8 +334,6 @@ private:
|
| mutable OwnPtrWillBeMember<ScrollAnimatorBase> m_scrollAnimator;
|
| mutable OwnPtrWillBeMember<ProgrammaticScrollAnimator> m_programmaticScrollAnimator;
|
|
|
| - unsigned m_inLiveResize : 1;
|
| -
|
| unsigned m_scrollbarOverlayStyle : 2; // ScrollbarOverlayStyle
|
|
|
| unsigned m_scrollOriginChanged : 1;
|
|
|