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

Side by Side Diff: Source/platform/mac/ScrollAnimatorMac.mm

Issue 941843002: Suppress smooth scroll for trackpad scrolls on Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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 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 707 matching lines...) Expand 10 before | Expand all | Expand 10 after
718 } 718 }
719 #endif 719 #endif
720 720
721 bool ScrollAnimatorMac::scroll(ScrollbarOrientation orientation, ScrollGranulari ty granularity, float step, float delta) 721 bool ScrollAnimatorMac::scroll(ScrollbarOrientation orientation, ScrollGranulari ty granularity, float step, float delta)
722 { 722 {
723 m_haveScrolledSincePageLoad = true; 723 m_haveScrolledSincePageLoad = true;
724 724
725 if (!scrollAnimationEnabledForSystem() || !m_scrollableArea->scrollAnimatorE nabled()) 725 if (!scrollAnimationEnabledForSystem() || !m_scrollableArea->scrollAnimatorE nabled())
726 return ScrollAnimator::scroll(orientation, granularity, step, delta); 726 return ScrollAnimator::scroll(orientation, granularity, step, delta);
727 727
728 if (granularity == ScrollByPixel) 728 if (granularity == ScrollByPixel || granularity == ScrollByPrecisePixel)
729 return ScrollAnimator::scroll(orientation, granularity, step, delta); 729 return ScrollAnimator::scroll(orientation, granularity, step, delta);
730 730
731 float currentPos = orientation == HorizontalScrollbar ? m_currentPosX : m_cu rrentPosY; 731 float currentPos = orientation == HorizontalScrollbar ? m_currentPosX : m_cu rrentPosY;
732 float newPos = std::max<float>(std::min<float>(currentPos + (step * delta), m_scrollableArea->maximumScrollPosition(orientation)), m_scrollableArea->minimum ScrollPosition(orientation)); 732 float newPos = std::max<float>(std::min<float>(currentPos + (step * delta), m_scrollableArea->maximumScrollPosition(orientation)), m_scrollableArea->minimum ScrollPosition(orientation));
733 if (currentPos == newPos) 733 if (currentPos == newPos)
734 return false; 734 return false;
735 735
736 NSPoint newPoint; 736 NSPoint newPoint;
737 if ([m_scrollAnimationHelper.get() _isAnimating]) { 737 if ([m_scrollAnimationHelper.get() _isAnimating]) {
738 NSPoint targetOrigin = [m_scrollAnimationHelper.get() targetOrigin]; 738 NSPoint targetOrigin = [m_scrollAnimationHelper.get() targetOrigin];
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
1359 return; 1359 return;
1360 1360
1361 m_visibleScrollerThumbRect = rectInViewCoordinates; 1361 m_visibleScrollerThumbRect = rectInViewCoordinates;
1362 } 1362 }
1363 1363
1364 bool ScrollAnimatorMac::canUseCoordinatedScrollbar() { 1364 bool ScrollAnimatorMac::canUseCoordinatedScrollbar() {
1365 return ScrollbarThemeMacCommon::isOverlayAPIAvailable(); 1365 return ScrollbarThemeMacCommon::isOverlayAPIAvailable();
1366 } 1366 }
1367 1367
1368 } // namespace blink 1368 } // 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