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

Side by Side Diff: src/gpu/gl/win/SkCreatePlatformGLContext_win.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/mesa/SkMesaGLContext.h ('k') | src/image/SkImage_Gpu.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 8
9 #include "gl/SkGLContext.h" 9 #include "gl/SkGLContext.h"
10 10
11 #include <windows.h> 11 #include <windows.h>
12 #include <GL/GL.h> 12 #include <GL/GL.h>
13 #include "win/SkWGL.h" 13 #include "win/SkWGL.h"
14 14
15 #define WIN32_LEAN_AND_MEAN 15 #define WIN32_LEAN_AND_MEAN
16 #include <windows.h> 16 #include <windows.h>
17 17
18 namespace { 18 namespace {
19 19
20 class WinGLContext : public SkGLContext { 20 class WinGLContext : public SkGLContext {
21 public: 21 public:
22 WinGLContext(GrGLStandard forcedGpuAPI); 22 WinGLContext(GrGLStandard forcedGpuAPI);
23 » ~WinGLContext() SK_OVERRIDE; 23 » ~WinGLContext() override;
24 void makeCurrent() const SK_OVERRIDE; 24 void makeCurrent() const override;
25 void swapBuffers() const SK_OVERRIDE; 25 void swapBuffers() const override;
26 26
27 private: 27 private:
28 void destroyGLContext(); 28 void destroyGLContext();
29 29
30 HWND fWindow; 30 HWND fWindow;
31 HDC fDeviceContext; 31 HDC fDeviceContext;
32 HGLRC fGlRenderContext; 32 HGLRC fGlRenderContext;
33 static ATOM gWC; 33 static ATOM gWC;
34 SkWGLPbufferContext* fPbufferContext; 34 SkWGLPbufferContext* fPbufferContext;
35 }; 35 };
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 181
182 SkGLContext* SkCreatePlatformGLContext(GrGLStandard forcedGpuAPI) { 182 SkGLContext* SkCreatePlatformGLContext(GrGLStandard forcedGpuAPI) {
183 WinGLContext* ctx = SkNEW_ARGS(WinGLContext, (forcedGpuAPI)); 183 WinGLContext* ctx = SkNEW_ARGS(WinGLContext, (forcedGpuAPI));
184 if (!ctx->isValid()) { 184 if (!ctx->isValid()) {
185 SkDELETE(ctx); 185 SkDELETE(ctx);
186 return NULL; 186 return NULL;
187 } 187 }
188 return ctx; 188 return ctx;
189 } 189 }
190 190
OLDNEW
« no previous file with comments | « src/gpu/gl/mesa/SkMesaGLContext.h ('k') | src/image/SkImage_Gpu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698