third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm - Issue 1553003002: Fix Mac overlay scrollbars to show when programmatically scrolled.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm

Issue 1553003002: Fix Mac overlay scrollbars to show when programmatically scrolled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add test expectation Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« third_party/WebKit/LayoutTests/compositing/scrollbars/mac-programmatic-scroll-shows-overlay-scrollbars.html ('K') | « third_party/WebKit/LayoutTests/fast/scroll-behavior/smooth-scroll/cancel-user-scroll-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 6f940cb75decad84a1bb1ab2c93ed210adf89f45..3f9a198cfbbe9086ef3f90612be603a6d222d2eb 100644

--- a/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm

+++ b/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm

@@ -1040,14 +1040,8 @@ bool ScrollAnimatorMac::setScrollbarsVisibleForTesting(bool show)

void ScrollAnimatorMac::cancelAnimation()

{

+ [m_scrollAnimationHelper.get() _stopRun];

m_haveScrolledSincePageLoad = false;

- if (ScrollbarThemeMacCommon::isOverlayAPIAvailable()) {

- if (scrollbarPaintTimerIsActive())

- stopScrollbarPaintTimer();

- [m_horizontalScrollbarPainterDelegate.get() cancelAnimations];

- [m_verticalScrollbarPainterDelegate.get() cancelAnimations];

- }

}

void ScrollAnimatorMac::handleWheelEventPhase(PlatformWheelEventPhase phase)