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

Side by Side Diff: src/animator/SkDraw3D.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/SkDisplayTypes.h ('k') | src/animator/SkDrawBitmap.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 SkDraw3D_DEFINED 10 #ifndef SkDraw3D_DEFINED
11 #define SkDraw3D_DEFINED 11 #define SkDraw3D_DEFINED
12 12
13 #include "SkCamera.h" 13 #include "SkCamera.h"
14 #include "SkADrawable.h" 14 #include "SkADrawable.h"
15 #include "SkMemberInfo.h" 15 #include "SkMemberInfo.h"
16 16
17 class Sk3D_Patch; 17 class Sk3D_Patch;
18 18
19 struct Sk3D_Point { 19 struct Sk3D_Point {
20 DECLARE_NO_VIRTUALS_MEMBER_INFO(3D_Point); 20 DECLARE_NO_VIRTUALS_MEMBER_INFO(3D_Point);
21 Sk3D_Point(); 21 Sk3D_Point();
22 private: 22 private:
23 SkPoint3D fPoint; 23 SkPoint3D fPoint;
24 }; 24 };
25 25
26 class Sk3D_Camera : public SkADrawable { 26 class Sk3D_Camera : public SkADrawable {
27 DECLARE_MEMBER_INFO(3D_Camera); 27 DECLARE_MEMBER_INFO(3D_Camera);
28 Sk3D_Camera(); 28 Sk3D_Camera();
29 virtual ~Sk3D_Camera(); 29 virtual ~Sk3D_Camera();
30 bool draw(SkAnimateMaker& ) SK_OVERRIDE; 30 bool draw(SkAnimateMaker& ) override;
31 private: 31 private:
32 SkScalar hackWidth; 32 SkScalar hackWidth;
33 SkScalar hackHeight; 33 SkScalar hackHeight;
34 SkCamera3D fCamera; 34 SkCamera3D fCamera;
35 Sk3D_Patch* patch; 35 Sk3D_Patch* patch;
36 }; 36 };
37 37
38 class Sk3D_Patch : public SkDisplayable { 38 class Sk3D_Patch : public SkDisplayable {
39 DECLARE_MEMBER_INFO(3D_Patch); 39 DECLARE_MEMBER_INFO(3D_Patch);
40 private: 40 private:
41 virtual void executeFunction(SkDisplayable* , int index, 41 virtual void executeFunction(SkDisplayable* , int index,
42 SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type, 42 SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type,
43 SkScriptValue* ) SK_OVERRIDE; 43 SkScriptValue* ) override;
44 const SkFunctionParamType* getFunctionsParameters() SK_OVERRIDE; 44 const SkFunctionParamType* getFunctionsParameters() override;
45 SkPatch3D fPatch; 45 SkPatch3D fPatch;
46 static const SkFunctionParamType fFunctionParameters[]; 46 static const SkFunctionParamType fFunctionParameters[];
47 friend class Sk3D_Camera; 47 friend class Sk3D_Camera;
48 }; 48 };
49 49
50 #endif // SkDraw3D_DEFINED 50 #endif // SkDraw3D_DEFINED
OLDNEW
« no previous file with comments | « src/animator/SkDisplayTypes.h ('k') | src/animator/SkDrawBitmap.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698