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

Unified Diff: include/effects/SkTransparentShader.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/effects/SkTileImageFilter.h ('k') | include/effects/SkXfermodeImageFilter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/effects/SkTransparentShader.h
diff --git a/include/effects/SkTransparentShader.h b/include/effects/SkTransparentShader.h
index 254338c579840d1409db3f025394df3bf9bc76cb..11aa086fa4d2fcfa245c8c96c19a9f4837ef496c 100644
--- a/include/effects/SkTransparentShader.h
+++ b/include/effects/SkTransparentShader.h
@@ -14,16 +14,16 @@ class SK_API SkTransparentShader : public SkShader {
public:
SkTransparentShader() {}
- size_t contextSize() const SK_OVERRIDE;
+ size_t contextSize() const override;
class TransparentShaderContext : public SkShader::Context {
public:
TransparentShaderContext(const SkTransparentShader& shader, const ContextRec&);
virtual ~TransparentShaderContext();
- uint32_t getFlags() const SK_OVERRIDE;
- void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE;
- void shadeSpan16(int x, int y, uint16_t span[], int count) SK_OVERRIDE;
+ uint32_t getFlags() const override;
+ void shadeSpan(int x, int y, SkPMColor[], int count) override;
+ void shadeSpan16(int x, int y, uint16_t span[], int count) override;
private:
const SkBitmap* fDevice;
@@ -35,10 +35,10 @@ public:
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTransparentShader)
protected:
- Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
+ Context* onCreateContext(const ContextRec&, void* storage) const override;
// we don't need to flatten anything at all
- void flatten(SkWriteBuffer&) const SK_OVERRIDE {}
+ void flatten(SkWriteBuffer&) const override {}
private:
typedef SkShader INHERITED;
« no previous file with comments | « include/effects/SkTileImageFilter.h ('k') | include/effects/SkXfermodeImageFilter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698