| OLD | NEW |
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/gl/egl_util.h" | 5 #include "ui/gl/egl_util.h" |
| 6 | 6 |
| 7 #include "build/build_config.h" |
| 8 |
| 7 #if defined(OS_ANDROID) | 9 #if defined(OS_ANDROID) |
| 8 #include <EGL/egl.h> | 10 #include <EGL/egl.h> |
| 9 #else | 11 #else |
| 10 #include "third_party/khronos/EGL/egl.h" | 12 #include "third_party/khronos/EGL/egl.h" |
| 11 #endif | 13 #endif |
| 12 | 14 |
| 13 // This needs to be after the EGL includes | 15 // This needs to be after the EGL includes |
| 14 #include "ui/gl/gl_bindings.h" | 16 #include "ui/gl/gl_bindings.h" |
| 15 | 17 |
| 16 namespace ui { | 18 namespace ui { |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 return "UNKNOWN"; | 53 return "UNKNOWN"; |
| 52 } | 54 } |
| 53 } | 55 } |
| 54 | 56 |
| 55 // Returns the last EGL error as a string. | 57 // Returns the last EGL error as a string. |
| 56 const char* GetLastEGLErrorString() { | 58 const char* GetLastEGLErrorString() { |
| 57 return GetEGLErrorString(eglGetError()); | 59 return GetEGLErrorString(eglGetError()); |
| 58 } | 60 } |
| 59 | 61 |
| 60 } // namespace ui | 62 } // namespace ui |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1545113002:
Switch to standard integer types in ui/gl/. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master