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

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

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 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 }; 123 };
124 124
125 } // namespace blink 125 } // namespace blink
126 126
127 namespace blink { 127 namespace blink {
128 128
129 class AnimationCompositorAnimationsTestBase : public ::testing::Test { 129 class AnimationCompositorAnimationsTestBase : public ::testing::Test {
130 public: 130 public:
131 class CompositorFactoryMock : public CompositorFactory { 131 class CompositorFactoryMock : public CompositorFactory {
132 public: 132 public:
133 MOCK_METHOD4(createAnimation, CompositorAnimation*(const CompositorAnima tionCurve& curve, CompositorAnimation::TargetProperty target, int groupId, int a nimationId)); 133 MOCK_METHOD4(createAnimation, PassOwnPtr<CompositorAnimation>(const Comp ositorAnimationCurve& curve, CompositorAnimation::TargetProperty target, int gro upId, int animationId));
134 MOCK_METHOD0(createFloatAnimationCurve, CompositorFloatAnimationCurve*() ); 134 MOCK_METHOD0(createFloatAnimationCurve, PassOwnPtr<CompositorFloatAnimat ionCurve>());
135 MOCK_METHOD0(createAnimationPlayer, CompositorAnimationPlayer*()); 135 MOCK_METHOD0(createAnimationPlayer, PassOwnPtr<CompositorAnimationPlayer >());
136 MOCK_METHOD0(createAnimationTimeline, CompositorAnimationTimeline*()); 136 MOCK_METHOD0(createAnimationTimeline, PassOwnPtr<CompositorAnimationTime line>());
137 }; 137 };
138 138
139 private: 139 private:
140 TestingPlatformSupport m_proxyPlatform; 140 TestingPlatformSupport m_proxyPlatform;
141 141
142 protected: 142 protected:
143 void SetUp() override 143 void SetUp() override
144 { 144 {
145 Platform::initialize(&m_proxyPlatform); 145 Platform::initialize(&m_proxyPlatform);
146 } 146 }
147 }; 147 };
148 148
149 } // namespace blink 149 } // namespace blink
150 150
151 #endif 151 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698