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

Side by Side Diff: Source/core/platform/ScrollAnimator.cpp

Issue 14107015: Rename OS(DARWIN) to OS(MACOSX). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 7 years, 3 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 | « Source/core/platform/ScrollAnimator.h ('k') | Source/core/platform/Scrollbar.cpp » ('j') | 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, Google Inc. All rights reserved. 2 * Copyright (c) 2010, Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 bool canScrollX = m_scrollableArea->userInputScrollable(HorizontalScrollbar) ; 79 bool canScrollX = m_scrollableArea->userInputScrollable(HorizontalScrollbar) ;
80 bool canScrollY = m_scrollableArea->userInputScrollable(VerticalScrollbar); 80 bool canScrollY = m_scrollableArea->userInputScrollable(VerticalScrollbar);
81 81
82 // Accept the event if we are scrollable in that direction and can still 82 // Accept the event if we are scrollable in that direction and can still
83 // scroll any further. 83 // scroll any further.
84 float deltaX = canScrollX ? e.deltaX() : 0; 84 float deltaX = canScrollX ? e.deltaX() : 0;
85 float deltaY = canScrollY ? e.deltaY() : 0; 85 float deltaY = canScrollY ? e.deltaY() : 0;
86 86
87 bool handled = false; 87 bool handled = false;
88 88
89 #if !OS(DARWIN) 89 #if !OS(MACOSX)
90 ScrollGranularity granularity = e.hasPreciseScrollingDeltas() ? ScrollByPrec isePixel : ScrollByPixel; 90 ScrollGranularity granularity = e.hasPreciseScrollingDeltas() ? ScrollByPrec isePixel : ScrollByPixel;
91 #else 91 #else
92 ScrollGranularity granularity = ScrollByPixel; 92 ScrollGranularity granularity = ScrollByPixel;
93 #endif 93 #endif
94 94
95 IntSize maxForwardScrollDelta = m_scrollableArea->maximumScrollPosition() - m_scrollableArea->scrollPosition(); 95 IntSize maxForwardScrollDelta = m_scrollableArea->maximumScrollPosition() - m_scrollableArea->scrollPosition();
96 IntSize maxBackwardScrollDelta = m_scrollableArea->scrollPosition() - m_scro llableArea->minimumScrollPosition(); 96 IntSize maxBackwardScrollDelta = m_scrollableArea->scrollPosition() - m_scro llableArea->minimumScrollPosition();
97 if ((deltaX < 0 && maxForwardScrollDelta.width() > 0) 97 if ((deltaX < 0 && maxForwardScrollDelta.width() > 0)
98 || (deltaX > 0 && maxBackwardScrollDelta.width() > 0) 98 || (deltaX > 0 && maxBackwardScrollDelta.width() > 0)
99 || (deltaY < 0 && maxForwardScrollDelta.height() > 0) 99 || (deltaY < 0 && maxForwardScrollDelta.height() > 0)
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 } 143 }
144 144
145 float ScrollAnimator::clampScrollPosition(ScrollbarOrientation orientation, floa t pos) 145 float ScrollAnimator::clampScrollPosition(ScrollbarOrientation orientation, floa t pos)
146 { 146 {
147 float maxScrollPos = m_scrollableArea->maximumScrollPosition(orientation); 147 float maxScrollPos = m_scrollableArea->maximumScrollPosition(orientation);
148 float minScrollPos = m_scrollableArea->minimumScrollPosition(orientation); 148 float minScrollPos = m_scrollableArea->minimumScrollPosition(orientation);
149 return std::max(std::min(pos, maxScrollPos), minScrollPos); 149 return std::max(std::min(pos, maxScrollPos), minScrollPos);
150 } 150 }
151 151
152 } // namespace WebCore 152 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/platform/ScrollAnimator.h ('k') | Source/core/platform/Scrollbar.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698