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

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

Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final rebase Created 6 years, 10 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
« no previous file with comments | « Source/core/animation/DocumentTimelineTest.cpp ('k') | Source/core/animation/Player.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 allOffsetsEqual = false; 327 allOffsetsEqual = false;
328 break; 328 break;
329 } 329 }
330 } 330 }
331 if (!allOffsetsEqual) 331 if (!allOffsetsEqual)
332 return; 332 return;
333 333
334 if (!offset) 334 if (!offset)
335 appendKeyframe(m_keyframes.first()->cloneWithOffset(1.0)); 335 appendKeyframe(m_keyframes.first()->cloneWithOffset(1.0));
336 else 336 else
337 m_keyframes.insert(0, adoptPtr(new PropertySpecificKeyframe(0.0, 0, Anim atableValue::neutralValue(), CompositeAdd))); 337 m_keyframes.insert(0, adoptPtr(new PropertySpecificKeyframe(0.0, nullptr , AnimatableValue::neutralValue(), CompositeAdd)));
338 } 338 }
339 339
340 PassRefPtr<AnimationEffect::CompositableValue> KeyframeEffectModel::PropertySpec ificKeyframeGroup::sample(int iteration, double offset) const 340 PassRefPtr<AnimationEffect::CompositableValue> KeyframeEffectModel::PropertySpec ificKeyframeGroup::sample(int iteration, double offset) const
341 { 341 {
342 // FIXME: Implement accumulation. 342 // FIXME: Implement accumulation.
343 ASSERT_UNUSED(iteration, iteration >= 0); 343 ASSERT_UNUSED(iteration, iteration >= 0);
344 ASSERT(!isNull(offset)); 344 ASSERT(!isNull(offset));
345 345
346 // Bail if offset is null, as this can lead to buffer overflow below. 346 // Bail if offset is null, as this can lead to buffer overflow below.
347 if (isNull(offset)) 347 if (isNull(offset))
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 if ((*after)->offset() == offset) 383 if ((*after)->offset() == offset)
384 return const_cast<CompositableValue*>((*after)->value()); 384 return const_cast<CompositableValue*>((*after)->value());
385 385
386 double fraction = (offset - (*before)->offset()) / ((*after)->offset() - (*b efore)->offset()); 386 double fraction = (offset - (*before)->offset()) / ((*after)->offset() - (*b efore)->offset());
387 if (const TimingFunction* timingFunction = (*before)->easing()) 387 if (const TimingFunction* timingFunction = (*before)->easing())
388 fraction = timingFunction->evaluate(fraction, accuracyForKeyframeEasing) ; 388 fraction = timingFunction->evaluate(fraction, accuracyForKeyframeEasing) ;
389 return BlendedCompositableValue::create((*before)->value(), (*after)->value( ), fraction); 389 return BlendedCompositableValue::create((*before)->value(), (*after)->value( ), fraction);
390 } 390 }
391 391
392 } // namespace 392 } // namespace
OLDNEW
« no previous file with comments | « Source/core/animation/DocumentTimelineTest.cpp ('k') | Source/core/animation/Player.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698