| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2011 Apple 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' | 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' |
| 14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, | 14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, |
| 15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS |
| 17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
| 18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
| 19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
| 20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
| 21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
| 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF |
| 23 * THE POSSIBILITY OF SUCH DAMAGE. | 23 * THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "ScrollElasticityController.h" | 27 #include "ScrollElasticityController.h" |
| 28 | 28 |
| 29 #include "PlatformWheelEvent.h" | 29 #include <sys/sysctl.h> |
| 30 #include <sys/time.h> |
| 30 #include "WebCoreSystemInterface.h" | 31 #include "WebCoreSystemInterface.h" |
| 31 #include <sys/time.h> | 32 #include "core/platform/PlatformWheelEvent.h" |
| 32 #include <sys/sysctl.h> | |
| 33 | 33 |
| 34 #if ENABLE(RUBBER_BANDING) | 34 #if ENABLE(RUBBER_BANDING) |
| 35 | 35 |
| 36 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050 | 36 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050 |
| 37 @interface NSProcessInfo (ScrollAnimatorMacExt) | 37 @interface NSProcessInfo (ScrollAnimatorMacExt) |
| 38 - (NSTimeInterval)systemUptime; | 38 - (NSTimeInterval)systemUptime; |
| 39 @end | 39 @end |
| 40 #endif | 40 #endif |
| 41 | 41 |
| 42 #if ENABLE(RUBBER_BANDING) | 42 #if ENABLE(RUBBER_BANDING) |
| (...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 414 return m_client->shouldRubberBandInDirection(ScrollLeft); | 414 return m_client->shouldRubberBandInDirection(ScrollLeft); |
| 415 if (wheelEvent.deltaX() < 0) | 415 if (wheelEvent.deltaX() < 0) |
| 416 return m_client->shouldRubberBandInDirection(ScrollRight); | 416 return m_client->shouldRubberBandInDirection(ScrollRight); |
| 417 | 417 |
| 418 return true; | 418 return true; |
| 419 } | 419 } |
| 420 | 420 |
| 421 } // namespace WebCore | 421 } // namespace WebCore |
| 422 | 422 |
| 423 #endif // ENABLE(RUBBER_BANDING) | 423 #endif // ENABLE(RUBBER_BANDING) |
| OLD | NEW |