| 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 14 matching lines...) Expand all Loading... |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 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 "platform/TraceEvent.h" |
| 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 <algorithm> |
| 40 #include "platform/TraceEvent.h" | |
| 41 | 40 |
| 42 using namespace std; | 41 using namespace std; |
| 43 | 42 |
| 44 namespace WebCore { | 43 namespace { |
| 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 |
| 49 } // namespace |
| 50 |
| 51 namespace WebCore { |
| 52 |
| 50 PassOwnPtr<ScrollAnimator> ScrollAnimator::create(ScrollableArea* scrollableArea
) | 53 PassOwnPtr<ScrollAnimator> ScrollAnimator::create(ScrollableArea* scrollableArea
) |
| 51 { | 54 { |
| 52 if (scrollableArea && scrollableArea->scrollAnimatorEnabled()) | 55 if (scrollableArea && scrollableArea->scrollAnimatorEnabled()) |
| 53 return adoptPtr(new ScrollAnimatorNone(scrollableArea)); | 56 return adoptPtr(new ScrollAnimatorNone(scrollableArea)); |
| 54 return adoptPtr(new ScrollAnimator(scrollableArea)); | 57 return adoptPtr(new ScrollAnimator(scrollableArea)); |
| 55 } | 58 } |
| 56 | 59 |
| 57 ScrollAnimatorNone::Parameters::Parameters() | 60 ScrollAnimatorNone::Parameters::Parameters() |
| 58 : m_isEnabled(false) | 61 : m_isEnabled(false) |
| 59 { | 62 { |
| (...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 483 m_verticalData.updateVisibleLength(scrollableArea()->visibleHeight()); | 486 m_verticalData.updateVisibleLength(scrollableArea()->visibleHeight()); |
| 484 } | 487 } |
| 485 | 488 |
| 486 void ScrollAnimatorNone::animationTimerFired() | 489 void ScrollAnimatorNone::animationTimerFired() |
| 487 { | 490 { |
| 488 TRACE_EVENT0("webkit", "ScrollAnimatorNone::animationTimerFired"); | 491 TRACE_EVENT0("webkit", "ScrollAnimatorNone::animationTimerFired"); |
| 489 | 492 |
| 490 double currentTime = WTF::monotonicallyIncreasingTime(); | 493 double currentTime = WTF::monotonicallyIncreasingTime(); |
| 491 | 494 |
| 492 bool continueAnimation = false; | 495 bool continueAnimation = false; |
| 496 |
| 493 if (m_horizontalData.m_startTime && m_horizontalData.animateScroll(currentTi
me)) | 497 if (m_horizontalData.m_startTime && m_horizontalData.animateScroll(currentTi
me)) |
| 494 continueAnimation = true; | 498 continueAnimation = true; |
| 495 if (m_verticalData.m_startTime && m_verticalData.animateScroll(currentTime)) | 499 if (m_verticalData.m_startTime && m_verticalData.animateScroll(currentTime)) |
| 496 continueAnimation = true; | 500 continueAnimation = true; |
| 497 | 501 |
| 498 if (continueAnimation) | 502 if (continueAnimation) |
| 499 startNextTimer(); | 503 startNextTimer(); |
| 500 else | 504 else |
| 501 m_animationActive = false; | 505 m_animationActive = false; |
| 502 | 506 |
| (...skipping 15 matching lines...) Expand all Loading... |
| 518 return m_animationActive; | 522 return m_animationActive; |
| 519 } | 523 } |
| 520 | 524 |
| 521 void ScrollAnimatorNone::stopAnimationTimerIfNeeded() | 525 void ScrollAnimatorNone::stopAnimationTimerIfNeeded() |
| 522 { | 526 { |
| 523 if (animationTimerActive()) | 527 if (animationTimerActive()) |
| 524 m_animationActive = false; | 528 m_animationActive = false; |
| 525 } | 529 } |
| 526 | 530 |
| 527 } // namespace WebCore | 531 } // namespace WebCore |
| OLD | NEW |