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

Side by Side Diff: dm/DMSrcSinkAndroid.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 | « dm/DMSrcSink.cpp ('k') | dm/DMSrcSinkAndroid.cpp » ('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 * Copyright 2015 Google Inc. 2 * Copyright 2015 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #ifndef DMSrcSinkAndroid_DEFINED 8 #ifndef DMSrcSinkAndroid_DEFINED
9 #define DMSrcSinkAndroid_DEFINED 9 #define DMSrcSinkAndroid_DEFINED
10 10
11 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK 11 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
12 12
13 #include "DMSrcSink.h" 13 #include "DMSrcSink.h"
14 14
15 namespace DM { 15 namespace DM {
16 16
17 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~*/ 17 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~*/
18 18
19 // Draws to the Android Framework's HWUI API. 19 // Draws to the Android Framework's HWUI API.
20 20
21 class HWUISink : public Sink { 21 class HWUISink : public Sink {
22 public: 22 public:
23 HWUISink() { } 23 HWUISink() { }
24 24
25 Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const SK_OVERRIDE; 25 Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override;
26 int enclave() const SK_OVERRIDE { return kGPU_Enclave; } 26 int enclave() const override { return kGPU_Enclave; }
27 const char* fileExtension() const SK_OVERRIDE { return "png"; } 27 const char* fileExtension() const override { return "png"; }
28 }; 28 };
29 29
30 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~*/ 30 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~*/
31 31
32 // Trims draw commands to only include those supported by the Android Framework' s HWUI API. 32 // Trims draw commands to only include those supported by the Android Framework' s HWUI API.
33 33
34 class ViaAndroidSDK : public Sink { 34 class ViaAndroidSDK : public Sink {
35 public: 35 public:
36 explicit ViaAndroidSDK(Sink*); 36 explicit ViaAndroidSDK(Sink*);
37 37
38 Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const SK_OVERRIDE; 38 Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override;
39 int enclave() const SK_OVERRIDE { return fSink->enclave(); } 39 int enclave() const override { return fSink->enclave(); }
40 const char* fileExtension() const SK_OVERRIDE { return fSink->fileExtension( ); } 40 const char* fileExtension() const override { return fSink->fileExtension(); }
41 41
42 private: 42 private:
43 SkAutoTDelete<Sink> fSink; 43 SkAutoTDelete<Sink> fSink;
44 }; 44 };
45 45
46 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~*/ 46 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~*/
47 47
48 } // namespace DM 48 } // namespace DM
49 49
50 #endif // SK_BUILD_FOR_ANDROID_FRAMEWORK 50 #endif // SK_BUILD_FOR_ANDROID_FRAMEWORK
51 51
52 #endif // DMSrcSinkAndroid_DEFINED 52 #endif // DMSrcSinkAndroid_DEFINED
OLDNEW
« no previous file with comments | « dm/DMSrcSink.cpp ('k') | dm/DMSrcSinkAndroid.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698