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

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

Issue 1550243002: Blink CompositorAnimations: Add more tests for integration with CC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@assert-if
Patch Set: Rebase. Mock abortAnimation methods. Created 4 years, 11 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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y 16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y
17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N 19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N
20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */ 23 */
24 24
25 #ifndef CompositorAnimationsTestHelper_h 25 #ifndef CompositorAnimationsTestHelper_h
26 #define CompositorAnimationsTestHelper_h 26 #define CompositorAnimationsTestHelper_h
27 27
28 #include "core/animation/AnimationTranslationUtilTest.h"
28 #include "core/animation/CompositorAnimations.h" 29 #include "core/animation/CompositorAnimations.h"
29 #include "platform/testing/TestingPlatformSupport.h" 30 #include "platform/testing/TestingPlatformSupport.h"
31 #include "platform/testing/WebLayerMock.h"
30 #include "public/platform/WebCompositorAnimationPlayer.h" 32 #include "public/platform/WebCompositorAnimationPlayer.h"
31 #include "public/platform/WebCompositorAnimationTimeline.h" 33 #include "public/platform/WebCompositorAnimationTimeline.h"
32 #include "public/platform/WebCompositorSupport.h" 34 #include "public/platform/WebCompositorSupport.h"
35 #include "public/platform/WebContentLayer.h"
33 #include "public/platform/WebFloatAnimationCurve.h" 36 #include "public/platform/WebFloatAnimationCurve.h"
34 #include "public/platform/WebFloatKeyframe.h" 37 #include "public/platform/WebFloatKeyframe.h"
35 #include "wtf/PassOwnPtr.h" 38 #include "wtf/PassOwnPtr.h"
36 39
37 #include <gmock/gmock.h> 40 #include <gmock/gmock.h>
38 #include <gtest/gtest.h> 41 #include <gtest/gtest.h>
39 42
40 // Test helpers and mocks for Web* types 43 // Test helpers and mocks for Web* types
41 // ----------------------------------------------------------------------- 44 // -----------------------------------------------------------------------
42 namespace blink { 45 namespace blink {
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 public: 128 public:
126 MOCK_METHOD1(setAnimationDelegate, void(WebCompositorAnimationDelegate*)); 129 MOCK_METHOD1(setAnimationDelegate, void(WebCompositorAnimationDelegate*));
127 130
128 MOCK_METHOD1(attachLayer, void(WebLayer*)); 131 MOCK_METHOD1(attachLayer, void(WebLayer*));
129 MOCK_METHOD0(detachLayer, void()); 132 MOCK_METHOD0(detachLayer, void());
130 MOCK_CONST_METHOD0(isLayerAttached, bool()); 133 MOCK_CONST_METHOD0(isLayerAttached, bool());
131 134
132 MOCK_METHOD1(addAnimation, void(WebCompositorAnimation*)); 135 MOCK_METHOD1(addAnimation, void(WebCompositorAnimation*));
133 MOCK_METHOD1(removeAnimation, void(int)); 136 MOCK_METHOD1(removeAnimation, void(int));
134 MOCK_METHOD2(pauseAnimation, void(int, double)); 137 MOCK_METHOD2(pauseAnimation, void(int, double));
138 MOCK_METHOD1(abortAnimation, void(int));
139 };
140
141 class WebContentLayerMock : public WebContentLayer {
142 public:
143 WebContentLayerMock()
144 : m_layer(adoptPtrWillBeNoop(new WebLayerMock))
145 {
146 }
147 virtual ~WebContentLayerMock() {}
148 WebLayer* layer() override
149 {
150 return m_layer.get();
151 }
152 OwnPtr<WebLayerMock> m_layer;
135 }; 153 };
136 154
137 } // namespace blink 155 } // namespace blink
138 156
139 namespace blink { 157 namespace blink {
140 158
141 class AnimationCompositorAnimationsTestBase : public ::testing::Test { 159 class AnimationCompositorAnimationsTestBase : public ::testing::Test {
142 public: 160 public:
143 AnimationCompositorAnimationsTestBase() : m_proxyPlatform(&m_mockCompositor) { } 161 AnimationCompositorAnimationsTestBase() : m_proxyPlatform(&m_mockCompositor) { }
144 162
145 class WebCompositorSupportMock : public WebCompositorSupport { 163 class WebCompositorSupportMock : public WebCompositorSupport {
146 public: 164 public:
147 MOCK_METHOD4(createAnimation, WebCompositorAnimation*(const WebComposito rAnimationCurve& curve, WebCompositorAnimation::TargetProperty target, int group Id, int animationId)); 165 MOCK_METHOD4(createAnimation, WebCompositorAnimation*(const WebComposito rAnimationCurve& curve, WebCompositorAnimation::TargetProperty target, int group Id, int animationId));
148 MOCK_METHOD0(createFloatAnimationCurve, WebFloatAnimationCurve*()); 166 MOCK_METHOD0(createFloatAnimationCurve, WebFloatAnimationCurve*());
149 167
150 MOCK_METHOD0(createAnimationPlayer, WebCompositorAnimationPlayer*()); 168 MOCK_METHOD0(createAnimationPlayer, WebCompositorAnimationPlayer*());
151 MOCK_METHOD0(createAnimationTimeline, WebCompositorAnimationTimeline*()) ; 169 MOCK_METHOD0(createAnimationTimeline, WebCompositorAnimationTimeline*()) ;
170
171 WebContentLayer* createContentLayer(WebContentLayerClient*) override
172 {
173 return new WebContentLayerMock();
174 }
175
176 WebFilterOperations* createFilterOperations() override
177 {
178 return new WebFilterOperationsMock();
179 }
152 }; 180 };
153 181
154 private: 182 private:
155 class PlatformProxy : public TestingPlatformSupport { 183 class PlatformProxy : public TestingPlatformSupport {
156 public: 184 public:
157 explicit PlatformProxy(WebCompositorSupportMock** compositor) : m_compos itor(compositor) { } 185 explicit PlatformProxy(WebCompositorSupportMock** compositor) : m_compos itor(compositor) { }
158 private: 186 private:
159 WebCompositorSupport* compositorSupport() override { return *m_composito r; } 187 WebCompositorSupport* compositorSupport() override { return *m_composito r; }
160 188
161 WebCompositorSupportMock** m_compositor; 189 WebCompositorSupportMock** m_compositor;
(...skipping 12 matching lines...) Expand all
174 void setCompositorForTesting(WebCompositorSupportMock& mock) 202 void setCompositorForTesting(WebCompositorSupportMock& mock)
175 { 203 {
176 ASSERT(!m_mockCompositor); 204 ASSERT(!m_mockCompositor);
177 m_mockCompositor = &mock; 205 m_mockCompositor = &mock;
178 } 206 }
179 }; 207 };
180 208
181 } 209 }
182 210
183 #endif 211 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698