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

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

Issue 1746283002: Rename enums/functions that collide in chromium style in platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: get-names-13-platform: . Created 4 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 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 default: 512 default:
513 ASSERT_NOT_REACHED(); 513 ASSERT_NOT_REACHED();
514 } 514 }
515 } 515 }
516 516
517 void getStepsTimingFunctionParameters(const TimingFunction& timingFunction, int& outSteps, float& outStepsStartOffset) 517 void getStepsTimingFunctionParameters(const TimingFunction& timingFunction, int& outSteps, float& outStepsStartOffset)
518 { 518 {
519 const StepsTimingFunction& steps = toStepsTimingFunction(timingFunction); 519 const StepsTimingFunction& steps = toStepsTimingFunction(timingFunction);
520 520
521 outSteps = steps.numberOfSteps(); 521 outSteps = steps.numberOfSteps();
522 switch (steps.stepAtPosition()) { 522 switch (steps.getStepAtPosition()) {
523 case StepsTimingFunction::Start: 523 case StepsTimingFunction::Start:
524 outStepsStartOffset = 1; 524 outStepsStartOffset = 1;
525 break; 525 break;
526 case StepsTimingFunction::Middle: 526 case StepsTimingFunction::Middle:
527 outStepsStartOffset = 0.5; 527 outStepsStartOffset = 0.5;
528 break; 528 break;
529 case StepsTimingFunction::End: 529 case StepsTimingFunction::End:
530 outStepsStartOffset = 0; 530 outStepsStartOffset = 0;
531 break; 531 break;
532 default: 532 default:
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
758 break; 758 break;
759 default: 759 default:
760 ASSERT_NOT_REACHED(); 760 ASSERT_NOT_REACHED();
761 } 761 }
762 animations.append(animation.release()); 762 animations.append(animation.release());
763 } 763 }
764 ASSERT(!animations.isEmpty()); 764 ASSERT(!animations.isEmpty());
765 } 765 }
766 766
767 } // namespace blink 767 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698