OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2011, Google Inc. All rights reserved. | 2 * Copyright (c) 2011, 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 Loading... |
29 */ | 29 */ |
30 | 30 |
31 #include "config.h" | 31 #include "config.h" |
32 | 32 |
33 #include "platform/scroll/ScrollAnimatorNone.h" | 33 #include "platform/scroll/ScrollAnimatorNone.h" |
34 | 34 |
35 #include <algorithm> | 35 #include <algorithm> |
36 #include "platform/scroll/ScrollableArea.h" | 36 #include "platform/scroll/ScrollableArea.h" |
37 #include "wtf/CurrentTime.h" | 37 #include "wtf/CurrentTime.h" |
38 #include "wtf/PassOwnPtr.h" | 38 #include "wtf/PassOwnPtr.h" |
39 | 39 #include "wtf/TraceEvent.h" |
40 #include "platform/TraceEvent.h" | |
41 | 40 |
42 using namespace std; | 41 using namespace std; |
43 | 42 |
44 namespace WebCore { | 43 namespace WebCore { |
45 | 44 |
46 const double kFrameRate = 60; | 45 const double kFrameRate = 60; |
47 const double kTickTime = 1 / kFrameRate; | 46 const double kTickTime = 1 / kFrameRate; |
48 const double kMinimumTimerInterval = .001; | 47 const double kMinimumTimerInterval = .001; |
49 | 48 |
50 PassOwnPtr<ScrollAnimator> ScrollAnimator::create(ScrollableArea* scrollableArea
) | 49 PassOwnPtr<ScrollAnimator> ScrollAnimator::create(ScrollableArea* scrollableArea
) |
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
517 return m_animationActive; | 516 return m_animationActive; |
518 } | 517 } |
519 | 518 |
520 void ScrollAnimatorNone::stopAnimationTimerIfNeeded() | 519 void ScrollAnimatorNone::stopAnimationTimerIfNeeded() |
521 { | 520 { |
522 if (animationTimerActive()) | 521 if (animationTimerActive()) |
523 m_animationActive = false; | 522 m_animationActive = false; |
524 } | 523 } |
525 | 524 |
526 } // namespace WebCore | 525 } // namespace WebCore |
OLD | NEW |