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

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

Issue 630993005: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/animation (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Added cpp to list Created 6 years, 2 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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 }; 133 };
134 134
135 private: 135 private:
136 class PlatformProxy : public Platform { 136 class PlatformProxy : public Platform {
137 public: 137 public:
138 PlatformProxy(WebCompositorSupportMock** compositor) : m_compositor(comp ositor) { } 138 PlatformProxy(WebCompositorSupportMock** compositor) : m_compositor(comp ositor) { }
139 139
140 virtual void cryptographicallyRandomValues(unsigned char* buffer, size_t length) { ASSERT_NOT_REACHED(); } 140 virtual void cryptographicallyRandomValues(unsigned char* buffer, size_t length) { ASSERT_NOT_REACHED(); }
141 private: 141 private:
142 WebCompositorSupportMock** m_compositor; 142 WebCompositorSupportMock** m_compositor;
143 virtual WebCompositorSupport* compositorSupport() OVERRIDE { return *m_c ompositor; } 143 virtual WebCompositorSupport* compositorSupport() override { return *m_c ompositor; }
144 }; 144 };
145 145
146 WebCompositorSupportMock* m_mockCompositor; 146 WebCompositorSupportMock* m_mockCompositor;
147 PlatformProxy m_proxyPlatform; 147 PlatformProxy m_proxyPlatform;
148 148
149 protected: 149 protected:
150 Platform* m_platform; 150 Platform* m_platform;
151 151
152 virtual void SetUp() 152 virtual void SetUp()
153 { 153 {
(...skipping 10 matching lines...) Expand all
164 void setCompositorForTesting(WebCompositorSupportMock& mock) 164 void setCompositorForTesting(WebCompositorSupportMock& mock)
165 { 165 {
166 ASSERT(!m_mockCompositor); 166 ASSERT(!m_mockCompositor);
167 m_mockCompositor = &mock; 167 m_mockCompositor = &mock;
168 } 168 }
169 }; 169 };
170 170
171 } 171 }
172 172
173 #endif 173 #endif
OLDNEW
« no previous file with comments | « Source/core/animation/AnimationTimeline.h ('k') | Source/core/animation/CompositorPendingAnimations.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698