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 |
11 * notice, this list of conditions and the following disclaimer in the | 11 * notice, this list of conditions and the following disclaimer in the |
12 * documentation and/or other materials provided with the distribution. | 12 * documentation and/or other materials provided with the distribution. |
13 * | 13 * |
14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY | 14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY |
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY | 17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY |
18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
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 "platform/exported/WebActiveGestureAnimation.h" | 26 #include "platform/exported/WebActiveGestureAnimation.h" |
27 | 27 |
| 28 #include <memory> |
28 #include "public/platform/WebGestureCurve.h" | 29 #include "public/platform/WebGestureCurve.h" |
29 #include "public/platform/WebGestureCurveTarget.h" | 30 #include "public/platform/WebGestureCurveTarget.h" |
30 #include "wtf/PtrUtil.h" | 31 #include "wtf/PtrUtil.h" |
31 #include <memory> | |
32 | 32 |
33 namespace blink { | 33 namespace blink { |
34 | 34 |
35 std::unique_ptr<WebActiveGestureAnimation> | 35 std::unique_ptr<WebActiveGestureAnimation> |
36 WebActiveGestureAnimation::createAtAnimationStart( | 36 WebActiveGestureAnimation::createAtAnimationStart( |
37 std::unique_ptr<WebGestureCurve> curve, | 37 std::unique_ptr<WebGestureCurve> curve, |
38 WebGestureCurveTarget* target) { | 38 WebGestureCurveTarget* target) { |
39 return WTF::wrapUnique( | 39 return WTF::wrapUnique( |
40 new WebActiveGestureAnimation(std::move(curve), target, 0, true)); | 40 new WebActiveGestureAnimation(std::move(curve), target, 0, true)); |
41 } | 41 } |
(...skipping 23 matching lines...) Expand all Loading... |
65 if (m_waitingForFirstTick) { | 65 if (m_waitingForFirstTick) { |
66 m_startTime = time; | 66 m_startTime = time; |
67 m_waitingForFirstTick = false; | 67 m_waitingForFirstTick = false; |
68 } | 68 } |
69 // All WebGestureCurves assume zero-based time, so we subtract | 69 // All WebGestureCurves assume zero-based time, so we subtract |
70 // the animation start time before passing to the curve. | 70 // the animation start time before passing to the curve. |
71 return m_curve->apply(time - m_startTime, m_target); | 71 return m_curve->apply(time - m_startTime, m_target); |
72 } | 72 } |
73 | 73 |
74 } // namespace blink | 74 } // namespace blink |
OLD | NEW |