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 18 matching lines...) Expand all Loading... |
29 */ | 29 */ |
30 | 30 |
31 #include "core/animation/animatable/AnimatableVisibility.h" | 31 #include "core/animation/animatable/AnimatableVisibility.h" |
32 | 32 |
33 namespace blink { | 33 namespace blink { |
34 | 34 |
35 bool AnimatableVisibility::usesDefaultInterpolationWith(const AnimatableValue* v
alue) const | 35 bool AnimatableVisibility::usesDefaultInterpolationWith(const AnimatableValue* v
alue) const |
36 { | 36 { |
37 EVisibility from = m_visibility; | 37 EVisibility from = m_visibility; |
38 EVisibility to = toAnimatableVisibility(value)->m_visibility; | 38 EVisibility to = toAnimatableVisibility(value)->m_visibility; |
39 return from != VISIBLE && to != VISIBLE; | 39 return from != EVisibility::Visible && to != EVisibility::Visible; |
40 } | 40 } |
41 | 41 |
42 PassRefPtr<AnimatableValue> AnimatableVisibility::interpolateTo(const Animatable
Value* value, double fraction) const | 42 PassRefPtr<AnimatableValue> AnimatableVisibility::interpolateTo(const Animatable
Value* value, double fraction) const |
43 { | 43 { |
44 EVisibility from = m_visibility; | 44 EVisibility from = m_visibility; |
45 EVisibility to = toAnimatableVisibility(value)->m_visibility; | 45 EVisibility to = toAnimatableVisibility(value)->m_visibility; |
46 if (from != VISIBLE && to != VISIBLE) | 46 if (from != EVisibility::Visible && to != EVisibility::Visible) |
47 return defaultInterpolateTo(this, value, fraction); | 47 return defaultInterpolateTo(this, value, fraction); |
48 if (fraction <= 0) | 48 if (fraction <= 0) |
49 return takeConstRef(this); | 49 return takeConstRef(this); |
50 if (fraction >= 1) | 50 if (fraction >= 1) |
51 return takeConstRef(value); | 51 return takeConstRef(value); |
52 return takeConstRef(from == VISIBLE ? this : value); | 52 return takeConstRef(from == EVisibility::Visible ? this : value); |
53 } | 53 } |
54 | 54 |
55 bool AnimatableVisibility::equalTo(const AnimatableValue* value) const | 55 bool AnimatableVisibility::equalTo(const AnimatableValue* value) const |
56 { | 56 { |
57 return m_visibility == toAnimatableVisibility(value)->m_visibility; | 57 return m_visibility == toAnimatableVisibility(value)->m_visibility; |
58 } | 58 } |
59 | 59 |
60 } // namespace blink | 60 } // namespace blink |
OLD | NEW |