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 /src/pipe/utils | |
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 'src/pipe/utils')
-rw-r--r-- | src/pipe/utils/SamplePipeControllers.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/pipe/utils/SamplePipeControllers.h b/src/pipe/utils/SamplePipeControllers.h index 3442c49d67..5e074c565c 100644 --- a/src/pipe/utils/SamplePipeControllers.h +++ b/src/pipe/utils/SamplePipeControllers.h @@ -18,8 +18,8 @@ class PipeController : public SkGPipeController { public: PipeController(SkCanvas* target, SkPicture::InstallPixelRefProc proc = NULL); virtual ~PipeController(); - void* requestBlock(size_t minRequest, size_t* actual) SK_OVERRIDE; - void notifyWritten(size_t bytes) SK_OVERRIDE; + void* requestBlock(size_t minRequest, size_t* actual) override; + void notifyWritten(size_t bytes) override; protected: const void* getData() { return (const char*) fBlock + fBytesWritten; } SkGPipeReader fReader; @@ -37,8 +37,8 @@ public: TiledPipeController(const SkBitmap&, SkPicture::InstallPixelRefProc proc = NULL, const SkMatrix* initialMatrix = NULL); virtual ~TiledPipeController() {}; - void notifyWritten(size_t bytes) SK_OVERRIDE; - int numberOfReaders() const SK_OVERRIDE { return NumberOfTiles; } + void notifyWritten(size_t bytes) override; + int numberOfReaders() const override { return NumberOfTiles; } private: enum { NumberOfTiles = 10 @@ -57,9 +57,9 @@ private: class ThreadSafePipeController : public SkGPipeController { public: ThreadSafePipeController(int numberOfReaders); - void* requestBlock(size_t minRequest, size_t* actual) SK_OVERRIDE; - void notifyWritten(size_t bytes) SK_OVERRIDE; - int numberOfReaders() const SK_OVERRIDE { return fNumberOfReaders; } + void* requestBlock(size_t minRequest, size_t* actual) override; + void notifyWritten(size_t bytes) override; + int numberOfReaders() const override { return fNumberOfReaders; } /** * Play the stored drawing commands to the specified canvas. If SkGPipeWriter::startRecording |