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

Side by Side Diff: include/gpu/gl/angle/SkANGLEGLContext.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 unified diff | Download patch
« no previous file with comments | « include/gpu/gl/SkNullGLContext.h ('k') | include/ports/SkFontMgr_indirect.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 /* 2 /*
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
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 #ifndef SkANGLEGLContext_DEFINED 8 #ifndef SkANGLEGLContext_DEFINED
9 #define SkANGLEGLContext_DEFINED 9 #define SkANGLEGLContext_DEFINED
10 10
11 #if SK_ANGLE 11 #if SK_ANGLE
12 12
13 #include "gl/SkGLContext.h" 13 #include "gl/SkGLContext.h"
14 14
15 class SkANGLEGLContext : public SkGLContext { 15 class SkANGLEGLContext : public SkGLContext {
16 public: 16 public:
17 ~SkANGLEGLContext() SK_OVERRIDE; 17 ~SkANGLEGLContext() override;
18 void makeCurrent() const SK_OVERRIDE; 18 void makeCurrent() const override;
19 void swapBuffers() const SK_OVERRIDE; 19 void swapBuffers() const override;
20 20
21 static SkANGLEGLContext* Create(GrGLStandard forcedGpuAPI) { 21 static SkANGLEGLContext* Create(GrGLStandard forcedGpuAPI) {
22 if (kGL_GrGLStandard == forcedGpuAPI) { 22 if (kGL_GrGLStandard == forcedGpuAPI) {
23 return NULL; 23 return NULL;
24 } 24 }
25 SkANGLEGLContext* ctx = SkNEW(SkANGLEGLContext); 25 SkANGLEGLContext* ctx = SkNEW(SkANGLEGLContext);
26 if (!ctx->isValid()) { 26 if (!ctx->isValid()) {
27 SkDELETE(ctx); 27 SkDELETE(ctx);
28 return NULL; 28 return NULL;
29 } 29 }
30 return ctx; 30 return ctx;
31 } 31 }
32 32
33 // The param is an EGLNativeDisplayType and the return is an EGLDispay. 33 // The param is an EGLNativeDisplayType and the return is an EGLDispay.
34 static void* GetD3DEGLDisplay(void* nativeDisplay); 34 static void* GetD3DEGLDisplay(void* nativeDisplay);
35 35
36 private: 36 private:
37 SkANGLEGLContext(); 37 SkANGLEGLContext();
38 void destroyGLContext(); 38 void destroyGLContext();
39 39
40 void* fContext; 40 void* fContext;
41 void* fDisplay; 41 void* fDisplay;
42 void* fSurface; 42 void* fSurface;
43 }; 43 };
44 44
45 #endif 45 #endif
46 46
47 #endif 47 #endif
OLDNEW
« no previous file with comments | « include/gpu/gl/SkNullGLContext.h ('k') | include/ports/SkFontMgr_indirect.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698