| 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 "public/platform/WebGestureCurve.h" | 28 #include "public/platform/WebGestureCurve.h" |
| 29 #include "public/platform/WebGestureCurveTarget.h" | 29 #include "public/platform/WebGestureCurveTarget.h" |
| 30 #include "wtf/PtrUtil.h" |
| 31 #include <memory> |
| 30 | 32 |
| 31 namespace blink { | 33 namespace blink { |
| 32 | 34 |
| 33 PassOwnPtr<WebActiveGestureAnimation> WebActiveGestureAnimation::createAtAnimati
onStart(PassOwnPtr<WebGestureCurve> curve, WebGestureCurveTarget* target) | 35 std::unique_ptr<WebActiveGestureAnimation> WebActiveGestureAnimation::createAtAn
imationStart(std::unique_ptr<WebGestureCurve> curve, WebGestureCurveTarget* targ
et) |
| 34 { | 36 { |
| 35 return adoptPtr(new WebActiveGestureAnimation(std::move(curve), target, 0, t
rue)); | 37 return wrapUnique(new WebActiveGestureAnimation(std::move(curve), target, 0,
true)); |
| 36 } | 38 } |
| 37 | 39 |
| 38 PassOwnPtr<WebActiveGestureAnimation> WebActiveGestureAnimation::createWithTimeO
ffset(PassOwnPtr<WebGestureCurve> curve, WebGestureCurveTarget* target, double s
tartTime) | 40 std::unique_ptr<WebActiveGestureAnimation> WebActiveGestureAnimation::createWith
TimeOffset(std::unique_ptr<WebGestureCurve> curve, WebGestureCurveTarget* target
, double startTime) |
| 39 { | 41 { |
| 40 return adoptPtr(new WebActiveGestureAnimation(std::move(curve), target, star
tTime, false)); | 42 return wrapUnique(new WebActiveGestureAnimation(std::move(curve), target, st
artTime, false)); |
| 41 } | 43 } |
| 42 | 44 |
| 43 WebActiveGestureAnimation::~WebActiveGestureAnimation() | 45 WebActiveGestureAnimation::~WebActiveGestureAnimation() |
| 44 { | 46 { |
| 45 } | 47 } |
| 46 | 48 |
| 47 WebActiveGestureAnimation::WebActiveGestureAnimation(PassOwnPtr<WebGestureCurve>
curve, WebGestureCurveTarget* target, double startTime, bool waitingForFirstTic
k) | 49 WebActiveGestureAnimation::WebActiveGestureAnimation(std::unique_ptr<WebGestureC
urve> curve, WebGestureCurveTarget* target, double startTime, bool waitingForFir
stTick) |
| 48 : m_startTime(startTime) | 50 : m_startTime(startTime) |
| 49 , m_waitingForFirstTick(waitingForFirstTick) | 51 , m_waitingForFirstTick(waitingForFirstTick) |
| 50 , m_curve(std::move(curve)) | 52 , m_curve(std::move(curve)) |
| 51 , m_target(target) | 53 , m_target(target) |
| 52 { | 54 { |
| 53 } | 55 } |
| 54 | 56 |
| 55 bool WebActiveGestureAnimation::animate(double time) | 57 bool WebActiveGestureAnimation::animate(double time) |
| 56 { | 58 { |
| 57 if (m_waitingForFirstTick) { | 59 if (m_waitingForFirstTick) { |
| 58 m_startTime = time; | 60 m_startTime = time; |
| 59 m_waitingForFirstTick = false; | 61 m_waitingForFirstTick = false; |
| 60 } | 62 } |
| 61 // All WebGestureCurves assume zero-based time, so we subtract | 63 // All WebGestureCurves assume zero-based time, so we subtract |
| 62 // the animation start time before passing to the curve. | 64 // the animation start time before passing to the curve. |
| 63 return m_curve->apply(time - m_startTime, m_target); | 65 return m_curve->apply(time - m_startTime, m_target); |
| 64 } | 66 } |
| 65 | 67 |
| 66 } // namespace blink | 68 } // namespace blink |
| OLD | NEW |