| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "platform/exported/WebActiveGestureAnimation.h" | 27 #include "platform/exported/WebActiveGestureAnimation.h" |
| 28 | 28 |
| 29 #include "public/platform/WebGestureCurve.h" | 29 #include "public/platform/WebGestureCurve.h" |
| 30 #include "public/platform/WebGestureCurveTarget.h" | 30 #include "public/platform/WebGestureCurveTarget.h" |
| 31 | 31 |
| 32 namespace WebKit { | 32 namespace blink { |
| 33 | 33 |
| 34 PassOwnPtr<WebActiveGestureAnimation> WebActiveGestureAnimation::createAtAnimati
onStart(PassOwnPtr<WebGestureCurve> curve, WebGestureCurveTarget* target) | 34 PassOwnPtr<WebActiveGestureAnimation> WebActiveGestureAnimation::createAtAnimati
onStart(PassOwnPtr<WebGestureCurve> curve, WebGestureCurveTarget* target) |
| 35 { | 35 { |
| 36 return adoptPtr(new WebActiveGestureAnimation(curve, target, 0, true)); | 36 return adoptPtr(new WebActiveGestureAnimation(curve, target, 0, true)); |
| 37 } | 37 } |
| 38 | 38 |
| 39 PassOwnPtr<WebActiveGestureAnimation> WebActiveGestureAnimation::createWithTimeO
ffset(PassOwnPtr<WebGestureCurve> curve, WebGestureCurveTarget* target, double s
tartTime) | 39 PassOwnPtr<WebActiveGestureAnimation> WebActiveGestureAnimation::createWithTimeO
ffset(PassOwnPtr<WebGestureCurve> curve, WebGestureCurveTarget* target, double s
tartTime) |
| 40 { | 40 { |
| 41 return adoptPtr(new WebActiveGestureAnimation(curve, target, startTime, fals
e)); | 41 return adoptPtr(new WebActiveGestureAnimation(curve, target, startTime, fals
e)); |
| 42 } | 42 } |
| (...skipping 14 matching lines...) Expand all Loading... |
| 57 { | 57 { |
| 58 if (m_waitingForFirstTick) { | 58 if (m_waitingForFirstTick) { |
| 59 m_startTime = time; | 59 m_startTime = time; |
| 60 m_waitingForFirstTick = false; | 60 m_waitingForFirstTick = false; |
| 61 } | 61 } |
| 62 // All WebGestureCurves assume zero-based time, so we subtract | 62 // All WebGestureCurves assume zero-based time, so we subtract |
| 63 // the animation start time before passing to the curve. | 63 // the animation start time before passing to the curve. |
| 64 return m_curve->apply(time - m_startTime, m_target); | 64 return m_curve->apply(time - m_startTime, m_target); |
| 65 } | 65 } |
| 66 | 66 |
| 67 } // namespace WebKit | 67 } // namespace blink |
| OLD | NEW |