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

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

Issue 1115553002: Removing blink::prefix (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 7 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 637 matching lines...) Expand 10 before | Expand all | Expand 10 after
648 648
649 if (!std::isnan(startTime)) 649 if (!std::isnan(startTime))
650 animation->setStartTime(startTime); 650 animation->setStartTime(startTime);
651 651
652 animation->setIterations(compositorTiming.adjustedIterationCount); 652 animation->setIterations(compositorTiming.adjustedIterationCount);
653 animation->setIterationStart(compositorTiming.iterationStart); 653 animation->setIterationStart(compositorTiming.iterationStart);
654 animation->setTimeOffset(compositorTiming.scaledTimeOffset); 654 animation->setTimeOffset(compositorTiming.scaledTimeOffset);
655 655
656 switch (compositorTiming.direction) { 656 switch (compositorTiming.direction) {
657 case Timing::PlaybackDirectionNormal: 657 case Timing::PlaybackDirectionNormal:
658 animation->setDirection(blink::WebCompositorAnimation::DirectionNorm al); 658 animation->setDirection(WebCompositorAnimation::DirectionNormal);
659 break; 659 break;
660 case Timing::PlaybackDirectionReverse: 660 case Timing::PlaybackDirectionReverse:
661 animation->setDirection(blink::WebCompositorAnimation::DirectionReve rse); 661 animation->setDirection(WebCompositorAnimation::DirectionReverse);
662 break; 662 break;
663 case Timing::PlaybackDirectionAlternate: 663 case Timing::PlaybackDirectionAlternate:
664 animation->setDirection(blink::WebCompositorAnimation::DirectionAlte rnate); 664 animation->setDirection(WebCompositorAnimation::DirectionAlternate);
665 break; 665 break;
666 case Timing::PlaybackDirectionAlternateReverse: 666 case Timing::PlaybackDirectionAlternateReverse:
667 animation->setDirection(blink::WebCompositorAnimation::DirectionAlte rnateReverse); 667 animation->setDirection(WebCompositorAnimation::DirectionAlternateRe verse);
668 break; 668 break;
669 default: 669 default:
670 ASSERT_NOT_REACHED(); 670 ASSERT_NOT_REACHED();
671 } 671 }
672 animation->setPlaybackRate(compositorTiming.playbackRate); 672 animation->setPlaybackRate(compositorTiming.playbackRate);
673 673
674 switch (compositorTiming.fillMode) { 674 switch (compositorTiming.fillMode) {
675 case Timing::FillModeNone: 675 case Timing::FillModeNone:
676 animation->setFillMode(blink::WebCompositorAnimation::FillModeNone); 676 animation->setFillMode(WebCompositorAnimation::FillModeNone);
677 break; 677 break;
678 case Timing::FillModeForwards: 678 case Timing::FillModeForwards:
679 animation->setFillMode(blink::WebCompositorAnimation::FillModeForwar ds); 679 animation->setFillMode(WebCompositorAnimation::FillModeForwards);
680 break; 680 break;
681 case Timing::FillModeBackwards: 681 case Timing::FillModeBackwards:
682 animation->setFillMode(blink::WebCompositorAnimation::FillModeBackwa rds); 682 animation->setFillMode(WebCompositorAnimation::FillModeBackwards);
683 break; 683 break;
684 case Timing::FillModeBoth: 684 case Timing::FillModeBoth:
685 animation->setFillMode(blink::WebCompositorAnimation::FillModeBoth); 685 animation->setFillMode(WebCompositorAnimation::FillModeBoth);
686 break; 686 break;
687 default: 687 default:
688 ASSERT_NOT_REACHED(); 688 ASSERT_NOT_REACHED();
689 } 689 }
690 animations.append(animation.release()); 690 animations.append(animation.release());
691 } 691 }
692 ASSERT(!animations.isEmpty()); 692 ASSERT(!animations.isEmpty());
693 } 693 }
694 694
695 } // namespace blink 695 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/animation/AnimationTimeline.cpp ('k') | Source/core/animation/CompositorAnimationsTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698