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

Side by Side Diff: src/animator/SkDisplayInput.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/SkDisplayInclude.h ('k') | src/animator/SkDisplayMath.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 SkDisplayInput_DEFINED 10 #ifndef SkDisplayInput_DEFINED
11 #define SkDisplayInput_DEFINED 11 #define SkDisplayInput_DEFINED
12 12
13 #include "SkDisplayable.h" 13 #include "SkDisplayable.h"
14 #include "SkMemberInfo.h" 14 #include "SkMemberInfo.h"
15 15
16 class SkInput : public SkDisplayable { 16 class SkInput : public SkDisplayable {
17 DECLARE_MEMBER_INFO(Input); 17 DECLARE_MEMBER_INFO(Input);
18 SkInput(); 18 SkInput();
19 SkDisplayable* contains(const SkString& ) SK_OVERRIDE; 19 SkDisplayable* contains(const SkString& ) override;
20 bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; 20 bool getProperty(int index, SkScriptValue* value) const override;
21 bool enable(SkAnimateMaker & ) SK_OVERRIDE; 21 bool enable(SkAnimateMaker & ) override;
22 bool hasEnable() const SK_OVERRIDE; 22 bool hasEnable() const override;
23 protected: 23 protected:
24 SkString name; 24 SkString name;
25 int32_t fInt; 25 int32_t fInt;
26 SkScalar fFloat; 26 SkScalar fFloat;
27 SkString string; 27 SkString string;
28 private: 28 private:
29 friend class SkDisplayEvent; 29 friend class SkDisplayEvent;
30 friend class SkPost; 30 friend class SkPost;
31 }; 31 };
32 32
33 #endif // SkDisplayInput_DEFINED 33 #endif // SkDisplayInput_DEFINED
OLDNEW
« no previous file with comments | « src/animator/SkDisplayInclude.h ('k') | src/animator/SkDisplayMath.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698