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 27 matching lines...) Expand all Loading... |
38 #include "wtf/PassRefPtr.h" | 38 #include "wtf/PassRefPtr.h" |
39 | 39 |
40 #include "platform/TraceEvent.h" | 40 #include "platform/TraceEvent.h" |
41 | 41 |
42 namespace blink { | 42 namespace blink { |
43 | 43 |
44 const double kFrameRate = 60; | 44 const double kFrameRate = 60; |
45 const double kTickTime = 1 / kFrameRate; | 45 const double kTickTime = 1 / kFrameRate; |
46 const double kMinimumTimerInterval = .001; | 46 const double kMinimumTimerInterval = .001; |
47 | 47 |
48 PassRefPtr<ScrollAnimator> ScrollAnimator::create(ScrollableArea* scrollableArea
) | 48 PassOwnPtr<ScrollAnimator> ScrollAnimator::create(ScrollableArea* scrollableArea
) |
49 { | 49 { |
50 if (scrollableArea && scrollableArea->scrollAnimatorEnabled()) | 50 if (scrollableArea && scrollableArea->scrollAnimatorEnabled()) |
51 return adoptRef(new ScrollAnimatorNone(scrollableArea)); | 51 return adoptPtr(new ScrollAnimatorNone(scrollableArea)); |
52 return adoptRef(new ScrollAnimator(scrollableArea)); | 52 return adoptPtr(new ScrollAnimator(scrollableArea)); |
53 } | 53 } |
54 | 54 |
55 ScrollAnimatorNone::Parameters::Parameters() | 55 ScrollAnimatorNone::Parameters::Parameters() |
56 : m_isEnabled(false) | 56 : m_isEnabled(false) |
57 { | 57 { |
58 } | 58 } |
59 | 59 |
60 ScrollAnimatorNone::Parameters::Parameters(bool isEnabled, double animationTime,
double repeatMinimumSustainTime, Curve attackCurve, double attackTime, Curve re
leaseCurve, double releaseTime, Curve coastTimeCurve, double maximumCoastTime) | 60 ScrollAnimatorNone::Parameters::Parameters(bool isEnabled, double animationTime,
double repeatMinimumSustainTime, Curve attackCurve, double attackTime, Curve re
leaseCurve, double releaseTime, Curve coastTimeCurve, double maximumCoastTime) |
61 : m_isEnabled(isEnabled) | 61 : m_isEnabled(isEnabled) |
62 , m_animationTime(animationTime) | 62 , m_animationTime(animationTime) |
(...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
526 return m_animationActive; | 526 return m_animationActive; |
527 } | 527 } |
528 | 528 |
529 void ScrollAnimatorNone::stopAnimationTimerIfNeeded() | 529 void ScrollAnimatorNone::stopAnimationTimerIfNeeded() |
530 { | 530 { |
531 if (animationTimerActive()) | 531 if (animationTimerActive()) |
532 m_animationActive = false; | 532 m_animationActive = false; |
533 } | 533 } |
534 | 534 |
535 } // namespace blink | 535 } // namespace blink |
OLD | NEW |