Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/GLTestContext.h" | 9 #include "gl/GLTestContext.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 | |
| 16 #include <windows.h> | 15 #include <windows.h> |
|
bungeman-skia
2016/06/10 15:25:49
heh, do we really include windows.h twice here?
| |
| 17 | 16 |
| 18 namespace { | 17 namespace { |
| 19 | 18 |
| 20 class WinGLTestContext : public sk_gpu_test::GLTestContext { | 19 class WinGLTestContext : public sk_gpu_test::GLTestContext { |
| 21 public: | 20 public: |
| 22 WinGLTestContext(GrGLStandard forcedGpuAPI); | 21 WinGLTestContext(GrGLStandard forcedGpuAPI); |
| 23 ~WinGLTestContext() override; | 22 ~WinGLTestContext() override; |
| 24 | 23 |
| 25 private: | 24 private: |
| 26 void destroyGLContext(); | 25 void destroyGLContext(); |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 196 } | 195 } |
| 197 WinGLTestContext *ctx = new WinGLTestContext(forcedGpuAPI); | 196 WinGLTestContext *ctx = new WinGLTestContext(forcedGpuAPI); |
| 198 if (!ctx->isValid()) { | 197 if (!ctx->isValid()) { |
| 199 delete ctx; | 198 delete ctx; |
| 200 return nullptr; | 199 return nullptr; |
| 201 } | 200 } |
| 202 return ctx; | 201 return ctx; |
| 203 } | 202 } |
| 204 } // namespace sk_gpu_test | 203 } // namespace sk_gpu_test |
| 205 | 204 |
| OLD | NEW |