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

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

Issue 815883002: Cleanup: Another round of override fixes. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: revert include changes Created 6 years 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/SkDrawOval.h ('k') | src/animator/SkDump.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 SkDrawRectangle_DEFINED 10 #ifndef SkDrawRectangle_DEFINED
11 #define SkDrawRectangle_DEFINED 11 #define SkDrawRectangle_DEFINED
12 12
13 #include "SkBoundable.h" 13 #include "SkBoundable.h"
14 #include "SkMemberInfo.h" 14 #include "SkMemberInfo.h"
15 #include "SkRect.h" 15 #include "SkRect.h"
16 16
17 class SkRectToRect; 17 class SkRectToRect;
18 18
19 class SkDrawRect : public SkBoundable { 19 class SkDrawRect : public SkBoundable {
20 DECLARE_DRAW_MEMBER_INFO(Rect); 20 DECLARE_DRAW_MEMBER_INFO(Rect);
21 SkDrawRect(); 21 SkDrawRect();
22 virtual void dirty(); 22 virtual void dirty() SK_OVERRIDE;
23 virtual bool draw(SkAnimateMaker& ); 23 virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
24 #ifdef SK_DUMP_ENABLED 24 #ifdef SK_DUMP_ENABLED
25 virtual void dump(SkAnimateMaker* ); 25 virtual void dump(SkAnimateMaker* ) SK_OVERRIDE;
26 #endif 26 #endif
27 virtual SkDisplayable* getParent() const; 27 virtual SkDisplayable* getParent() const SK_OVERRIDE;
28 virtual bool getProperty(int index, SkScriptValue* value) const; 28 virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
29 virtual bool setParent(SkDisplayable* parent); 29 virtual bool setParent(SkDisplayable* parent) SK_OVERRIDE;
30 virtual bool setProperty(int index, SkScriptValue& ); 30 virtual bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE;
31 protected: 31 protected:
32 SkRect fRect; 32 SkRect fRect;
33 SkDisplayable* fParent; 33 SkDisplayable* fParent;
34 private: 34 private:
35 friend class SkDrawClip; 35 friend class SkDrawClip;
36 friend class SkRectToRect; 36 friend class SkRectToRect;
37 friend class SkSaveLayer; 37 friend class SkSaveLayer;
38 typedef SkBoundable INHERITED; 38 typedef SkBoundable INHERITED;
39 }; 39 };
40 40
41 class SkRoundRect : public SkDrawRect { 41 class SkRoundRect : public SkDrawRect {
42 DECLARE_MEMBER_INFO(RoundRect); 42 DECLARE_MEMBER_INFO(RoundRect);
43 SkRoundRect(); 43 SkRoundRect();
44 virtual bool draw(SkAnimateMaker& ); 44 virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
45 #ifdef SK_DUMP_ENABLED 45 #ifdef SK_DUMP_ENABLED
46 virtual void dump(SkAnimateMaker* ); 46 virtual void dump(SkAnimateMaker* ) SK_OVERRIDE;
47 #endif 47 #endif
48 protected: 48 protected:
49 SkScalar rx; 49 SkScalar rx;
50 SkScalar ry; 50 SkScalar ry;
51 private: 51 private:
52 typedef SkDrawRect INHERITED; 52 typedef SkDrawRect INHERITED;
53 }; 53 };
54 54
55 #endif // SkDrawRectangle_DEFINED 55 #endif // SkDrawRectangle_DEFINED
OLDNEW
« no previous file with comments | « src/animator/SkDrawOval.h ('k') | src/animator/SkDump.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698