OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 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 |
11 * copyright notice, this list of conditions and the following disclaimer | 11 * copyright notice, this list of conditions and the following disclaimer |
12 * in the documentation and/or other materials provided with the | 12 * in the documentation and/or other materials provided with the |
13 * distribution. | 13 * distribution. |
14 * * Neither the name of Google Inc. nor the names of its | 14 * * Neither the name of Google Inc. nor the names of its |
15 * contributors may be used to endorse or promote products derived from | 15 * contributors may be used to endorse or promote products derived from |
16 * this software without specific prior written permission. | 16 * this software without specific prior written permission. |
17 * | 17 * |
18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | 18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | 19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
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 #include "core/animation/AnimatableLengthPoint.h" | 32 #include "core/animation/AnimatableLengthPoint3D.h" |
33 | 33 |
34 namespace WebCore { | 34 namespace WebCore { |
35 | 35 |
36 PassRefPtr<AnimatableValue> AnimatableLengthPoint::interpolateTo(const Animatabl
eValue* value, double fraction) const | 36 PassRefPtr<AnimatableValue> AnimatableLengthPoint3D::interpolateTo(const Animata
bleValue* value, double fraction) const |
37 { | 37 { |
38 const AnimatableLengthPoint* lengthPoint = toAnimatableLengthPoint(value); | 38 const AnimatableLengthPoint3D* lengthPoint = toAnimatableLengthPoint3D(value
); |
39 return AnimatableLengthPoint::create( | 39 return AnimatableLengthPoint3D::create( |
40 AnimatableValue::interpolate(this->x(), lengthPoint->x(), fraction), | 40 AnimatableValue::interpolate(this->x(), lengthPoint->x(), fraction), |
41 AnimatableValue::interpolate(this->y(), lengthPoint->y(), fraction)); | 41 AnimatableValue::interpolate(this->y(), lengthPoint->y(), fraction), |
| 42 AnimatableValue::interpolate(this->z(), lengthPoint->z(), fraction)); |
42 } | 43 } |
43 | 44 |
44 PassRefPtr<AnimatableValue> AnimatableLengthPoint::addWith(const AnimatableValue
* value) const | 45 PassRefPtr<AnimatableValue> AnimatableLengthPoint3D::addWith(const AnimatableVal
ue* value) const |
45 { | 46 { |
46 const AnimatableLengthPoint* lengthPoint = toAnimatableLengthPoint(value); | 47 const AnimatableLengthPoint3D* lengthPoint = toAnimatableLengthPoint3D(value
); |
47 return AnimatableLengthPoint::create( | 48 return AnimatableLengthPoint3D::create( |
48 AnimatableValue::add(this->x(), lengthPoint->x()), | 49 AnimatableValue::add(this->x(), lengthPoint->x()), |
49 AnimatableValue::add(this->y(), lengthPoint->y())); | 50 AnimatableValue::add(this->y(), lengthPoint->y()), |
| 51 AnimatableValue::add(this->z(), lengthPoint->z())); |
50 } | 52 } |
51 | 53 |
52 bool AnimatableLengthPoint::equalTo(const AnimatableValue* value) const | 54 bool AnimatableLengthPoint3D::equalTo(const AnimatableValue* value) const |
53 { | 55 { |
54 const AnimatableLengthPoint* lengthPoint = toAnimatableLengthPoint(value); | 56 const AnimatableLengthPoint3D* lengthPoint = toAnimatableLengthPoint3D(value
); |
55 return x()->equals(lengthPoint->x()) && y()->equals(lengthPoint->y()); | 57 return x()->equals(lengthPoint->x()) && y()->equals(lengthPoint->y()) && z()
->equals(lengthPoint->z()); |
56 } | 58 } |
57 | 59 |
58 } | 60 } |
OLD | NEW |