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

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

Issue 984153002: Fix template angle bracket syntax in animation (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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
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 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 WebTransformAnimationCurve* transformCurve = static_cast<WebTransfor mAnimationCurve*>(&curve); 525 WebTransformAnimationCurve* transformCurve = static_cast<WebTransfor mAnimationCurve*>(&curve);
526 addKeyframeWithTimingFunction(*transformCurve, transformKeyframe, ke yframeTimingFunction); 526 addKeyframeWithTimingFunction(*transformCurve, transformKeyframe, ke yframeTimingFunction);
527 break; 527 break;
528 } 528 }
529 default: 529 default:
530 ASSERT_NOT_REACHED(); 530 ASSERT_NOT_REACHED();
531 } 531 }
532 } 532 }
533 } 533 }
534 534
535 void CompositorAnimationsImpl::getAnimationOnCompositor(const Timing& timing, in t group, double startTime, double timeOffset, const KeyframeEffectModelBase& eff ect, Vector<OwnPtr<WebCompositorAnimation> >& animations, double playerPlaybackR ate) 535 void CompositorAnimationsImpl::getAnimationOnCompositor(const Timing& timing, in t group, double startTime, double timeOffset, const KeyframeEffectModelBase& eff ect, Vector<OwnPtr<WebCompositorAnimation>>& animations, double playerPlaybackRa te)
536 { 536 {
537 ASSERT(animations.isEmpty()); 537 ASSERT(animations.isEmpty());
538 CompositorTiming compositorTiming; 538 CompositorTiming compositorTiming;
539 bool timingValid = convertTimingForCompositor(timing, timeOffset, compositor Timing, playerPlaybackRate); 539 bool timingValid = convertTimingForCompositor(timing, timeOffset, compositor Timing, playerPlaybackRate);
540 ASSERT_UNUSED(timingValid, timingValid); 540 ASSERT_UNUSED(timingValid, timingValid);
541 541
542 PropertySet properties = effect.properties(); 542 PropertySet properties = effect.properties();
543 ASSERT(!properties.isEmpty()); 543 ASSERT(!properties.isEmpty());
544 for (const auto& property : properties) { 544 for (const auto& property : properties) {
545 PropertySpecificKeyframeVector values; 545 PropertySpecificKeyframeVector values;
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 break; 621 break;
622 default: 622 default:
623 ASSERT_NOT_REACHED(); 623 ASSERT_NOT_REACHED();
624 } 624 }
625 animations.append(animation.release()); 625 animations.append(animation.release());
626 } 626 }
627 ASSERT(!animations.isEmpty()); 627 ASSERT(!animations.isEmpty());
628 } 628 }
629 629
630 } // namespace blink 630 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/animation/AnimationStackTest.cpp ('k') | Source/core/animation/CompositorAnimationsImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698