| Index: samplecode/SampleApp.cpp
|
| diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
|
| index ae304790523c4fe44e6f0ddac9993d0dc7b7dd7d..9b5a972ec835346e713a6669b71761db3f8582a7 100644
|
| --- a/samplecode/SampleApp.cpp
|
| +++ b/samplecode/SampleApp.cpp
|
| @@ -48,7 +48,7 @@ class PictFileFactory : public SkViewFactory {
|
| SkString fFilename;
|
| public:
|
| PictFileFactory(const SkString& filename) : fFilename(filename) {}
|
| - SkView* operator() () const SK_OVERRIDE {
|
| + SkView* operator() () const override {
|
| return CreateSamplePictFileView(fFilename.c_str());
|
| }
|
| };
|
| @@ -60,7 +60,7 @@ class PdfFileViewerFactory : public SkViewFactory {
|
| SkString fFilename;
|
| public:
|
| PdfFileViewerFactory(const SkString& filename) : fFilename(filename) {}
|
| - SkView* operator() () const SK_OVERRIDE {
|
| + SkView* operator() () const override {
|
| return CreateSamplePdfFileViewer(fFilename.c_str());
|
| }
|
| };
|
| @@ -270,7 +270,7 @@ public:
|
| }
|
|
|
| virtual SkSurface* createSurface(SampleWindow::DeviceType dType,
|
| - SampleWindow* win) SK_OVERRIDE {
|
| + SampleWindow* win) override {
|
| #if SK_SUPPORT_GPU
|
| if (IsGpuDeviceType(dType) && fCurContext) {
|
| SkSurfaceProps props(win->getSurfaceProps());
|
| @@ -324,7 +324,7 @@ public:
|
| #endif
|
| }
|
|
|
| - GrRenderTarget* getGrRenderTarget() SK_OVERRIDE {
|
| + GrRenderTarget* getGrRenderTarget() override {
|
| #if SK_SUPPORT_GPU
|
| return fCurRenderTarget;
|
| #else
|
|
|