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

Side by Side Diff: src/gpu/gl/mac/SkCreatePlatformGLContext_mac.cpp

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 | « src/gpu/gl/iOS/SkCreatePlatformGLContext_iOS.mm ('k') | src/gpu/gl/mesa/SkMesaGLContext.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 2011 Google Inc. 3 * Copyright 2011 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 #include "gl/SkGLContext.h" 8 #include "gl/SkGLContext.h"
9 #include "AvailabilityMacros.h" 9 #include "AvailabilityMacros.h"
10 10
11 #include <OpenGL/OpenGL.h> 11 #include <OpenGL/OpenGL.h>
12 12
13 namespace { 13 namespace {
14 class MacGLContext : public SkGLContext { 14 class MacGLContext : public SkGLContext {
15 public: 15 public:
16 MacGLContext(); 16 MacGLContext();
17 ~MacGLContext() SK_OVERRIDE; 17 ~MacGLContext() 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 private: 21 private:
22 void destroyGLContext(); 22 void destroyGLContext();
23 23
24 CGLContextObj fContext; 24 CGLContextObj fContext;
25 }; 25 };
26 26
27 MacGLContext::MacGLContext() 27 MacGLContext::MacGLContext()
28 : fContext(NULL) { 28 : fContext(NULL) {
29 CGLPixelFormatAttribute attributes[] = { 29 CGLPixelFormatAttribute attributes[] = {
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 if (kGLES_GrGLStandard == forcedGpuAPI) { 92 if (kGLES_GrGLStandard == forcedGpuAPI) {
93 return NULL; 93 return NULL;
94 } 94 }
95 MacGLContext* ctx = SkNEW(MacGLContext); 95 MacGLContext* ctx = SkNEW(MacGLContext);
96 if (!ctx->isValid()) { 96 if (!ctx->isValid()) {
97 SkDELETE(ctx); 97 SkDELETE(ctx);
98 return NULL; 98 return NULL;
99 } 99 }
100 return ctx; 100 return ctx;
101 } 101 }
OLDNEW
« no previous file with comments | « src/gpu/gl/iOS/SkCreatePlatformGLContext_iOS.mm ('k') | src/gpu/gl/mesa/SkMesaGLContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698