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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « dm/DMSrcSink.cpp ('k') | dm/DMSrcSinkAndroid.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dm/DMSrcSinkAndroid.h
diff --git a/dm/DMSrcSinkAndroid.h b/dm/DMSrcSinkAndroid.h
index 1a7459f6e81cea5bdee273c325d7c47d9b3e4e03..bd4adcbe2433da27873586ce6e621e271ac184ad 100644
--- a/dm/DMSrcSinkAndroid.h
+++ b/dm/DMSrcSinkAndroid.h
@@ -22,9 +22,9 @@ class HWUISink : public Sink {
public:
HWUISink() { }
- Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const SK_OVERRIDE;
- int enclave() const SK_OVERRIDE { return kGPU_Enclave; }
- const char* fileExtension() const SK_OVERRIDE { return "png"; }
+ Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override;
+ int enclave() const override { return kGPU_Enclave; }
+ const char* fileExtension() const override { return "png"; }
};
/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -35,9 +35,9 @@ class ViaAndroidSDK : public Sink {
public:
explicit ViaAndroidSDK(Sink*);
- Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const SK_OVERRIDE;
- int enclave() const SK_OVERRIDE { return fSink->enclave(); }
- const char* fileExtension() const SK_OVERRIDE { return fSink->fileExtension(); }
+ Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override;
+ int enclave() const override { return fSink->enclave(); }
+ const char* fileExtension() const override { return fSink->fileExtension(); }
private:
SkAutoTDelete<Sink> fSink;
« 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