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

Side by Side Diff: src/animator/SkDisplayMath.h

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 years, 9 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
« no previous file with comments | « src/animator/SkDisplayInput.h ('k') | src/animator/SkDisplayMovie.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2006 The Android Open Source Project 3 * Copyright 2006 The Android Open Source Project
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #ifndef SkDisplayMath_DEFINED 10 #ifndef SkDisplayMath_DEFINED
11 #define SkDisplayMath_DEFINED 11 #define SkDisplayMath_DEFINED
12 12
13 #include "SkDisplayable.h" 13 #include "SkDisplayable.h"
14 #include "SkMemberInfo.h" 14 #include "SkMemberInfo.h"
15 #include "SkRandom.h" 15 #include "SkRandom.h"
16 16
17 class SkDisplayMath : public SkDisplayable { 17 class SkDisplayMath : public SkDisplayable {
18 DECLARE_DISPLAY_MEMBER_INFO(Math); 18 DECLARE_DISPLAY_MEMBER_INFO(Math);
19 virtual void executeFunction(SkDisplayable* , int index, 19 virtual void executeFunction(SkDisplayable* , int index,
20 SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type, 20 SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type,
21 SkScriptValue* ) SK_OVERRIDE; 21 SkScriptValue* ) override;
22 const SkFunctionParamType* getFunctionsParameters() SK_OVERRIDE; 22 const SkFunctionParamType* getFunctionsParameters() override;
23 bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; 23 bool getProperty(int index, SkScriptValue* value) const override;
24 private: 24 private:
25 mutable SkRandom fRandom; 25 mutable SkRandom fRandom;
26 static const SkScalar gConstants[]; 26 static const SkScalar gConstants[];
27 static const SkFunctionParamType fFunctionParameters[]; 27 static const SkFunctionParamType fFunctionParameters[];
28 28
29 }; 29 };
30 30
31 #endif // SkDisplayMath_DEFINED 31 #endif // SkDisplayMath_DEFINED
OLDNEW
« no previous file with comments | « src/animator/SkDisplayInput.h ('k') | src/animator/SkDisplayMovie.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698