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

Unified Diff: dm/DMSrcSinkAndroid.cpp

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/DMSrcSinkAndroid.h ('k') | example/HelloWorld.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dm/DMSrcSinkAndroid.cpp
diff --git a/dm/DMSrcSinkAndroid.cpp b/dm/DMSrcSinkAndroid.cpp
index fc83ea4174aaf63babf3e629977a8dcb82e6b010..29cf055b4d5bf64d8bb40082c68e002b00c7cabf 100644
--- a/dm/DMSrcSinkAndroid.cpp
+++ b/dm/DMSrcSinkAndroid.cpp
@@ -39,7 +39,7 @@ namespace {
class ContextFactory : public android::uirenderer::IContextFactory {
public:
android::uirenderer::AnimationContext* createAnimationContext
- (android::uirenderer::renderthread::TimeLord& clock) SK_OVERRIDE {
+ (android::uirenderer::renderthread::TimeLord& clock) override {
return new android::uirenderer::AnimationContext(clock);
}
};
@@ -181,7 +181,7 @@ Error ViaAndroidSDK::draw(const Src& src,
ProxySrc(const Src& src)
: fSrc(src) {}
- Error draw(SkCanvas* canvas) const SK_OVERRIDE {
+ Error draw(SkCanvas* canvas) const override {
// Pass through HWUI's upper layers to get operational transforms
SkAutoTDelete<android::Canvas> ac (android::Canvas::create_canvas(canvas));
SkAutoTUnref<android::uirenderer::SkiaCanvasProxy> scProxy
@@ -195,8 +195,8 @@ Error ViaAndroidSDK::draw(const Src& src,
return "";
}
- SkISize size() const SK_OVERRIDE { return fSrc.size(); }
- Name name() const SK_OVERRIDE { sk_throw(); return ""; }
+ SkISize size() const override { return fSrc.size(); }
+ Name name() const override { sk_throw(); return ""; }
} proxy(src);
return fSink->draw(proxy, bitmap, stream, log);
« no previous file with comments | « dm/DMSrcSinkAndroid.h ('k') | example/HelloWorld.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698