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

Unified Diff: src/core/SkBitmapProcShader.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/SkBitmapHeap.h ('k') | src/core/SkBlitter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkBitmapProcShader.h
diff --git a/src/core/SkBitmapProcShader.h b/src/core/SkBitmapProcShader.h
index f73d56f2fb99abcb6e4f4adcd9266a40f0be0d2f..bdb2d4de1543ac1fe242a9be3062385086427691 100644
--- a/src/core/SkBitmapProcShader.h
+++ b/src/core/SkBitmapProcShader.h
@@ -20,10 +20,10 @@ public:
const SkMatrix* localMatrix = NULL);
// overrides from SkShader
- bool isOpaque() const SK_OVERRIDE;
- BitmapType asABitmap(SkBitmap*, SkMatrix*, TileMode*) const SK_OVERRIDE;
+ bool isOpaque() const override;
+ BitmapType asABitmap(SkBitmap*, SkMatrix*, TileMode*) const override;
- size_t contextSize() const SK_OVERRIDE;
+ size_t contextSize() const override;
static bool CanDo(const SkBitmap&, TileMode tx, TileMode ty);
@@ -32,7 +32,7 @@ public:
bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM, const SkMatrix*,
- GrColor*, GrFragmentProcessor**) const SK_OVERRIDE;
+ GrColor*, GrFragmentProcessor**) const override;
class BitmapProcShaderContext : public SkShader::Context {
public:
@@ -41,11 +41,11 @@ public:
BitmapProcShaderContext(const SkBitmapProcShader&, const ContextRec&, SkBitmapProcState*);
virtual ~BitmapProcShaderContext();
- void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE;
- ShadeProc asAShadeProc(void** ctx) SK_OVERRIDE;
- void shadeSpan16(int x, int y, uint16_t dstC[], int count) SK_OVERRIDE;
+ void shadeSpan(int x, int y, SkPMColor dstC[], int count) override;
+ ShadeProc asAShadeProc(void** ctx) override;
+ void shadeSpan16(int x, int y, uint16_t dstC[], int count) override;
- uint32_t getFlags() const SK_OVERRIDE { return fFlags; }
+ uint32_t getFlags() const override { return fFlags; }
private:
SkBitmapProcState* fState;
@@ -55,8 +55,8 @@ public:
};
protected:
- void flatten(SkWriteBuffer&) const SK_OVERRIDE;
- Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
+ void flatten(SkWriteBuffer&) const override;
+ Context* onCreateContext(const ContextRec&, void* storage) const override;
SkBitmap fRawBitmap; // experimental for RLE encoding
uint8_t fTileModeX, fTileModeY;
« no previous file with comments | « src/core/SkBitmapHeap.h ('k') | src/core/SkBlitter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698