diff options
author | mtklein <mtklein@chromium.org> | 2015-03-25 18:17:31 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-25 18:17:32 -0700 |
commit | 36352bf5e38f45a70ee4f4fc132a38048d38206d (patch) | |
tree | 24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /src/core/SkAAClip.cpp | |
parent | 02fd592c8d190058652bb715fb34feb7a72992e5 (diff) |
C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}
NOPRESUBMIT=true
BUG=skia:
DOCS_PREVIEW= https://skia.org/?cl=1037793002
Review URL: https://codereview.chromium.org/1037793002
Diffstat (limited to 'src/core/SkAAClip.cpp')
-rw-r--r-- | src/core/SkAAClip.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/SkAAClip.cpp b/src/core/SkAAClip.cpp index 45e6cc3ae6..e55451e3d9 100644 --- a/src/core/SkAAClip.cpp +++ b/src/core/SkAAClip.cpp @@ -1273,13 +1273,13 @@ public: Instead we'll rely on the runtime asserts to guarantee Y monotonicity; any failure cases that misses may have minor artifacts. */ - void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE { + void blitV(int x, int y, int height, SkAlpha alpha) override { this->recordMinY(y); fBuilder->addColumn(x, y, alpha, height); fLastY = y + height - 1; } - void blitRect(int x, int y, int width, int height) SK_OVERRIDE { + void blitRect(int x, int y, int width, int height) override { this->recordMinY(y); this->checkForYGap(y); fBuilder->addRectRun(x, y, width, height); @@ -1287,28 +1287,28 @@ public: } virtual void blitAntiRect(int x, int y, int width, int height, - SkAlpha leftAlpha, SkAlpha rightAlpha) SK_OVERRIDE { + SkAlpha leftAlpha, SkAlpha rightAlpha) override { this->recordMinY(y); this->checkForYGap(y); fBuilder->addAntiRectRun(x, y, width, height, leftAlpha, rightAlpha); fLastY = y + height - 1; } - void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE + void blitMask(const SkMask&, const SkIRect& clip) override { unexpected(); } - const SkBitmap* justAnOpaqueColor(uint32_t*) SK_OVERRIDE { + const SkBitmap* justAnOpaqueColor(uint32_t*) override { return NULL; } - void blitH(int x, int y, int width) SK_OVERRIDE { + void blitH(int x, int y, int width) override { this->recordMinY(y); this->checkForYGap(y); fBuilder->addRun(x, y, 0xFF, width); } virtual void blitAntiH(int x, int y, const SkAlpha alpha[], - const int16_t runs[]) SK_OVERRIDE { + const int16_t runs[]) override { this->recordMinY(y); this->checkForYGap(y); for (;;) { |