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

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

Issue 476403002: Restrict usage of mesa headers to targets that really need them (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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_android.cc ('k') | ui/gl/gl_surface_glx.cc » ('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 // This include must be here so that the includes provided transitively
6 // by gl_surface_egl.h don't make it impossible to compile this code.
7 #include "third_party/mesa/src/include/GL/osmesa.h"
8
9 #include "ui/gl/gl_surface_egl.h" 5 #include "ui/gl/gl_surface_egl.h"
10 6
11 #if defined(OS_ANDROID) 7 #if defined(OS_ANDROID)
12 #include <android/native_window_jni.h> 8 #include <android/native_window_jni.h>
13 #endif 9 #endif
14 10
15 #include "base/debug/trace_event.h" 11 #include "base/debug/trace_event.h"
16 #include "base/logging.h" 12 #include "base/logging.h"
17 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
18 #include "base/message_loop/message_loop.h" 14 #include "base/message_loop/message_loop.h"
19 #include "build/build_config.h" 15 #include "build/build_config.h"
20 #include "ui/gfx/geometry/rect.h" 16 #include "ui/gfx/geometry/rect.h"
21 #include "ui/gl/egl_util.h" 17 #include "ui/gl/egl_util.h"
22 #include "ui/gl/gl_context.h" 18 #include "ui/gl/gl_context.h"
23 #include "ui/gl/gl_implementation.h" 19 #include "ui/gl/gl_implementation.h"
24 #include "ui/gl/gl_surface_osmesa.h"
25 #include "ui/gl/gl_surface_stub.h" 20 #include "ui/gl/gl_surface_stub.h"
26 #include "ui/gl/gl_switches.h" 21 #include "ui/gl/gl_switches.h"
27 #include "ui/gl/scoped_make_current.h" 22 #include "ui/gl/scoped_make_current.h"
28 #include "ui/gl/sync_control_vsync_provider.h" 23 #include "ui/gl/sync_control_vsync_provider.h"
29 24
30 #if defined(USE_X11) 25 #if defined(USE_X11)
31 extern "C" { 26 extern "C" {
32 #include <X11/Xlib.h> 27 #include <X11/Xlib.h>
33 } 28 }
34 #endif 29 #endif
(...skipping 618 matching lines...) Expand 10 before | Expand all | Expand 10 after
653 } 648 }
654 649
655 void* SurfacelessEGL::GetShareHandle() { 650 void* SurfacelessEGL::GetShareHandle() {
656 return NULL; 651 return NULL;
657 } 652 }
658 653
659 SurfacelessEGL::~SurfacelessEGL() { 654 SurfacelessEGL::~SurfacelessEGL() {
660 } 655 }
661 656
662 } // namespace gfx 657 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gl/gl_surface_android.cc ('k') | ui/gl/gl_surface_glx.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698