| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 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 "sky/engine/config.h" |
| 32 #include "core/animation/animatable/AnimatableLength.h" | 32 #include "sky/engine/core/animation/animatable/AnimatableLength.h" |
| 33 | 33 |
| 34 #include "platform/CalculationValue.h" | 34 #include "sky/engine/platform/CalculationValue.h" |
| 35 #include "platform/animation/AnimationUtilities.h" | 35 #include "sky/engine/platform/animation/AnimationUtilities.h" |
| 36 | 36 |
| 37 namespace blink { | 37 namespace blink { |
| 38 | 38 |
| 39 namespace { | 39 namespace { |
| 40 | 40 |
| 41 double clampNumber(double value, ValueRange range) | 41 double clampNumber(double value, ValueRange range) |
| 42 { | 42 { |
| 43 if (range == ValueRangeNonNegative) | 43 if (range == ValueRangeNonNegative) |
| 44 return std::max(value, 0.0); | 44 return std::max(value, 0.0); |
| 45 ASSERT(range == ValueRangeAll); | 45 ASSERT(range == ValueRangeAll); |
| (...skipping 27 matching lines...) Expand all Loading... |
| 73 m_hasPixels || length->m_hasPixels, m_hasPercent || length->m_hasPercent
); | 73 m_hasPixels || length->m_hasPixels, m_hasPercent || length->m_hasPercent
); |
| 74 } | 74 } |
| 75 | 75 |
| 76 bool AnimatableLength::equalTo(const AnimatableValue* value) const | 76 bool AnimatableLength::equalTo(const AnimatableValue* value) const |
| 77 { | 77 { |
| 78 const AnimatableLength* length = toAnimatableLength(value); | 78 const AnimatableLength* length = toAnimatableLength(value); |
| 79 return m_pixels == length->m_pixels && m_percent == length->m_percent && m_h
asPixels == length->m_hasPixels && m_hasPercent == length->m_hasPercent; | 79 return m_pixels == length->m_pixels && m_percent == length->m_percent && m_h
asPixels == length->m_hasPixels && m_hasPercent == length->m_hasPercent; |
| 80 } | 80 } |
| 81 | 81 |
| 82 } // namespace blink | 82 } // namespace blink |
| OLD | NEW |