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

Unified Diff: samplecode/SampleApp.h

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 | « samplecode/SampleAnimBlur.cpp ('k') | samplecode/SampleApp.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: samplecode/SampleApp.h
diff --git a/samplecode/SampleApp.h b/samplecode/SampleApp.h
index 990ad0b6be6e9bb03e050b1af976e85eb9e2ff44..55e3f555a30c15c8f26bb3f7315457ae3b7ea0b8 100644
--- a/samplecode/SampleApp.h
+++ b/samplecode/SampleApp.h
@@ -99,7 +99,7 @@ public:
SampleWindow(void* hwnd, int argc, char** argv, DeviceManager*);
virtual ~SampleWindow();
- SkSurface* createSurface() SK_OVERRIDE {
+ SkSurface* createSurface() override {
SkSurface* surface = NULL;
if (fDevManager) {
surface = fDevManager->createSurface(fDeviceType, this);
@@ -110,7 +110,7 @@ public:
return surface;
}
- void draw(SkCanvas*) SK_OVERRIDE;
+ void draw(SkCanvas*) override;
void setDeviceType(DeviceType type);
void toggleRendering();
@@ -136,24 +136,24 @@ public:
DeviceType getDeviceType() const { return fDeviceType; }
protected:
- void onDraw(SkCanvas* canvas) SK_OVERRIDE;
- bool onHandleKey(SkKey key) SK_OVERRIDE;
- bool onHandleChar(SkUnichar) SK_OVERRIDE;
- void onSizeChange() SK_OVERRIDE;
+ void onDraw(SkCanvas* canvas) override;
+ bool onHandleKey(SkKey key) override;
+ bool onHandleChar(SkUnichar) override;
+ void onSizeChange() override;
- SkCanvas* beforeChildren(SkCanvas*) SK_OVERRIDE;
- void afterChildren(SkCanvas*) SK_OVERRIDE;
- void beforeChild(SkView* child, SkCanvas* canvas) SK_OVERRIDE;
- void afterChild(SkView* child, SkCanvas* canvas) SK_OVERRIDE;
+ SkCanvas* beforeChildren(SkCanvas*) override;
+ void afterChildren(SkCanvas*) override;
+ void beforeChild(SkView* child, SkCanvas* canvas) override;
+ void afterChild(SkView* child, SkCanvas* canvas) override;
- bool onEvent(const SkEvent& evt) SK_OVERRIDE;
- bool onQuery(SkEvent* evt) SK_OVERRIDE;
+ bool onEvent(const SkEvent& evt) override;
+ bool onQuery(SkEvent* evt) override;
virtual bool onDispatchClick(int x, int y, Click::State, void* owner,
- unsigned modi) SK_OVERRIDE;
- bool onClick(Click* click) SK_OVERRIDE;
+ unsigned modi) override;
+ bool onClick(Click* click) override;
virtual Click* onFindClickHandler(SkScalar x, SkScalar y,
- unsigned modi) SK_OVERRIDE;
+ unsigned modi) override;
private:
class DefaultDeviceManager;
« no previous file with comments | « samplecode/SampleAnimBlur.cpp ('k') | samplecode/SampleApp.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698