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

Unified Diff: src/core/SkColorShader.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/SkColorFilter.cpp ('k') | src/core/SkCoreBlitters.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkColorShader.h
diff --git a/src/core/SkColorShader.h b/src/core/SkColorShader.h
index 9fbd5e1e8e2a4883c677e02ca930ee66bf6f7ea1..918e19e27a9775641a60444df2a18a7485b5c3c3 100644
--- a/src/core/SkColorShader.h
+++ b/src/core/SkColorShader.h
@@ -23,9 +23,9 @@ public:
*/
explicit SkColorShader(SkColor c);
- bool isOpaque() const SK_OVERRIDE;
+ bool isOpaque() const override;
- size_t contextSize() const SK_OVERRIDE {
+ size_t contextSize() const override {
return sizeof(ColorShaderContext);
}
@@ -33,11 +33,11 @@ public:
public:
ColorShaderContext(const SkColorShader& shader, const ContextRec&);
- uint32_t getFlags() const SK_OVERRIDE;
- uint8_t getSpan16Alpha() const SK_OVERRIDE;
- void shadeSpan(int x, int y, SkPMColor span[], int count) SK_OVERRIDE;
- void shadeSpan16(int x, int y, uint16_t span[], int count) SK_OVERRIDE;
- void shadeSpanAlpha(int x, int y, uint8_t alpha[], int count) SK_OVERRIDE;
+ uint32_t getFlags() const override;
+ uint8_t getSpan16Alpha() const override;
+ void shadeSpan(int x, int y, SkPMColor span[], int count) override;
+ void shadeSpan16(int x, int y, uint16_t span[], int count) override;
+ void shadeSpanAlpha(int x, int y, uint8_t alpha[], int count) override;
private:
SkPMColor fPMColor;
@@ -50,22 +50,22 @@ public:
// we return false for this, use asAGradient
virtual BitmapType asABitmap(SkBitmap* outTexture,
SkMatrix* outMatrix,
- TileMode xy[2]) const SK_OVERRIDE;
+ TileMode xy[2]) const override;
- GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE;
+ GradientType asAGradient(GradientInfo* info) const override;
virtual bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM,
const SkMatrix*, GrColor*,
- GrFragmentProcessor**) const SK_OVERRIDE;
+ GrFragmentProcessor**) const override;
SK_TO_STRING_OVERRIDE()
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorShader)
protected:
SkColorShader(SkReadBuffer&);
- void flatten(SkWriteBuffer&) const SK_OVERRIDE;
- Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
- bool onAsLuminanceColor(SkColor* lum) const SK_OVERRIDE {
+ void flatten(SkWriteBuffer&) const override;
+ Context* onCreateContext(const ContextRec&, void* storage) const override;
+ bool onAsLuminanceColor(SkColor* lum) const override {
*lum = fColor;
return true;
}
« no previous file with comments | « src/core/SkColorFilter.cpp ('k') | src/core/SkCoreBlitters.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698