| 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 15 matching lines...) Expand all Loading... |
| 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 "core/platform/ScrollAnimatorNone.h" | 33 #include "core/platform/ScrollAnimatorNone.h" |
| 34 | 34 |
| 35 #include <algorithm> | 35 #include <algorithm> |
| 36 #include "core/platform/NotImplemented.h" | |
| 37 #include "core/platform/PlatformGestureEvent.h" | |
| 38 #include "core/platform/ScrollableArea.h" | 36 #include "core/platform/ScrollableArea.h" |
| 39 #include "core/platform/ScrollbarTheme.h" | |
| 40 #include "core/platform/graphics/FloatPoint.h" | 37 #include "core/platform/graphics/FloatPoint.h" |
| 41 #include <wtf/CurrentTime.h> | 38 #include <wtf/CurrentTime.h> |
| 42 #include <wtf/OwnArrayPtr.h> | 39 #include <wtf/OwnArrayPtr.h> |
| 43 #include <wtf/PassOwnPtr.h> | 40 #include <wtf/PassOwnPtr.h> |
| 44 | 41 |
| 45 #include "core/platform/chromium/TraceEvent.h" | 42 #include "core/platform/chromium/TraceEvent.h" |
| 46 | 43 |
| 47 using namespace std; | 44 using namespace std; |
| 48 | 45 |
| 49 namespace WebCore { | 46 namespace WebCore { |
| (...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 525 return m_animationActive; | 522 return m_animationActive; |
| 526 } | 523 } |
| 527 | 524 |
| 528 void ScrollAnimatorNone::stopAnimationTimerIfNeeded() | 525 void ScrollAnimatorNone::stopAnimationTimerIfNeeded() |
| 529 { | 526 { |
| 530 if (animationTimerActive()) | 527 if (animationTimerActive()) |
| 531 m_animationActive = false; | 528 m_animationActive = false; |
| 532 } | 529 } |
| 533 | 530 |
| 534 } // namespace WebCore | 531 } // namespace WebCore |
| OLD | NEW |