Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Unified Diff: experimental/iOSSampleApp/SkSampleUIView.mm

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « experimental/StrokePathRenderer/GrStrokePathRenderer.h ('k') | experimental/tools/PageCachingDocument.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: experimental/iOSSampleApp/SkSampleUIView.mm
diff --git a/experimental/iOSSampleApp/SkSampleUIView.mm b/experimental/iOSSampleApp/SkSampleUIView.mm
index 1d27e11469e98e2c5f6af700e027dce06c466f21..0d7a4db2bd170cc1015d8e2860e925e526c0435b 100644
--- a/experimental/iOSSampleApp/SkSampleUIView.mm
+++ b/experimental/iOSSampleApp/SkSampleUIView.mm
@@ -40,7 +40,7 @@ public:
#endif
}
- void setUpBackend(SampleWindow* win, int msaaSampleCount) SK_OVERRIDE {
+ void setUpBackend(SampleWindow* win, int msaaSampleCount) override {
SkASSERT(SkOSWindow::kNone_BackEndType == fBackend);
fBackend = SkOSWindow::kNone_BackEndType;
@@ -101,7 +101,7 @@ public:
this->windowSizeChanged(win);
}
- void tearDownBackend(SampleWindow *win) SK_OVERRIDE {
+ void tearDownBackend(SampleWindow *win) override {
#if SK_SUPPORT_GPU
SkSafeUnref(fCurContext);
fCurContext = NULL;
@@ -116,7 +116,7 @@ public:
fBackend = SampleWindow::kNone_BackEndType;
}
- SkSurface* createSurface(SampleWindow::DeviceType dType, SampleWindow* win) SK_OVERRIDE{
+ SkSurface* createSurface(SampleWindow::DeviceType dType, SampleWindow* win) override{
#if SK_SUPPORT_GPU
if (SampleWindow::IsGpuDeviceType(dType) && fCurContext) {
SkSurfaceProps props(win->getSurfaceProps());
@@ -128,7 +128,7 @@ public:
virtual void publishCanvas(SampleWindow::DeviceType dType,
SkCanvas* canvas,
- SampleWindow* win) SK_OVERRIDE {
+ SampleWindow* win) override {
#if SK_SUPPORT_GPU
if (NULL != fCurContext) {
fCurContext->flush();
@@ -137,7 +137,7 @@ public:
win->present();
}
- void windowSizeChanged(SampleWindow* win) SK_OVERRIDE {
+ void windowSizeChanged(SampleWindow* win) override {
#if SK_SUPPORT_GPU
if (NULL != fCurContext) {
SkOSWindow::AttachmentInfo info;
@@ -159,7 +159,7 @@ public:
#endif
}
- GrContext* getGrContext() SK_OVERRIDE {
+ GrContext* getGrContext() override {
#if SK_SUPPORT_GPU
return fCurContext;
#else
@@ -167,7 +167,7 @@ public:
#endif
}
- GrRenderTarget* getGrRenderTarget() SK_OVERRIDE {
+ GrRenderTarget* getGrRenderTarget() override {
#if SK_SUPPORT_GPU
return fCurRenderTarget;
#else
« no previous file with comments | « experimental/StrokePathRenderer/GrStrokePathRenderer.h ('k') | experimental/tools/PageCachingDocument.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698