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

Side by Side Diff: third_party/WebKit/Source/platform/graphics/CompositorFactory.cpp

Issue 1663963004: Blink Compositor Animation: Use PassOwnPtr in CompositorFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@curves
Patch Set: Created 4 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "platform/graphics/CompositorFactory.h" 5 #include "platform/graphics/CompositorFactory.h"
6 6
7 #include "platform/animation/CompositorAnimation.h" 7 #include "platform/animation/CompositorAnimation.h"
8 #include "platform/animation/CompositorAnimationPlayer.h" 8 #include "platform/animation/CompositorAnimationPlayer.h"
9 #include "platform/animation/CompositorAnimationTimeline.h" 9 #include "platform/animation/CompositorAnimationTimeline.h"
10 #include "platform/animation/CompositorFilterAnimationCurve.h" 10 #include "platform/animation/CompositorFilterAnimationCurve.h"
11 #include "platform/animation/CompositorFloatAnimationCurve.h" 11 #include "platform/animation/CompositorFloatAnimationCurve.h"
12 #include "platform/animation/CompositorTransformAnimationCurve.h" 12 #include "platform/animation/CompositorTransformAnimationCurve.h"
13 #include "platform/animation/CompositorTransformOperations.h" 13 #include "platform/animation/CompositorTransformOperations.h"
14 #include "platform/graphics/CompositorFilterOperations.h" 14 #include "platform/graphics/CompositorFilterOperations.h"
15 15
16 namespace blink { 16 namespace blink {
17 17
18 class CompositorFactoryImpl : public CompositorFactory { 18 class CompositorFactoryImpl : public CompositorFactory {
19 public: 19 public:
20 CompositorFilterAnimationCurve* createFilterAnimationCurve() override 20 PassOwnPtr<CompositorFilterAnimationCurve> createFilterAnimationCurve() over ride
21 { 21 {
22 return new CompositorFilterAnimationCurve(); 22 return adoptPtr(new CompositorFilterAnimationCurve());
23 } 23 }
24 24
25 CompositorFloatAnimationCurve* createFloatAnimationCurve() override 25 PassOwnPtr<CompositorFloatAnimationCurve> createFloatAnimationCurve() overri de
26 { 26 {
27 return new CompositorFloatAnimationCurve(); 27 return adoptPtr(new CompositorFloatAnimationCurve());
28 } 28 }
29 29
30 CompositorScrollOffsetAnimationCurve* createScrollOffsetAnimationCurve( 30 PassOwnPtr<CompositorScrollOffsetAnimationCurve> createScrollOffsetAnimation Curve(
31 FloatPoint targetValue, 31 FloatPoint targetValue,
32 CompositorAnimationCurve::TimingFunctionType timingFunctionType, 32 CompositorAnimationCurve::TimingFunctionType timingFunctionType,
33 CompositorScrollOffsetAnimationCurve::ScrollDurationBehavior durationBeh avior) 33 CompositorScrollOffsetAnimationCurve::ScrollDurationBehavior durationBeh avior)
34 { 34 {
35 return new CompositorScrollOffsetAnimationCurve(targetValue, timingFunct ionType, 35 return adoptPtr(new CompositorScrollOffsetAnimationCurve(targetValue, ti mingFunctionType,
36 durationBehavior); 36 durationBehavior));
37 } 37 }
38 38
39 CompositorTransformAnimationCurve* createTransformAnimationCurve() override 39 PassOwnPtr<CompositorTransformAnimationCurve> createTransformAnimationCurve( ) override
40 { 40 {
41 return new CompositorTransformAnimationCurve(); 41 return adoptPtr(new CompositorTransformAnimationCurve());
42 } 42 }
43 43
44 CompositorTransformOperations* createTransformOperations() override 44 PassOwnPtr<CompositorTransformOperations> createTransformOperations() overri de
45 { 45 {
46 return new CompositorTransformOperations(); 46 return adoptPtr(new CompositorTransformOperations());
47 } 47 }
48 48
49 CompositorFilterOperations* createFilterOperations() override 49 PassOwnPtr<CompositorFilterOperations> createFilterOperations() override
50 { 50 {
51 return new CompositorFilterOperations(); 51 return adoptPtr(new CompositorFilterOperations());
52 } 52 }
53 53
54 CompositorAnimation* createAnimation(const blink::CompositorAnimationCurve& curve, blink::CompositorAnimation::TargetProperty target, int groupId, int anima tionId) override 54 PassOwnPtr<CompositorAnimation> createAnimation(const blink::CompositorAnima tionCurve& curve, blink::CompositorAnimation::TargetProperty target, int groupId , int animationId) override
55 { 55 {
56 return new CompositorAnimation(curve, target, animationId, groupId); 56 return adoptPtr(new CompositorAnimation(curve, target, animationId, grou pId));
57 } 57 }
58 58
59 CompositorAnimationPlayer* createAnimationPlayer() 59 PassOwnPtr<CompositorAnimationPlayer> createAnimationPlayer()
60 { 60 {
61 return new CompositorAnimationPlayer(); 61 return adoptPtr(new CompositorAnimationPlayer());
62 } 62 }
63 63
64 CompositorAnimationTimeline* createAnimationTimeline() 64 PassOwnPtr<CompositorAnimationTimeline> createAnimationTimeline()
65 { 65 {
66 return new CompositorAnimationTimeline(); 66 return adoptPtr(new CompositorAnimationTimeline());
67 } 67 }
68 }; 68 };
69 69
70 static CompositorFactory* s_factory = 0; 70 static CompositorFactory* s_factory = 0;
71 71
72 CompositorFactory::~CompositorFactory() { }
73
72 void CompositorFactory::initializeDefault() 74 void CompositorFactory::initializeDefault()
73 { 75 {
74 delete s_factory; 76 delete s_factory;
75 s_factory = new CompositorFactoryImpl(); 77 s_factory = new CompositorFactoryImpl();
76 } 78 }
77 79
78 void CompositorFactory::initializeForTesting(PassOwnPtr<CompositorFactory> facto ry) 80 void CompositorFactory::initializeForTesting(PassOwnPtr<CompositorFactory> facto ry)
79 { 81 {
80 delete s_factory; 82 delete s_factory;
81 s_factory = factory.leakPtr(); 83 s_factory = factory.leakPtr();
82 } 84 }
83 85
84 void CompositorFactory::shutdown() 86 void CompositorFactory::shutdown()
85 { 87 {
86 delete s_factory; 88 delete s_factory;
87 s_factory = nullptr; 89 s_factory = nullptr;
88 } 90 }
89 91
90 CompositorFactory& CompositorFactory::current() 92 CompositorFactory& CompositorFactory::current()
91 { 93 {
92 ASSERT(s_factory); 94 ASSERT(s_factory);
93 return *s_factory; 95 return *s_factory;
94 } 96 }
95 97
98 PassOwnPtr<CompositorFilterAnimationCurve> CompositorFactory::createFilterAnimat ionCurve() { return nullptr; }
99
100 PassOwnPtr<CompositorFloatAnimationCurve> CompositorFactory::createFloatAnimatio nCurve() { return nullptr; }
101
102 PassOwnPtr<CompositorScrollOffsetAnimationCurve> CompositorFactory::createScroll OffsetAnimationCurve(
103 FloatPoint targetValue,
104 CompositorAnimationCurve::TimingFunctionType,
105 CompositorScrollOffsetAnimationCurve::ScrollDurationBehavior) { return nullp tr; }
106
107 PassOwnPtr<CompositorTransformAnimationCurve> CompositorFactory::createTransform AnimationCurve() { return nullptr; }
108
109 PassOwnPtr<CompositorTransformOperations> CompositorFactory::createTransformOper ations() { return nullptr; }
110
111 PassOwnPtr<CompositorFilterOperations> CompositorFactory::createFilterOperations () { return nullptr; }
112
113 PassOwnPtr<CompositorAnimation> CompositorFactory::createAnimation(const Composi torAnimationCurve&, CompositorAnimation::TargetProperty, int groupId, int animat ionId) { return nullptr; }
114
115 PassOwnPtr<CompositorAnimationPlayer> CompositorFactory::createAnimationPlayer() { return nullptr; }
116
117 PassOwnPtr<CompositorAnimationTimeline> CompositorFactory::createAnimationTimeli ne() { return nullptr; }
118
96 } // namespace blink 119 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698