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

Side by Side Diff: src/animator/SkDisplayMovie.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/SkDisplayMath.h ('k') | src/animator/SkDisplayNumber.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 SkDisplayMovie_DEFINED 10 #ifndef SkDisplayMovie_DEFINED
11 #define SkDisplayMovie_DEFINED 11 #define SkDisplayMovie_DEFINED
12 12
13 #include "SkAnimator.h" 13 #include "SkAnimator.h"
14 #include "SkADrawable.h" 14 #include "SkADrawable.h"
15 #include "SkMemberInfo.h" 15 #include "SkMemberInfo.h"
16 16
17 struct SkEventState; 17 struct SkEventState;
18 18
19 class SkDisplayMovie : public SkADrawable { 19 class SkDisplayMovie : public SkADrawable {
20 DECLARE_DISPLAY_MEMBER_INFO(Movie); 20 DECLARE_DISPLAY_MEMBER_INFO(Movie);
21 SkDisplayMovie(); 21 SkDisplayMovie();
22 virtual ~SkDisplayMovie(); 22 virtual ~SkDisplayMovie();
23 void buildMovie(); 23 void buildMovie();
24 SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE; 24 SkDisplayable* deepCopy(SkAnimateMaker* ) override;
25 void dirty() SK_OVERRIDE; 25 void dirty() override;
26 bool doEvent(const SkEvent& evt) { 26 bool doEvent(const SkEvent& evt) {
27 return fLoaded && fMovie.doEvent(evt); 27 return fLoaded && fMovie.doEvent(evt);
28 } 28 }
29 bool doEvent(SkDisplayEvent::Kind , SkEventState* state ) SK_OVERRIDE; 29 bool doEvent(SkDisplayEvent::Kind , SkEventState* state ) override;
30 bool draw(SkAnimateMaker& ) SK_OVERRIDE; 30 bool draw(SkAnimateMaker& ) override;
31 #ifdef SK_DUMP_ENABLED 31 #ifdef SK_DUMP_ENABLED
32 void dump(SkAnimateMaker* ) SK_OVERRIDE; 32 void dump(SkAnimateMaker* ) override;
33 void dumpEvents() SK_OVERRIDE; 33 void dumpEvents() override;
34 #endif 34 #endif
35 bool enable(SkAnimateMaker& ) SK_OVERRIDE; 35 bool enable(SkAnimateMaker& ) override;
36 const SkAnimator* getAnimator() const { return &fMovie; } 36 const SkAnimator* getAnimator() const { return &fMovie; }
37 bool hasEnable() const SK_OVERRIDE; 37 bool hasEnable() const override;
38 void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; 38 void onEndElement(SkAnimateMaker& ) override;
39 protected: 39 protected:
40 SkString src; 40 SkString src;
41 SkAnimator fMovie; 41 SkAnimator fMovie;
42 SkBool8 fDecodedSuccessfully; 42 SkBool8 fDecodedSuccessfully;
43 SkBool8 fLoaded; 43 SkBool8 fLoaded;
44 SkBool8 fMovieBuilt; 44 SkBool8 fMovieBuilt;
45 friend class SkAnimateMaker; 45 friend class SkAnimateMaker;
46 friend class SkPost; 46 friend class SkPost;
47 private: 47 private:
48 typedef SkADrawable INHERITED; 48 typedef SkADrawable INHERITED;
49 }; 49 };
50 50
51 #endif // SkDisplayMovie_DEFINED 51 #endif // SkDisplayMovie_DEFINED
OLDNEW
« no previous file with comments | « src/animator/SkDisplayMath.h ('k') | src/animator/SkDisplayNumber.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698