| 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 23 matching lines...) Expand all Loading... |
| 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 |
| 40 #include "platform/TraceEvent.h" | 40 #include "platform/TraceEvent.h" |
| 41 | 41 |
| 42 using namespace std; | 42 using namespace std; |
| 43 | 43 |
| 44 namespace WebCore { | 44 namespace blink { |
| 45 | 45 |
| 46 const double kFrameRate = 60; | 46 const double kFrameRate = 60; |
| 47 const double kTickTime = 1 / kFrameRate; | 47 const double kTickTime = 1 / kFrameRate; |
| 48 const double kMinimumTimerInterval = .001; | 48 const double kMinimumTimerInterval = .001; |
| 49 | 49 |
| 50 PassOwnPtr<ScrollAnimator> ScrollAnimator::create(ScrollableArea* scrollableArea
) | 50 PassOwnPtr<ScrollAnimator> ScrollAnimator::create(ScrollableArea* scrollableArea
) |
| 51 { | 51 { |
| 52 if (scrollableArea && scrollableArea->scrollAnimatorEnabled()) | 52 if (scrollableArea && scrollableArea->scrollAnimatorEnabled()) |
| 53 return adoptPtr(new ScrollAnimatorNone(scrollableArea)); | 53 return adoptPtr(new ScrollAnimatorNone(scrollableArea)); |
| 54 return adoptPtr(new ScrollAnimator(scrollableArea)); | 54 return adoptPtr(new ScrollAnimator(scrollableArea)); |
| (...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 517 { | 517 { |
| 518 return m_animationActive; | 518 return m_animationActive; |
| 519 } | 519 } |
| 520 | 520 |
| 521 void ScrollAnimatorNone::stopAnimationTimerIfNeeded() | 521 void ScrollAnimatorNone::stopAnimationTimerIfNeeded() |
| 522 { | 522 { |
| 523 if (animationTimerActive()) | 523 if (animationTimerActive()) |
| 524 m_animationActive = false; | 524 m_animationActive = false; |
| 525 } | 525 } |
| 526 | 526 |
| 527 } // namespace WebCore | 527 } // namespace blink |
| OLD | NEW |