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

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

Issue 881183003: Animation: Cancel same-property animations on compositor (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Major fix. Created 5 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 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 MOCK_METHOD4(createAnimation, WebCompositorAnimation*(const WebComposito rAnimationCurve& curve, WebCompositorAnimation::TargetProperty target, int group Id, int animationId)); 138 MOCK_METHOD4(createAnimation, WebCompositorAnimation*(const WebComposito rAnimationCurve& curve, WebCompositorAnimation::TargetProperty target, int group Id, int animationId));
139 MOCK_METHOD0(createFloatAnimationCurve, WebFloatAnimationCurve*()); 139 MOCK_METHOD0(createFloatAnimationCurve, WebFloatAnimationCurve*());
140 }; 140 };
141 141
142 private: 142 private:
143 class PlatformProxy : public Platform { 143 class PlatformProxy : public Platform {
144 public: 144 public:
145 PlatformProxy(WebCompositorSupportMock** compositor) : m_compositor(comp ositor) { } 145 PlatformProxy(WebCompositorSupportMock** compositor) : m_compositor(comp ositor) { }
146 146
147 virtual void cryptographicallyRandomValues(unsigned char* buffer, size_t length) { ASSERT_NOT_REACHED(); } 147 virtual void cryptographicallyRandomValues(unsigned char* buffer, size_t length) { ASSERT_NOT_REACHED(); }
148 const unsigned char* getTraceCategoryEnabledFlag(const char* categoryNam e) override
dstockwell 2015/01/30 02:39:23 This seems unrelated?
loyso (OOO) 2015/01/30 02:53:11 Trace macroses just crash with our previous Platfo
149 {
150 static const unsigned char tracingIsDisabled = 0;
151 return &tracingIsDisabled;
152 }
153
148 private: 154 private:
149 WebCompositorSupportMock** m_compositor; 155 WebCompositorSupportMock** m_compositor;
150 virtual WebCompositorSupport* compositorSupport() override { return *m_c ompositor; } 156 virtual WebCompositorSupport* compositorSupport() override { return *m_c ompositor; }
151 }; 157 };
152 158
153 WebCompositorSupportMock* m_mockCompositor; 159 WebCompositorSupportMock* m_mockCompositor;
154 PlatformProxy m_proxyPlatform; 160 PlatformProxy m_proxyPlatform;
155 161
156 protected: 162 protected:
157 Platform* m_platform; 163 Platform* m_platform;
(...skipping 13 matching lines...) Expand all
171 void setCompositorForTesting(WebCompositorSupportMock& mock) 177 void setCompositorForTesting(WebCompositorSupportMock& mock)
172 { 178 {
173 ASSERT(!m_mockCompositor); 179 ASSERT(!m_mockCompositor);
174 m_mockCompositor = &mock; 180 m_mockCompositor = &mock;
175 } 181 }
176 }; 182 };
177 183
178 } 184 }
179 185
180 #endif 186 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698