diff options
| author |  mtklein <mtklein@chromium.org> | 2015-03-25 18:17:31 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-25 18:17:32 -0700 |
| commit | 36352bf5e38f45a70ee4f4fc132a38048d38206d (patch) | |
| tree | 24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /include/effects/SkMergeImageFilter.h | |
| parent | 02fd592c8d190058652bb715fb34feb7a72992e5 (diff) | |
C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}
NOPRESUBMIT=true
BUG=skia:
DOCS_PREVIEW= https://skia.org/?cl=1037793002
Review URL: https://codereview.chromium.org/1037793002
Diffstat (limited to 'include/effects/SkMergeImageFilter.h')
| -rw-r--r-- | include/effects/SkMergeImageFilter.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h index 52ff9d7776..5bb6826b6b 100644 --- a/include/effects/SkMergeImageFilter.h +++ b/include/effects/SkMergeImageFilter.h @@ -36,10 +36,10 @@ protected: SkMergeImageFilter(SkImageFilter* filters[], int count, const SkXfermode::Mode modes[], const CropRect* cropRect); - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, - SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE; + SkBitmap* result, SkIPoint* loc) const override; private: uint8_t* fModes; // SkXfermode::Mode |