Chromium Code Reviews| Index: gpu/ipc/common/surface_handle.h |
| diff --git a/gpu/ipc/common/surface_handle.h b/gpu/ipc/common/surface_handle.h |
| index a0009b2ab03431aab12ba255835293d8b5778fb6..966209d49a35a2e2f84c0f667b93d07b61e53e11 100644 |
| --- a/gpu/ipc/common/surface_handle.h |
| +++ b/gpu/ipc/common/surface_handle.h |
| @@ -29,7 +29,11 @@ namespace gpu { |
| // be defined, because some APIs that use it are referenced there. |
| #if defined(GPU_SURFACE_HANDLE_IS_ACCELERATED_WINDOW) |
| using SurfaceHandle = gfx::AcceleratedWidget; |
| -const SurfaceHandle kNullSurfaceHandle = gfx::kNullAcceleratedWidget; |
| +#if defined(OS_WIN) |
| +const SurfaceHandle kNullSurfaceHandle = NULL; |
|
ccameron
2016/09/28 19:16:27
win-clang doesn't allow this definition in a heade
dcheng
2016/09/28 20:32:43
Can we just make it a constexpr? That should get r
|
| +#else |
| +const SurfaceHandle kNullSurfaceHandle = 0; |
| +#endif |
| #elif defined(OS_MACOSX) || defined(OS_ANDROID) || defined(OS_NACL) |
| using SurfaceHandle = int32_t; |
| const SurfaceHandle kNullSurfaceHandle = 0; |