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

Unified Diff: src/core/SkLocalMatrixShader.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/SkImageFilter.cpp ('k') | src/core/SkMaskCache.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkLocalMatrixShader.h
diff --git a/src/core/SkLocalMatrixShader.h b/src/core/SkLocalMatrixShader.h
index be78bee110f8ee6bbbf8a81f460ac4a08fce1e5c..1a469948c6593fc5140001a5c26705d18aa146ed 100644
--- a/src/core/SkLocalMatrixShader.h
+++ b/src/core/SkLocalMatrixShader.h
@@ -19,16 +19,16 @@ public:
, fProxyShader(SkRef(proxy))
{}
- size_t contextSize() const SK_OVERRIDE {
+ size_t contextSize() const override {
return fProxyShader->contextSize();
}
virtual BitmapType asABitmap(SkBitmap* bitmap, SkMatrix* matrix,
- TileMode* mode) const SK_OVERRIDE {
+ TileMode* mode) const override {
return fProxyShader->asABitmap(bitmap, matrix, mode);
}
- GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE {
+ GradientType asAGradient(GradientInfo* info) const override {
return fProxyShader->asAGradient(info);
}
@@ -36,7 +36,7 @@ public:
virtual bool asFragmentProcessor(GrContext* context, const SkPaint& paint,
const SkMatrix& viewM, const SkMatrix* localMatrix,
- GrColor* grColor, GrFragmentProcessor** fp) const SK_OVERRIDE {
+ GrColor* grColor, GrFragmentProcessor** fp) const override {
SkMatrix tmp = this->getLocalMatrix();
if (localMatrix) {
tmp.preConcat(*localMatrix);
@@ -48,14 +48,14 @@ public:
virtual bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&,
const SkMatrix*, GrColor*,
- GrFragmentProcessor**) const SK_OVERRIDE {
+ GrFragmentProcessor**) const override {
SkDEBUGFAIL("Should not call in GPU-less build");
return false;
}
#endif
- SkShader* refAsALocalMatrixShader(SkMatrix* localMatrix) const SK_OVERRIDE {
+ SkShader* refAsALocalMatrixShader(SkMatrix* localMatrix) const override {
if (localMatrix) {
*localMatrix = this->getLocalMatrix();
}
@@ -66,8 +66,8 @@ public:
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLocalMatrixShader)
protected:
- void flatten(SkWriteBuffer&) const SK_OVERRIDE;
- Context* onCreateContext(const ContextRec&, void*) const SK_OVERRIDE;
+ void flatten(SkWriteBuffer&) const override;
+ Context* onCreateContext(const ContextRec&, void*) const override;
private:
SkAutoTUnref<SkShader> fProxyShader;
« no previous file with comments | « src/core/SkImageFilter.cpp ('k') | src/core/SkMaskCache.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698