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

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

Issue 512293003: Removing "using" declarations that import names in the C++ Standard library.(Source/platform/[m* - … (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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
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 18 matching lines...) Expand all
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "platform/scroll/ScrollAnimator.h" 32 #include "platform/scroll/ScrollAnimator.h"
33 33
34 #include "platform/geometry/FloatPoint.h" 34 #include "platform/geometry/FloatPoint.h"
35 #include "platform/scroll/ScrollableArea.h" 35 #include "platform/scroll/ScrollableArea.h"
36 #include "wtf/PassOwnPtr.h" 36 #include "wtf/PassOwnPtr.h"
37 #include <algorithm> 37 #include <algorithm>
38 38
39 using namespace std;
40
41 namespace blink { 39 namespace blink {
42 40
43 ScrollAnimator::ScrollAnimator(ScrollableArea* scrollableArea) 41 ScrollAnimator::ScrollAnimator(ScrollableArea* scrollableArea)
44 : m_scrollableArea(scrollableArea) 42 : m_scrollableArea(scrollableArea)
45 , m_currentPosX(0) 43 , m_currentPosX(0)
46 , m_currentPosY(0) 44 , m_currentPosY(0)
47 { 45 {
48 } 46 }
49 47
50 ScrollAnimator::~ScrollAnimator() 48 ScrollAnimator::~ScrollAnimator()
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 } 137 }
140 138
141 float ScrollAnimator::clampScrollPosition(ScrollbarOrientation orientation, floa t pos) 139 float ScrollAnimator::clampScrollPosition(ScrollbarOrientation orientation, floa t pos)
142 { 140 {
143 float maxScrollPos = m_scrollableArea->maximumScrollPosition(orientation); 141 float maxScrollPos = m_scrollableArea->maximumScrollPosition(orientation);
144 float minScrollPos = m_scrollableArea->minimumScrollPosition(orientation); 142 float minScrollPos = m_scrollableArea->minimumScrollPosition(orientation);
145 return std::max(std::min(pos, maxScrollPos), minScrollPos); 143 return std::max(std::min(pos, maxScrollPos), minScrollPos);
146 } 144 }
147 145
148 } // namespace blink 146 } // namespace blink
OLDNEW
« no previous file with comments | « Source/platform/scheduler/SchedulerTest.cpp ('k') | Source/platform/scroll/ScrollAnimatorNone.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698