| 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 30 matching lines...) Expand all Loading... |
| 41 | 41 |
| 42 #include "platform/TraceEvent.h" | 42 #include "platform/TraceEvent.h" |
| 43 | 43 |
| 44 using namespace std; | 44 using namespace std; |
| 45 | 45 |
| 46 namespace WebCore { | 46 namespace WebCore { |
| 47 | 47 |
| 48 const double kFrameRate = 60; | 48 const double kFrameRate = 60; |
| 49 const double kTickTime = 1 / kFrameRate; | 49 const double kTickTime = 1 / kFrameRate; |
| 50 const double kMinimumTimerInterval = .001; | 50 const double kMinimumTimerInterval = .001; |
| 51 const double kZoomTicks = 11; | |
| 52 | 51 |
| 53 PassOwnPtr<ScrollAnimator> ScrollAnimator::create(ScrollableArea* scrollableArea
) | 52 PassOwnPtr<ScrollAnimator> ScrollAnimator::create(ScrollableArea* scrollableArea
) |
| 54 { | 53 { |
| 55 if (scrollableArea && scrollableArea->scrollAnimatorEnabled()) | 54 if (scrollableArea && scrollableArea->scrollAnimatorEnabled()) |
| 56 return adoptPtr(new ScrollAnimatorNone(scrollableArea)); | 55 return adoptPtr(new ScrollAnimatorNone(scrollableArea)); |
| 57 return adoptPtr(new ScrollAnimator(scrollableArea)); | 56 return adoptPtr(new ScrollAnimator(scrollableArea)); |
| 58 } | 57 } |
| 59 | 58 |
| 60 ScrollAnimatorNone::Parameters::Parameters() | 59 ScrollAnimatorNone::Parameters::Parameters() |
| 61 : m_isEnabled(false) | 60 : m_isEnabled(false) |
| (...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 522 return m_animationActive; | 521 return m_animationActive; |
| 523 } | 522 } |
| 524 | 523 |
| 525 void ScrollAnimatorNone::stopAnimationTimerIfNeeded() | 524 void ScrollAnimatorNone::stopAnimationTimerIfNeeded() |
| 526 { | 525 { |
| 527 if (animationTimerActive()) | 526 if (animationTimerActive()) |
| 528 m_animationActive = false; | 527 m_animationActive = false; |
| 529 } | 528 } |
| 530 | 529 |
| 531 } // namespace WebCore | 530 } // namespace WebCore |
| OLD | NEW |