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

Side by Side Diff: Source/core/animation/StringKeyframe.cpp

Issue 225303011: Oilpan: fix build after r170943 (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased Created 6 years, 8 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
« no previous file with comments | « Source/core/animation/StringKeyframe.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/animation/StringKeyframe.h" 6 #include "core/animation/StringKeyframe.h"
7 7
8 #include "core/animation/Interpolation.h" 8 #include "core/animation/Interpolation.h"
9 #include "core/animation/css/CSSAnimations.h" 9 #include "core/animation/css/CSSAnimations.h"
10 #include "core/css/resolver/StyleResolver.h" 10 #include "core/css/resolver/StyleResolver.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 { 42 {
43 return adoptRefWillBeNoop(new StringKeyframe(*this)); 43 return adoptRefWillBeNoop(new StringKeyframe(*this));
44 } 44 }
45 PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::creat ePropertySpecificKeyframe(CSSPropertyID property) const 45 PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::creat ePropertySpecificKeyframe(CSSPropertyID property) const
46 { 46 {
47 return adoptPtrWillBeNoop(new PropertySpecificKeyframe(offset(), easing(), p ropertyValue(property), composite())); 47 return adoptPtrWillBeNoop(new PropertySpecificKeyframe(offset(), easing(), p ropertyValue(property), composite()));
48 } 48 }
49 49
50 void StringKeyframe::trace(Visitor* visitor) 50 void StringKeyframe::trace(Visitor* visitor)
51 { 51 {
52 visitor->trace(m_propertySet);
52 Keyframe::trace(visitor); 53 Keyframe::trace(visitor);
53 } 54 }
54 55
55 StringKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(double offset , PassRefPtr<TimingFunction> easing, CSSValue* value, AnimationEffect::Composite Operation op) 56 StringKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(double offset , PassRefPtr<TimingFunction> easing, CSSValue* value, AnimationEffect::Composite Operation op)
56 : Keyframe::PropertySpecificKeyframe(offset, easing, op) 57 : Keyframe::PropertySpecificKeyframe(offset, easing, op)
57 , m_value(value) 58 , m_value(value)
58 { } 59 { }
59 60
60 StringKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(double offset , PassRefPtr<TimingFunction> easing, CSSValue* value) 61 StringKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(double offset , PassRefPtr<TimingFunction> easing, CSSValue* value)
61 : Keyframe::PropertySpecificKeyframe(offset, easing, AnimationEffect::Compos iteReplace) 62 : Keyframe::PropertySpecificKeyframe(offset, easing, AnimationEffect::Compos iteReplace)
(...skipping 24 matching lines...) Expand all
86 Keyframe::PropertySpecificKeyframe *theClone = new PropertySpecificKeyframe( offset, m_easing, m_value.get()); 87 Keyframe::PropertySpecificKeyframe *theClone = new PropertySpecificKeyframe( offset, m_easing, m_value.get());
87 return adoptPtrWillBeNoop(theClone); 88 return adoptPtrWillBeNoop(theClone);
88 } 89 }
89 90
90 void StringKeyframe::PropertySpecificKeyframe::trace(Visitor* visitor) 91 void StringKeyframe::PropertySpecificKeyframe::trace(Visitor* visitor)
91 { 92 {
92 visitor->trace(m_value); 93 visitor->trace(m_value);
93 } 94 }
94 95
95 } 96 }
OLDNEW
« no previous file with comments | « Source/core/animation/StringKeyframe.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698