Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(338)

Side by Side Diff: Source/core/animation/animatable/AnimatableVisibility.cpp

Issue 1276183004: Oilpan: Unship oilpan from temporary animation objects (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 22 matching lines...) Expand all
33 33
34 namespace blink { 34 namespace blink {
35 35
36 bool AnimatableVisibility::usesDefaultInterpolationWith(const AnimatableValue* v alue) const 36 bool AnimatableVisibility::usesDefaultInterpolationWith(const AnimatableValue* v alue) const
37 { 37 {
38 EVisibility from = m_visibility; 38 EVisibility from = m_visibility;
39 EVisibility to = toAnimatableVisibility(value)->m_visibility; 39 EVisibility to = toAnimatableVisibility(value)->m_visibility;
40 return from != VISIBLE && to != VISIBLE; 40 return from != VISIBLE && to != VISIBLE;
41 } 41 }
42 42
43 PassRefPtrWillBeRawPtr<AnimatableValue> AnimatableVisibility::interpolateTo(cons t AnimatableValue* value, double fraction) const 43 PassRefPtr<AnimatableValue> AnimatableVisibility::interpolateTo(const Animatable Value* value, double fraction) const
44 { 44 {
45 EVisibility from = m_visibility; 45 EVisibility from = m_visibility;
46 EVisibility to = toAnimatableVisibility(value)->m_visibility; 46 EVisibility to = toAnimatableVisibility(value)->m_visibility;
47 if (from != VISIBLE && to != VISIBLE) 47 if (from != VISIBLE && to != VISIBLE)
48 return defaultInterpolateTo(this, value, fraction); 48 return defaultInterpolateTo(this, value, fraction);
49 if (fraction <= 0) 49 if (fraction <= 0)
50 return takeConstRef(this); 50 return takeConstRef(this);
51 if (fraction >= 1) 51 if (fraction >= 1)
52 return takeConstRef(value); 52 return takeConstRef(value);
53 return takeConstRef(from == VISIBLE ? this : value); 53 return takeConstRef(from == VISIBLE ? this : value);
54 } 54 }
55 55
56 bool AnimatableVisibility::equalTo(const AnimatableValue* value) const 56 bool AnimatableVisibility::equalTo(const AnimatableValue* value) const
57 { 57 {
58 return m_visibility == toAnimatableVisibility(value)->m_visibility; 58 return m_visibility == toAnimatableVisibility(value)->m_visibility;
59 } 59 }
60 60
61 } // namespace blink 61 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698