| Index: third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp
|
| diff --git a/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp b/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp
|
| index f41e8ea4226d540579760839c8304ca3fc9a4aed..048c19e8abcf9ba3ee4216108737a4dbda05cf71 100644
|
| --- a/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp
|
| +++ b/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp
|
| @@ -80,8 +80,7 @@ int ScrollableArea::maxOverlapBetweenPages()
|
| }
|
|
|
| ScrollableArea::ScrollableArea()
|
| - : m_inLiveResize(false)
|
| - , m_scrollbarOverlayStyle(ScrollbarOverlayStyleDefault)
|
| + : m_scrollbarOverlayStyle(ScrollbarOverlayStyleDefault)
|
| , m_scrollOriginChanged(false)
|
| , m_horizontalScrollbarNeedsPaintInvalidation(false)
|
| , m_verticalScrollbarNeedsPaintInvalidation(false)
|
| @@ -309,24 +308,6 @@ void ScrollableArea::setScrollOffsetFromInternals(const IntPoint& offset)
|
| scrollPositionChanged(DoublePoint(offset), ProgrammaticScroll);
|
| }
|
|
|
| -void ScrollableArea::willStartLiveResize()
|
| -{
|
| - if (m_inLiveResize)
|
| - return;
|
| - m_inLiveResize = true;
|
| - if (ScrollAnimatorBase* scrollAnimator = existingScrollAnimator())
|
| - scrollAnimator->willStartLiveResize();
|
| -}
|
| -
|
| -void ScrollableArea::willEndLiveResize()
|
| -{
|
| - if (!m_inLiveResize)
|
| - return;
|
| - m_inLiveResize = false;
|
| - if (ScrollAnimatorBase* scrollAnimator = existingScrollAnimator())
|
| - scrollAnimator->willEndLiveResize();
|
| -}
|
| -
|
| void ScrollableArea::contentAreaWillPaint() const
|
| {
|
| if (ScrollAnimatorBase* scrollAnimator = existingScrollAnimator())
|
|
|