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 /example/HelloWorld.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 'example/HelloWorld.h')
| -rw-r--r-- | example/HelloWorld.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/example/HelloWorld.h b/example/HelloWorld.h index e5cde271bf..a1508c582d 100644 --- a/example/HelloWorld.h +++ b/example/HelloWorld.h @@ -25,7 +25,7 @@ public: kGPU_DeviceType, }; HelloWorldWindow(void* hwnd); - virtual ~HelloWorldWindow() SK_OVERRIDE; + virtual ~HelloWorldWindow() override; // Changes the device type of the object. bool setUpBackend(); @@ -33,7 +33,7 @@ public: DeviceType getDeviceType() const { return fType; } protected: - SkSurface* createSurface() SK_OVERRIDE { + SkSurface* createSurface() override { if (kGPU_DeviceType == fType) { SkSurfaceProps props(INHERITED::getSurfaceProps()); return SkSurface::NewRenderTargetDirect(fRenderTarget, &props); @@ -43,16 +43,16 @@ protected: return fSurface = SkSurface::NewRaster(info); } - void draw(SkCanvas* canvas) SK_OVERRIDE; + void draw(SkCanvas* canvas) override; void drawContents(SkCanvas* canvas); - void onSizeChange() SK_OVERRIDE; + void onSizeChange() override; private: bool findNextMatch(); // Set example to the first one that matches FLAGS_match. void setTitle(); void setUpRenderTarget(); - bool onHandleChar(SkUnichar unichar) SK_OVERRIDE; + bool onHandleChar(SkUnichar unichar) override; void tearDownBackend(); // draw contents |