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

Unified Diff: src/core/SkBlitter.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 | « src/core/SkBitmapProcShader.h ('k') | src/core/SkBlitter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkBlitter.h
diff --git a/src/core/SkBlitter.h b/src/core/SkBlitter.h
index b0745c8a27a85649990f609949d4e1c07d616ab6..9447bf1b51c4b8f241668ece4b615c8731bac3b4 100644
--- a/src/core/SkBlitter.h
+++ b/src/core/SkBlitter.h
@@ -119,14 +119,14 @@ private:
*/
class SkNullBlitter : public SkBlitter {
public:
- void blitH(int x, int y, int width) SK_OVERRIDE;
+ void blitH(int x, int y, int width) override;
virtual void blitAntiH(int x, int y, const SkAlpha[],
- const int16_t runs[]) SK_OVERRIDE;
- void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE;
- void blitRect(int x, int y, int width, int height) SK_OVERRIDE;
- void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE;
- const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE;
- bool isNullBlitter() const SK_OVERRIDE;
+ const int16_t runs[]) override;
+ void blitV(int x, int y, int height, SkAlpha alpha) override;
+ void blitRect(int x, int y, int width, int height) override;
+ void blitMask(const SkMask&, const SkIRect& clip) override;
+ const SkBitmap* justAnOpaqueColor(uint32_t* value) override;
+ bool isNullBlitter() const override;
};
/** Wraps another (real) blitter, and ensures that the real blitter is only
@@ -141,21 +141,21 @@ public:
fClipRect = clipRect;
}
- void blitH(int x, int y, int width) SK_OVERRIDE;
+ void blitH(int x, int y, int width) override;
virtual void blitAntiH(int x, int y, const SkAlpha[],
- const int16_t runs[]) SK_OVERRIDE;
- void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE;
- void blitRect(int x, int y, int width, int height) SK_OVERRIDE;
+ const int16_t runs[]) override;
+ void blitV(int x, int y, int height, SkAlpha alpha) override;
+ void blitRect(int x, int y, int width, int height) override;
virtual void blitAntiRect(int x, int y, int width, int height,
- SkAlpha leftAlpha, SkAlpha rightAlpha) SK_OVERRIDE;
- void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE;
- const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE;
+ SkAlpha leftAlpha, SkAlpha rightAlpha) override;
+ void blitMask(const SkMask&, const SkIRect& clip) override;
+ const SkBitmap* justAnOpaqueColor(uint32_t* value) override;
- int requestRowsPreserved() const SK_OVERRIDE {
+ int requestRowsPreserved() const override {
return fBlitter->requestRowsPreserved();
}
- void* allocBlitMemory(size_t sz) SK_OVERRIDE {
+ void* allocBlitMemory(size_t sz) override {
return fBlitter->allocBlitMemory(sz);
}
@@ -176,21 +176,21 @@ public:
fRgn = clipRgn;
}
- void blitH(int x, int y, int width) SK_OVERRIDE;
+ void blitH(int x, int y, int width) override;
virtual void blitAntiH(int x, int y, const SkAlpha[],
- const int16_t runs[]) SK_OVERRIDE;
- void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE;
- void blitRect(int x, int y, int width, int height) SK_OVERRIDE;
+ const int16_t runs[]) override;
+ void blitV(int x, int y, int height, SkAlpha alpha) override;
+ void blitRect(int x, int y, int width, int height) override;
virtual void blitAntiRect(int x, int y, int width, int height,
- SkAlpha leftAlpha, SkAlpha rightAlpha) SK_OVERRIDE;
- void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE;
- const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE;
+ SkAlpha leftAlpha, SkAlpha rightAlpha) override;
+ void blitMask(const SkMask&, const SkIRect& clip) override;
+ const SkBitmap* justAnOpaqueColor(uint32_t* value) override;
- int requestRowsPreserved() const SK_OVERRIDE {
+ int requestRowsPreserved() const override {
return fBlitter->requestRowsPreserved();
}
- void* allocBlitMemory(size_t sz) SK_OVERRIDE {
+ void* allocBlitMemory(size_t sz) override {
return fBlitter->allocBlitMemory(sz);
}
« no previous file with comments | « src/core/SkBitmapProcShader.h ('k') | src/core/SkBlitter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698