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

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

Issue 204743002: Oilpan: Move AnimatableValue's hierarchy to oilpan's heap (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 } 244 }
245 245
246 KeyframeEffectModel::PropertySpecificKeyframe::PropertySpecificKeyframe(double o ffset, PassRefPtr<TimingFunction> easing, const AnimatableValue* value, Composit eOperation composite) 246 KeyframeEffectModel::PropertySpecificKeyframe::PropertySpecificKeyframe(double o ffset, PassRefPtr<TimingFunction> easing, const AnimatableValue* value, Composit eOperation composite)
247 : m_offset(offset) 247 : m_offset(offset)
248 , m_easing(easing) 248 , m_easing(easing)
249 { 249 {
250 ASSERT(composite == AnimationEffect::CompositeReplace); 250 ASSERT(composite == AnimationEffect::CompositeReplace);
251 m_value = AnimatableValue::takeConstRef(value); 251 m_value = AnimatableValue::takeConstRef(value);
252 } 252 }
253 253
254 KeyframeEffectModel::PropertySpecificKeyframe::PropertySpecificKeyframe(double o ffset, PassRefPtr<TimingFunction> easing, PassRefPtr<AnimatableValue> value) 254 KeyframeEffectModel::PropertySpecificKeyframe::PropertySpecificKeyframe(double o ffset, PassRefPtr<TimingFunction> easing, PassRefPtrWillBeRawPtr<AnimatableValue > value)
255 : m_offset(offset) 255 : m_offset(offset)
256 , m_easing(easing) 256 , m_easing(easing)
257 , m_value(value) 257 , m_value(value)
258 { 258 {
259 ASSERT(!isNull(m_offset)); 259 ASSERT(!isNull(m_offset));
260 } 260 }
261 261
262 PassOwnPtr<KeyframeEffectModel::PropertySpecificKeyframe> KeyframeEffectModel::P ropertySpecificKeyframe::cloneWithOffset(double offset) const 262 PassOwnPtr<KeyframeEffectModel::PropertySpecificKeyframe> KeyframeEffectModel::P ropertySpecificKeyframe::cloneWithOffset(double offset) const
263 { 263 {
264 return adoptPtr(new PropertySpecificKeyframe(offset, m_easing, m_value)); 264 return adoptPtr(new PropertySpecificKeyframe(offset, m_easing, m_value));
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 else 309 else
310 m_keyframes.insert(0, adoptPtr(new PropertySpecificKeyframe(0.0, nullptr , AnimatableValue::neutralValue(), CompositeAdd))); 310 m_keyframes.insert(0, adoptPtr(new PropertySpecificKeyframe(0.0, nullptr , AnimatableValue::neutralValue(), CompositeAdd)));
311 } 311 }
312 312
313 void KeyframeEffectModel::trace(Visitor* visitor) 313 void KeyframeEffectModel::trace(Visitor* visitor)
314 { 314 {
315 visitor->trace(m_keyframes); 315 visitor->trace(m_keyframes);
316 } 316 }
317 317
318 } // namespace 318 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698