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

Unified Diff: src/utils/debugger/SkDebugCanvas.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 | « src/utils/debugger/SkDebugCanvas.h ('k') | src/utils/debugger/SkDrawCommand.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/utils/debugger/SkDebugCanvas.cpp
diff --git a/src/utils/debugger/SkDebugCanvas.cpp b/src/utils/debugger/SkDebugCanvas.cpp
index 779d6950d7d1fd9bba56e95c572f620948636648..6d186a7ee8b865d28580a2bd0ed5c82bad63b594 100644
--- a/src/utils/debugger/SkDebugCanvas.cpp
+++ b/src/utils/debugger/SkDebugCanvas.cpp
@@ -90,7 +90,7 @@ int SkDebugCanvas::getCommandAtPoint(int x, int y, int index) {
class OverdrawXfermode : public SkXfermode {
public:
- SkPMColor xferColor(SkPMColor src, SkPMColor dst) const SK_OVERRIDE {
+ SkPMColor xferColor(SkPMColor src, SkPMColor dst) const override {
// This table encodes the color progression of the overdraw visualization
static const SkPMColor gTable[] = {
SkPackARGB32(0x00, 0x00, 0x00, 0x00),
@@ -123,9 +123,9 @@ public:
return gTable[idx];
}
- Factory getFactory() const SK_OVERRIDE { return NULL; }
+ Factory getFactory() const override { return NULL; }
#ifndef SK_IGNORE_TO_STRING
- virtual void toString(SkString* str) const SK_OVERRIDE { str->set("OverdrawXfermode"); }
+ virtual void toString(SkString* str) const override { str->set("OverdrawXfermode"); }
#endif
};
@@ -139,7 +139,7 @@ public:
delete fXferMode;
}
- bool filter(SkPaint* p, Type) SK_OVERRIDE {
+ bool filter(SkPaint* p, Type) override {
p->setXfermode(fXferMode);
p->setAntiAlias(false);
return true;
@@ -163,7 +163,7 @@ public:
fFilterQuality = filterQuality;
}
- bool filter(SkPaint* p, Type) SK_OVERRIDE {
+ bool filter(SkPaint* p, Type) override {
p->setFilterQuality(fFilterQuality);
return true;
}
@@ -179,21 +179,21 @@ class SkDebugClipVisitor : public SkCanvas::ClipVisitor {
public:
SkDebugClipVisitor(SkCanvas* canvas) : fCanvas(canvas) {}
- void clipRect(const SkRect& r, SkRegion::Op, bool doAA) SK_OVERRIDE {
+ void clipRect(const SkRect& r, SkRegion::Op, bool doAA) override {
SkPaint p;
p.setColor(SK_ColorRED);
p.setStyle(SkPaint::kStroke_Style);
p.setAntiAlias(doAA);
fCanvas->drawRect(r, p);
}
- void clipRRect(const SkRRect& rr, SkRegion::Op, bool doAA) SK_OVERRIDE {
+ void clipRRect(const SkRRect& rr, SkRegion::Op, bool doAA) override {
SkPaint p;
p.setColor(SK_ColorGREEN);
p.setStyle(SkPaint::kStroke_Style);
p.setAntiAlias(doAA);
fCanvas->drawRRect(rr, p);
}
- void clipPath(const SkPath& path, SkRegion::Op, bool doAA) SK_OVERRIDE {
+ void clipPath(const SkPath& path, SkRegion::Op, bool doAA) override {
SkPaint p;
p.setColor(SK_ColorBLUE);
p.setStyle(SkPaint::kStroke_Style);
« no previous file with comments | « src/utils/debugger/SkDebugCanvas.h ('k') | src/utils/debugger/SkDrawCommand.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698