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

Unified Diff: include/device/xps/SkXPSDevice.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 | « include/core/SkWeakRefCnt.h ('k') | include/effects/Sk1DPathEffect.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/device/xps/SkXPSDevice.h
diff --git a/include/device/xps/SkXPSDevice.h b/include/device/xps/SkXPSDevice.h
index 10dab8118322f212637fa7f1310accd6fe6293f5..9efb6f3dc8f5b36b8dfa69dc98c82ff71438153d 100644
--- a/include/device/xps/SkXPSDevice.h
+++ b/include/device/xps/SkXPSDevice.h
@@ -71,54 +71,54 @@ public:
virtual bool endPortfolio();
protected:
- void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE;
+ void drawPaint(const SkDraw&, const SkPaint& paint) override;
virtual void drawPoints(
const SkDraw&,
SkCanvas::PointMode mode,
size_t count, const SkPoint[],
- const SkPaint& paint) SK_OVERRIDE;
+ const SkPaint& paint) override;
virtual void drawRect(
const SkDraw&,
const SkRect& r,
- const SkPaint& paint) SK_OVERRIDE;
+ const SkPaint& paint) override;
virtual void drawRRect(
const SkDraw&,
const SkRRect&,
- const SkPaint& paint) SK_OVERRIDE;
+ const SkPaint& paint) override;
virtual void drawPath(
const SkDraw&,
const SkPath& platonicPath,
const SkPaint& paint,
const SkMatrix* prePathMatrix,
- bool pathIsMutable) SK_OVERRIDE;
+ bool pathIsMutable) override;
virtual void drawBitmap(
const SkDraw&,
const SkBitmap& bitmap,
const SkMatrix& matrix,
- const SkPaint& paint) SK_OVERRIDE;
+ const SkPaint& paint) override;
virtual void drawSprite(
const SkDraw&,
const SkBitmap& bitmap,
int x, int y,
- const SkPaint& paint) SK_OVERRIDE;
+ const SkPaint& paint) override;
virtual void drawText(
const SkDraw&,
const void* text, size_t len,
SkScalar x, SkScalar y,
- const SkPaint& paint) SK_OVERRIDE;
+ const SkPaint& paint) override;
virtual void drawPosText(
const SkDraw&,
const void* text, size_t len,
const SkScalar pos[], int scalarsPerPos,
- const SkPoint& offset, const SkPaint& paint) SK_OVERRIDE;
+ const SkPoint& offset, const SkPaint& paint) override;
virtual void drawVertices(
const SkDraw&,
@@ -127,13 +127,13 @@ protected:
const SkPoint texs[], const SkColor colors[],
SkXfermode* xmode,
const uint16_t indices[], int indexCount,
- const SkPaint& paint) SK_OVERRIDE;
+ const SkPaint& paint) override;
virtual void drawDevice(
const SkDraw&,
SkBaseDevice* device,
int x, int y,
- const SkPaint& paint) SK_OVERRIDE;
+ const SkPaint& paint) override;
private:
class TypefaceUse : ::SkNoncopyable {
@@ -309,7 +309,7 @@ private:
const SkVector& ppuScale,
IXpsOMPath* shadedPath);
- SkBaseDevice* onCreateDevice(const CreateInfo&, const SkPaint*) SK_OVERRIDE;
+ SkBaseDevice* onCreateDevice(const CreateInfo&, const SkPaint*) override;
// Disable the default copy and assign implementation.
SkXPSDevice(const SkXPSDevice&);
« no previous file with comments | « include/core/SkWeakRefCnt.h ('k') | include/effects/Sk1DPathEffect.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698