src/animator/SkDisplayTypes.h - Issue 1110013002: Update more directories under src/ to follow C++11 style rule for {virtual,override}.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1110013002: Update more directories under src/ to follow C++11 style rule for {virtual,override}. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 5 years, 7 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/SkDisplayMath.h ('k') | src/animator/SkDraw3D.h » ('j') | no next file with comments »

OLD	NEW
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 SkDisplayTypes_DEFINED	10 #ifndef SkDisplayTypes_DEFINED

(...skipping 57 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
68 friend class SkAnimatorScript;	68 friend class SkAnimatorScript;

69 friend class SkAnimatorScript_Box;	69 friend class SkAnimatorScript_Box;

70 friend class SkAnimatorScript_Unbox;	70 friend class SkAnimatorScript_Unbox;

71 typedef SkDisplayDepend INHERITED;	71 typedef SkDisplayDepend INHERITED;

72 };	72 };

73	73

74 class SkDisplayString : public SkDisplayDepend {	74 class SkDisplayString : public SkDisplayDepend {

75 DECLARE_DISPLAY_MEMBER_INFO(String);	75 DECLARE_DISPLAY_MEMBER_INFO(String);

76 SkDisplayString();	76 SkDisplayString();

77 SkDisplayString(SkString& );	77 SkDisplayString(SkString& );

78 virtual void executeFunction(SkDisplayable* , int index,	78 void executeFunction(SkDisplayable* , int index,

79 SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type,	79 SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type,

80 SkScriptValue* ) override;	80 SkScriptValue* ) override;

81 const SkFunctionParamType* getFunctionsParameters() override;	81 const SkFunctionParamType* getFunctionsParameters() override;

82 bool getProperty(int index, SkScriptValue* ) const override;	82 bool getProperty(int index, SkScriptValue* ) const override;

83 SkString value;	83 SkString value;

84 private:	84 private:

85 static const SkFunctionParamType fFunctionParameters[];	85 static const SkFunctionParamType fFunctionParameters[];

86 };	86 };

87	87

88 class SkDisplayArray : public SkDisplayDepend {	88 class SkDisplayArray : public SkDisplayDepend {

89 DECLARE_DISPLAY_MEMBER_INFO(Array);	89 DECLARE_DISPLAY_MEMBER_INFO(Array);

90 SkDisplayArray();	90 SkDisplayArray();

91 SkDisplayArray(SkTypedArray& );	91 SkDisplayArray(SkTypedArray& );

92 SkDisplayArray(SkOpArray& ); // compiled script experiment	92 SkDisplayArray(SkOpArray& ); // compiled script experiment

93 virtual ~SkDisplayArray();	93 virtual ~SkDisplayArray();

94 bool getProperty(int index, SkScriptValue* ) const override;	94 bool getProperty(int index, SkScriptValue* ) const override;

95 private:	95 private:

96 SkTypedArray values;	96 SkTypedArray values;

97 friend class SkAnimator;	97 friend class SkAnimator;

98 friend class SkAnimatorScript;	98 friend class SkAnimatorScript;

99 friend class SkAnimatorScript2;	99 friend class SkAnimatorScript2;

100 friend class SkAnimatorScript_Unbox;	100 friend class SkAnimatorScript_Unbox;

101 friend class SkDisplayable;	101 friend class SkDisplayable;

102 friend struct SkMemberInfo;	102 friend struct SkMemberInfo;

103 friend class SkScriptEngine;	103 friend class SkScriptEngine;

104 };	104 };

105	105

106 #endif // SkDisplayTypes_DEFINED	106 #endif // SkDisplayTypes_DEFINED

OLD	NEW