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

Side by Side Diff: ui/gl/gl_surface_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_surface_egl.h ('k') | ui/gl/gl_surface_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_surface_egl.h" 5 #include "ui/gl/gl_surface_egl.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
11 #if !defined(OS_ANDROID) 11 #if !defined(OS_ANDROID)
12 #include "third_party/angle/include/EGL/egl.h" 12 #include "third_party/angle/include/EGL/egl.h"
13 #include "third_party/angle/include/EGL/eglext.h" 13 #include "third_party/angle/include/EGL/eglext.h"
14 #endif 14 #endif
15 #include "ui/gfx/gl/egl_util.h" 15 #include "ui/gl/egl_util.h"
16 #include "ui/gfx/gl/gl_context.h" 16 #include "ui/gl/gl_context.h"
17 17
18 #if defined(OS_ANDROID) 18 #if defined(OS_ANDROID)
19 #include <EGL/egl.h> 19 #include <EGL/egl.h>
20 #endif 20 #endif
21 21
22 // This header must come after the above third-party include, as 22 // This header must come after the above third-party include, as
23 // it brings in #defines that cause conflicts. 23 // it brings in #defines that cause conflicts.
24 #include "ui/gfx/gl/gl_bindings.h" 24 #include "ui/gl/gl_bindings.h"
25 25
26 #if defined(USE_X11) 26 #if defined(USE_X11)
27 extern "C" { 27 extern "C" {
28 #include <X11/Xlib.h> 28 #include <X11/Xlib.h>
29 } 29 }
30 #endif 30 #endif
31 31
32 namespace gfx { 32 namespace gfx {
33 33
34 namespace { 34 namespace {
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE, 389 EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE,
390 &handle)) { 390 &handle)) {
391 return NULL; 391 return NULL;
392 } 392 }
393 393
394 return handle; 394 return handle;
395 #endif 395 #endif
396 } 396 }
397 397
398 } // namespace gfx 398 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gl/gl_surface_egl.h ('k') | ui/gl/gl_surface_glx.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698