| Index: src/pipe/utils/SamplePipeControllers.h
|
| diff --git a/src/pipe/utils/SamplePipeControllers.h b/src/pipe/utils/SamplePipeControllers.h
|
| index 35cfba73b65ebcb89ea20be24cf0b536e177df5d..3442c49d675dcaaea87ad2d1c2718a5e818da850 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();
|
| - virtual void* requestBlock(size_t minRequest, size_t* actual) SK_OVERRIDE;
|
| - virtual void notifyWritten(size_t bytes) SK_OVERRIDE;
|
| + void* requestBlock(size_t minRequest, size_t* actual) SK_OVERRIDE;
|
| + void notifyWritten(size_t bytes) SK_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() {};
|
| - virtual void notifyWritten(size_t bytes) SK_OVERRIDE;
|
| - virtual int numberOfReaders() const SK_OVERRIDE { return NumberOfTiles; }
|
| + void notifyWritten(size_t bytes) SK_OVERRIDE;
|
| + int numberOfReaders() const SK_OVERRIDE { return NumberOfTiles; }
|
| private:
|
| enum {
|
| NumberOfTiles = 10
|
| @@ -57,9 +57,9 @@ private:
|
| class ThreadSafePipeController : public SkGPipeController {
|
| public:
|
| ThreadSafePipeController(int numberOfReaders);
|
| - virtual void* requestBlock(size_t minRequest, size_t* actual) SK_OVERRIDE;
|
| - virtual void notifyWritten(size_t bytes) SK_OVERRIDE;
|
| - virtual int numberOfReaders() const SK_OVERRIDE { return fNumberOfReaders; }
|
| + void* requestBlock(size_t minRequest, size_t* actual) SK_OVERRIDE;
|
| + void notifyWritten(size_t bytes) SK_OVERRIDE;
|
| + int numberOfReaders() const SK_OVERRIDE { return fNumberOfReaders; }
|
|
|
| /**
|
| * Play the stored drawing commands to the specified canvas. If SkGPipeWriter::startRecording
|
|
|