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

Side by Side Diff: third_party/WebKit/Source/platform/animation/CompositorScrollOffsetAnimationCurve.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 // 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 #ifndef CompositorScrollOffsetAnimationCurve_h 5 #ifndef CompositorScrollOffsetAnimationCurve_h
6 #define CompositorScrollOffsetAnimationCurve_h 6 #define CompositorScrollOffsetAnimationCurve_h
7 7
8 #include "platform/PlatformExport.h" 8 #include "platform/PlatformExport.h"
9 #include "platform/animation/CompositorAnimationCurve.h" 9 #include "platform/animation/CompositorAnimationCurve.h"
10 #include "platform/geometry/FloatPoint.h" 10 #include "platform/geometry/FloatPoint.h"
11 #include "wtf/Noncopyable.h" 11 #include "wtf/Noncopyable.h"
12 #include "wtf/PassOwnPtr.h" 12 #include "wtf/PtrUtil.h"
13 #include <memory>
13 14
14 namespace cc { 15 namespace cc {
15 class ScrollOffsetAnimationCurve; 16 class ScrollOffsetAnimationCurve;
16 } 17 }
17 18
18 namespace blink { 19 namespace blink {
19 20
20 class PLATFORM_EXPORT CompositorScrollOffsetAnimationCurve : public CompositorAn imationCurve { 21 class PLATFORM_EXPORT CompositorScrollOffsetAnimationCurve : public CompositorAn imationCurve {
21 WTF_MAKE_NONCOPYABLE(CompositorScrollOffsetAnimationCurve); 22 WTF_MAKE_NONCOPYABLE(CompositorScrollOffsetAnimationCurve);
22 public: 23 public:
23 enum ScrollDurationBehavior { 24 enum ScrollDurationBehavior {
24 ScrollDurationDeltaBased = 0, 25 ScrollDurationDeltaBased = 0,
25 ScrollDurationConstant, 26 ScrollDurationConstant,
26 ScrollDurationInverseDelta 27 ScrollDurationInverseDelta
27 }; 28 };
28 29
29 static PassOwnPtr<CompositorScrollOffsetAnimationCurve> create(FloatPoint ta rgetValue, CompositorScrollOffsetAnimationCurve::ScrollDurationBehavior duration Behavior) 30 static std::unique_ptr<CompositorScrollOffsetAnimationCurve> create(FloatPoi nt targetValue, CompositorScrollOffsetAnimationCurve::ScrollDurationBehavior dur ationBehavior)
30 { 31 {
31 return adoptPtr(new CompositorScrollOffsetAnimationCurve(targetValue, du rationBehavior)); 32 return wrapUnique(new CompositorScrollOffsetAnimationCurve(targetValue, durationBehavior));
32 } 33 }
33 static PassOwnPtr<CompositorScrollOffsetAnimationCurve> create(cc::ScrollOff setAnimationCurve* curve) 34 static std::unique_ptr<CompositorScrollOffsetAnimationCurve> create(cc::Scro llOffsetAnimationCurve* curve)
34 { 35 {
35 return adoptPtr(new CompositorScrollOffsetAnimationCurve(curve)); 36 return wrapUnique(new CompositorScrollOffsetAnimationCurve(curve));
36 } 37 }
37 38
38 ~CompositorScrollOffsetAnimationCurve() override; 39 ~CompositorScrollOffsetAnimationCurve() override;
39 40
40 void setInitialValue(FloatPoint); 41 void setInitialValue(FloatPoint);
41 FloatPoint getValue(double time) const; 42 FloatPoint getValue(double time) const;
42 double duration() const; 43 double duration() const;
43 FloatPoint targetValue() const; 44 FloatPoint targetValue() const;
44 void applyAdjustment(IntSize); 45 void applyAdjustment(IntSize);
45 void updateTarget(double time, FloatPoint newTarget); 46 void updateTarget(double time, FloatPoint newTarget);
46 47
47 // CompositorAnimationCurve implementation. 48 // CompositorAnimationCurve implementation.
48 std::unique_ptr<cc::AnimationCurve> cloneToAnimationCurve() const override; 49 std::unique_ptr<cc::AnimationCurve> cloneToAnimationCurve() const override;
49 50
50 private: 51 private:
51 CompositorScrollOffsetAnimationCurve(FloatPoint, ScrollDurationBehavior); 52 CompositorScrollOffsetAnimationCurve(FloatPoint, ScrollDurationBehavior);
52 CompositorScrollOffsetAnimationCurve(cc::ScrollOffsetAnimationCurve*); 53 CompositorScrollOffsetAnimationCurve(cc::ScrollOffsetAnimationCurve*);
53 54
54 std::unique_ptr<cc::ScrollOffsetAnimationCurve> m_curve; 55 std::unique_ptr<cc::ScrollOffsetAnimationCurve> m_curve;
55 }; 56 };
56 57
57 } // namespace blink 58 } // namespace blink
58 59
59 #endif // CompositorScrollOffsetAnimationCurve_h 60 #endif // CompositorScrollOffsetAnimationCurve_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698