Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Side by Side 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: Removed tests Created 4 years, 9 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 1022 matching lines...) Expand 10 before | Expand all | Expand 10 after
1033 1033
1034 [m_verticalScrollbarPainterDelegate.get() updateVisibilityImmediately:sh ow]; 1034 [m_verticalScrollbarPainterDelegate.get() updateVisibilityImmediately:sh ow];
1035 [m_verticalScrollbarPainterDelegate.get() updateVisibilityImmediately:sh ow]; 1035 [m_verticalScrollbarPainterDelegate.get() updateVisibilityImmediately:sh ow];
1036 return true; 1036 return true;
1037 } 1037 }
1038 return false; 1038 return false;
1039 } 1039 }
1040 1040
1041 void ScrollAnimatorMac::cancelAnimation() 1041 void ScrollAnimatorMac::cancelAnimation()
1042 { 1042 {
1043 [m_scrollAnimationHelper.get() _stopRun];
1043 m_haveScrolledSincePageLoad = false; 1044 m_haveScrolledSincePageLoad = false;
1044
1045 if (ScrollbarThemeMacCommon::isOverlayAPIAvailable()) {
1046 if (scrollbarPaintTimerIsActive())
1047 stopScrollbarPaintTimer();
1048 [m_horizontalScrollbarPainterDelegate.get() cancelAnimations];
1049 [m_verticalScrollbarPainterDelegate.get() cancelAnimations];
1050 }
1051 } 1045 }
1052 1046
1053 void ScrollAnimatorMac::handleWheelEventPhase(PlatformWheelEventPhase phase) 1047 void ScrollAnimatorMac::handleWheelEventPhase(PlatformWheelEventPhase phase)
1054 { 1048 {
1055 // This may not have been set to true yet if the wheel event was handled by the ScrollingTree, 1049 // This may not have been set to true yet if the wheel event was handled by the ScrollingTree,
1056 // So set it to true here. 1050 // So set it to true here.
1057 m_haveScrolledSincePageLoad = true; 1051 m_haveScrolledSincePageLoad = true;
1058 1052
1059 if (phase == PlatformWheelEventPhaseBegan) 1053 if (phase == PlatformWheelEventPhaseBegan)
1060 didBeginScrollGesture(); 1054 didBeginScrollGesture();
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
1178 return; 1172 return;
1179 1173
1180 m_visibleScrollerThumbRect = rectInViewCoordinates; 1174 m_visibleScrollerThumbRect = rectInViewCoordinates;
1181 } 1175 }
1182 1176
1183 bool ScrollAnimatorMac::canUseCoordinatedScrollbar() { 1177 bool ScrollAnimatorMac::canUseCoordinatedScrollbar() {
1184 return ScrollbarThemeMacCommon::isOverlayAPIAvailable(); 1178 return ScrollbarThemeMacCommon::isOverlayAPIAvailable();
1185 } 1179 }
1186 1180
1187 } // namespace blink 1181 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698