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

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

Issue 10392068: ui: Move gl/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac_rel Created 8 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « ui/gl/gl_context_egl.h ('k') | ui/gl/gl_context_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 (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/gfx/gl/gl_context_egl.h" 5 #include "ui/gl/gl_context_egl.h"
6 6
7 #include "base/debug/trace_event.h" 7 #include "base/debug/trace_event.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
11 #include "third_party/angle/include/EGL/egl.h" 11 #include "third_party/angle/include/EGL/egl.h"
12 #include "ui/gfx/gl/egl_util.h" 12 #include "ui/gl/egl_util.h"
13 #include "ui/gfx/gl/gl_surface.h" 13 #include "ui/gl/gl_surface.h"
14 14
15 // This header must come after the above third-party include, as 15 // This header must come after the above third-party include, as
16 // it brings in #defines that cause conflicts. 16 // it brings in #defines that cause conflicts.
17 #include "ui/gfx/gl/gl_bindings.h" 17 #include "ui/gl/gl_bindings.h"
18 18
19 #if defined(USE_X11) 19 #if defined(USE_X11)
20 extern "C" { 20 extern "C" {
21 #include <X11/Xlib.h> 21 #include <X11/Xlib.h>
22 } 22 }
23 #endif 23 #endif
24 24
25 namespace gfx { 25 namespace gfx {
26 26
27 std::string GLContextEGL::GetExtensions() { 27 std::string GLContextEGL::GetExtensions() {
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 151
152 void GLContextEGL::SetSwapInterval(int interval) { 152 void GLContextEGL::SetSwapInterval(int interval) {
153 DCHECK(IsCurrent(NULL)); 153 DCHECK(IsCurrent(NULL));
154 if (!eglSwapInterval(display_, interval)) { 154 if (!eglSwapInterval(display_, interval)) {
155 LOG(ERROR) << "eglSwapInterval failed with error " 155 LOG(ERROR) << "eglSwapInterval failed with error "
156 << GetLastEGLErrorString(); 156 << GetLastEGLErrorString();
157 } 157 }
158 } 158 }
159 159
160 } // namespace gfx 160 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gl/gl_context_egl.h ('k') | ui/gl/gl_context_glx.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698