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

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

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 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 19 matching lines...) Expand all
30 30
31 #ifndef CompositorAnimations_h 31 #ifndef CompositorAnimations_h
32 #define CompositorAnimations_h 32 #define CompositorAnimations_h
33 33
34 #include "core/CoreExport.h" 34 #include "core/CoreExport.h"
35 #include "core/animation/EffectModel.h" 35 #include "core/animation/EffectModel.h"
36 #include "core/animation/Timing.h" 36 #include "core/animation/Timing.h"
37 #include "platform/animation/TimingFunction.h" 37 #include "platform/animation/TimingFunction.h"
38 #include "wtf/Allocator.h" 38 #include "wtf/Allocator.h"
39 #include "wtf/Vector.h" 39 #include "wtf/Vector.h"
40 #include <memory>
40 41
41 namespace blink { 42 namespace blink {
42 43
43 class Animation; 44 class Animation;
44 class CompositorAnimation; 45 class CompositorAnimation;
45 class Element; 46 class Element;
46 class FloatBox; 47 class FloatBox;
47 class KeyframeEffectModelBase; 48 class KeyframeEffectModelBase;
48 49
49 class CORE_EXPORT CompositorAnimations { 50 class CORE_EXPORT CompositorAnimations {
(...skipping 19 matching lines...) Expand all
69 double scaledDuration; 70 double scaledDuration;
70 double scaledTimeOffset; 71 double scaledTimeOffset;
71 double adjustedIterationCount; 72 double adjustedIterationCount;
72 double playbackRate; 73 double playbackRate;
73 Timing::FillMode fillMode; 74 Timing::FillMode fillMode;
74 double iterationStart; 75 double iterationStart;
75 }; 76 };
76 77
77 static bool convertTimingForCompositor(const Timing&, double timeOffset, Com positorTiming& out, double animationPlaybackRate); 78 static bool convertTimingForCompositor(const Timing&, double timeOffset, Com positorTiming& out, double animationPlaybackRate);
78 79
79 static void getAnimationOnCompositor(const Timing&, int group, double startT ime, double timeOffset, const KeyframeEffectModelBase&, Vector<OwnPtr<Compositor Animation>>& animations, double animationPlaybackRate); 80 static void getAnimationOnCompositor(const Timing&, int group, double startT ime, double timeOffset, const KeyframeEffectModelBase&, Vector<std::unique_ptr<C ompositorAnimation>>& animations, double animationPlaybackRate);
80 }; 81 };
81 82
82 } // namespace blink 83 } // namespace blink
83 84
84 #endif 85 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698