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

Side by Side Diff: example/HelloWorld.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, 8 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 unified diff | Download patch
« no previous file with comments | « dm/DMSrcSinkAndroid.cpp ('k') | experimental/AndroidPathRenderer/GrAndroidPathRenderer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2015 Google Inc. 2 * Copyright 2015 Google Inc.
3 * 3 *
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 * 7 *
8 */ 8 */
9 9
10 #ifndef HelloWorld_DEFINED 10 #ifndef HelloWorld_DEFINED
11 #define HelloWorld_DEFINED 11 #define HelloWorld_DEFINED
12 12
13 #include "SkSurface.h" 13 #include "SkSurface.h"
14 #include "SkWindow.h" 14 #include "SkWindow.h"
15 15
16 class GrContext; 16 class GrContext;
17 struct GrGLInterface; 17 struct GrGLInterface;
18 class GrRenderTarget; 18 class GrRenderTarget;
19 class SkCanvas; 19 class SkCanvas;
20 20
21 class HelloWorldWindow : public SkOSWindow { 21 class HelloWorldWindow : public SkOSWindow {
22 public: 22 public:
23 enum DeviceType { 23 enum DeviceType {
24 kRaster_DeviceType, 24 kRaster_DeviceType,
25 kGPU_DeviceType, 25 kGPU_DeviceType,
26 }; 26 };
27 HelloWorldWindow(void* hwnd); 27 HelloWorldWindow(void* hwnd);
28 virtual ~HelloWorldWindow() SK_OVERRIDE; 28 virtual ~HelloWorldWindow() override;
29 29
30 // Changes the device type of the object. 30 // Changes the device type of the object.
31 bool setUpBackend(); 31 bool setUpBackend();
32 32
33 DeviceType getDeviceType() const { return fType; } 33 DeviceType getDeviceType() const { return fType; }
34 34
35 protected: 35 protected:
36 SkSurface* createSurface() SK_OVERRIDE { 36 SkSurface* createSurface() override {
37 if (kGPU_DeviceType == fType) { 37 if (kGPU_DeviceType == fType) {
38 SkSurfaceProps props(INHERITED::getSurfaceProps()); 38 SkSurfaceProps props(INHERITED::getSurfaceProps());
39 return SkSurface::NewRenderTargetDirect(fRenderTarget, &props); 39 return SkSurface::NewRenderTargetDirect(fRenderTarget, &props);
40 } 40 }
41 static const SkImageInfo info = SkImageInfo::MakeN32Premul( 41 static const SkImageInfo info = SkImageInfo::MakeN32Premul(
42 SkScalarRoundToInt(this->width()), SkScalarRoundToInt(this->heig ht())); 42 SkScalarRoundToInt(this->width()), SkScalarRoundToInt(this->heig ht()));
43 return fSurface = SkSurface::NewRaster(info); 43 return fSurface = SkSurface::NewRaster(info);
44 } 44 }
45 45
46 void draw(SkCanvas* canvas) SK_OVERRIDE; 46 void draw(SkCanvas* canvas) override;
47 void drawContents(SkCanvas* canvas); 47 void drawContents(SkCanvas* canvas);
48 48
49 void onSizeChange() SK_OVERRIDE; 49 void onSizeChange() override;
50 50
51 private: 51 private:
52 bool findNextMatch(); // Set example to the first one that matches FLAGS_ma tch. 52 bool findNextMatch(); // Set example to the first one that matches FLAGS_ma tch.
53 void setTitle(); 53 void setTitle();
54 void setUpRenderTarget(); 54 void setUpRenderTarget();
55 bool onHandleChar(SkUnichar unichar) SK_OVERRIDE; 55 bool onHandleChar(SkUnichar unichar) override;
56 void tearDownBackend(); 56 void tearDownBackend();
57 57
58 // draw contents 58 // draw contents
59 SkScalar fRotationAngle; 59 SkScalar fRotationAngle;
60 60
61 // support framework 61 // support framework
62 DeviceType fType; 62 DeviceType fType;
63 SkSurface* fSurface; 63 SkSurface* fSurface;
64 GrContext* fContext; 64 GrContext* fContext;
65 GrRenderTarget* fRenderTarget; 65 GrRenderTarget* fRenderTarget;
66 AttachmentInfo fAttachmentInfo; 66 AttachmentInfo fAttachmentInfo;
67 const GrGLInterface* fInterface; 67 const GrGLInterface* fInterface;
68 68
69 typedef SkOSWindow INHERITED; 69 typedef SkOSWindow INHERITED;
70 }; 70 };
71 71
72 #endif 72 #endif
OLDNEW
« no previous file with comments | « dm/DMSrcSinkAndroid.cpp ('k') | experimental/AndroidPathRenderer/GrAndroidPathRenderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698