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

Side by Side Diff: ui/gl/gl_bindings.cc

Issue 1545113002: Switch to standard integer types in ui/gl/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 | « ui/gl/gl_bindings.h ('k') | ui/gl/gl_bindings_api_autogen_glx.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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "build/build_config.h"
6
5 #if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || defined(USE_OZ ONE) 7 #if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || defined(USE_OZ ONE)
6 #include <EGL/egl.h> 8 #include <EGL/egl.h>
7 #endif 9 #endif
8 10
9 #include "ui/gl/gl_bindings.h" 11 #include "ui/gl/gl_bindings.h"
10 12
11 #if defined(USE_X11) 13 #if defined(USE_X11)
12 #include "ui/gfx/x/x11_types.h" 14 #include "ui/gfx/x/x11_types.h"
13 #endif 15 #endif
14 16
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 #endif 55 #endif
54 56
55 #if defined(USE_X11) 57 #if defined(USE_X11)
56 std::string DriverGLX::GetPlatformExtensions() { 58 std::string DriverGLX::GetPlatformExtensions() {
57 const char* str = glXQueryExtensionsString(gfx::GetXDisplay(), 0); 59 const char* str = glXQueryExtensionsString(gfx::GetXDisplay(), 0);
58 return str ? std::string(str) : ""; 60 return str ? std::string(str) : "";
59 } 61 }
60 #endif 62 #endif
61 63
62 } // namespace gfx 64 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gl/gl_bindings.h ('k') | ui/gl/gl_bindings_api_autogen_glx.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698