Chromium Code Reviews| Index: third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm |
| diff --git a/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm b/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm |
| index 601be84352e4debdf12197ea071c1c8db84ec64a..8fd4d6dae3618628f9856254cfe177cffad92797 100644 |
| --- a/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm |
| +++ b/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm |
| @@ -216,14 +216,6 @@ static NSSize abs(NSSize size) |
| return NSMakeRect(0, 0, contentsSize.width(), contentsSize.height()); |
| } |
| -- (BOOL)inLiveResizeForScrollerImpPair:(id)scrollerImpPair |
|
Stephen Chennney
2016/03/04 17:36:56
This is part of the implementation for BlinkScroll
Mark Dittmer
2016/03/04 19:06:24
Thanks. I've since added it back (with the trivial
|
| -{ |
| - if (!_scrollableArea) |
| - return NO; |
| - |
| - return _scrollableArea->inLiveResize(); |
| -} |
| - |
| - (NSPoint)mouseLocationInContentAreaForScrollerImpPair:(id)scrollerImpPair |
| { |
| if (!_scrollableArea) |
| @@ -861,14 +853,6 @@ void ScrollAnimatorMac::mouseExitedScrollbar(Scrollbar& scrollbar) const |
| } |
| } |
| -void ScrollAnimatorMac::willStartLiveResize() |
| -{ |
| - if (!scrollableArea()->scrollbarsCanBeActive()) |
| - return; |
| - if (ScrollbarThemeMacCommon::isOverlayAPIAvailable()) |
| - [m_scrollbarPainterController.get() startLiveResize]; |
| -} |
| - |
| void ScrollAnimatorMac::contentsResized() const |
| { |
| if (!scrollableArea()->scrollbarsCanBeActive()) |
| @@ -877,14 +861,6 @@ void ScrollAnimatorMac::contentsResized() const |
| [m_scrollbarPainterController.get() contentAreaDidResize]; |
| } |
| -void ScrollAnimatorMac::willEndLiveResize() |
| -{ |
| - if (!scrollableArea()->scrollbarsCanBeActive()) |
| - return; |
| - if (ScrollbarThemeMacCommon::isOverlayAPIAvailable()) |
| - [m_scrollbarPainterController.get() endLiveResize]; |
| -} |
| - |
| void ScrollAnimatorMac::contentAreaDidShow() const |
| { |
| if (!scrollableArea()->scrollbarsCanBeActive()) |
| @@ -949,8 +925,6 @@ void ScrollAnimatorMac::didAddVerticalScrollbar(Scrollbar& scrollbar) |
| [painter setDelegate:m_verticalScrollbarPainterDelegate.get()]; |
| [m_scrollbarPainterController.get() setVerticalScrollerImp:painter]; |
| - if (scrollableArea()->inLiveResize()) |
| - [painter setKnobAlpha:1]; |
| } |
| void ScrollAnimatorMac::willRemoveVerticalScrollbar(Scrollbar& scrollbar) |
| @@ -984,8 +958,6 @@ void ScrollAnimatorMac::didAddHorizontalScrollbar(Scrollbar& scrollbar) |
| [painter setDelegate:m_horizontalScrollbarPainterDelegate.get()]; |
| [m_scrollbarPainterController.get() setHorizontalScrollerImp:painter]; |
| - if (scrollableArea()->inLiveResize()) |
| - [painter setKnobAlpha:1]; |
| } |
| void ScrollAnimatorMac::willRemoveHorizontalScrollbar(Scrollbar& scrollbar) |