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

Unified Diff: include/effects/SkColorMatrixFilter.h

Issue 806653007: Fix up all the easy virtual ... SK_OVERRIDE cases. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 5 years, 11 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/SkColorFilterImageFilter.h ('k') | include/effects/SkComposeImageFilter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/effects/SkColorMatrixFilter.h
diff --git a/include/effects/SkColorMatrixFilter.h b/include/effects/SkColorMatrixFilter.h
index 379ca5755a6e6a7b8561517fb830b485b2c40f21..b5ab689002f28465186d3eeea568c769b57f07ea 100644
--- a/include/effects/SkColorMatrixFilter.h
+++ b/include/effects/SkColorMatrixFilter.h
@@ -21,12 +21,12 @@ public:
}
// overrides from SkColorFilter
- virtual void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const SK_OVERRIDE;
- virtual void filterSpan16(const uint16_t src[], int count, uint16_t[]) const SK_OVERRIDE;
- virtual uint32_t getFlags() const SK_OVERRIDE;
- virtual bool asColorMatrix(SkScalar matrix[20]) const SK_OVERRIDE;
+ void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const SK_OVERRIDE;
+ void filterSpan16(const uint16_t src[], int count, uint16_t[]) const SK_OVERRIDE;
+ uint32_t getFlags() const SK_OVERRIDE;
+ bool asColorMatrix(SkScalar matrix[20]) const SK_OVERRIDE;
#if SK_SUPPORT_GPU
- virtual GrFragmentProcessor* asFragmentProcessor(GrContext*) const SK_OVERRIDE;
+ GrFragmentProcessor* asFragmentProcessor(GrContext*) const SK_OVERRIDE;
#endif
struct State {
@@ -41,7 +41,7 @@ public:
protected:
explicit SkColorMatrixFilter(const SkColorMatrix&);
explicit SkColorMatrixFilter(const SkScalar array[20]);
- virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+ void flatten(SkWriteBuffer&) const SK_OVERRIDE;
private:
SkColorMatrix fMatrix;
« no previous file with comments | « include/effects/SkColorFilterImageFilter.h ('k') | include/effects/SkComposeImageFilter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698