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 /samplecode/SampleApp.cpp | |
| 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 'samplecode/SampleApp.cpp')
| -rw-r--r-- | samplecode/SampleApp.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index ae30479052..9b5a972ec8 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 |