| 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 24 matching lines...) Expand all Loading... |
| 35 #include <algorithm> | 35 #include <algorithm> |
| 36 #include "NotImplemented.h" | 36 #include "NotImplemented.h" |
| 37 #include "PlatformGestureEvent.h" | 37 #include "PlatformGestureEvent.h" |
| 38 #include "ScrollableArea.h" | 38 #include "ScrollableArea.h" |
| 39 #include "ScrollbarTheme.h" | 39 #include "ScrollbarTheme.h" |
| 40 #include "core/platform/graphics/FloatPoint.h" | 40 #include "core/platform/graphics/FloatPoint.h" |
| 41 #include <wtf/CurrentTime.h> | 41 #include <wtf/CurrentTime.h> |
| 42 #include <wtf/OwnArrayPtr.h> | 42 #include <wtf/OwnArrayPtr.h> |
| 43 #include <wtf/PassOwnPtr.h> | 43 #include <wtf/PassOwnPtr.h> |
| 44 | 44 |
| 45 #include "TraceEvent.h" | 45 #include "core/platform/chromium/TraceEvent.h" |
| 46 | 46 |
| 47 using namespace std; | 47 using namespace std; |
| 48 | 48 |
| 49 namespace WebCore { | 49 namespace WebCore { |
| 50 | 50 |
| 51 const double kFrameRate = 60; | 51 const double kFrameRate = 60; |
| 52 const double kTickTime = 1 / kFrameRate; | 52 const double kTickTime = 1 / kFrameRate; |
| 53 const double kMinimumTimerInterval = .001; | 53 const double kMinimumTimerInterval = .001; |
| 54 const double kZoomTicks = 11; | 54 const double kZoomTicks = 11; |
| 55 | 55 |
| (...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 525 return m_animationActive; | 525 return m_animationActive; |
| 526 } | 526 } |
| 527 | 527 |
| 528 void ScrollAnimatorNone::stopAnimationTimerIfNeeded() | 528 void ScrollAnimatorNone::stopAnimationTimerIfNeeded() |
| 529 { | 529 { |
| 530 if (animationTimerActive()) | 530 if (animationTimerActive()) |
| 531 m_animationActive = false; | 531 m_animationActive = false; |
| 532 } | 532 } |
| 533 | 533 |
| 534 } // namespace WebCore | 534 } // namespace WebCore |
| OLD | NEW |