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

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

Issue 11416265: Linux: include system Mesa headers when using system Mesa. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 8 years 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_win.cc ('k') | ui/gl/gl_surface_linux.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 extern "C" { 5 extern "C" {
6 #include <X11/Xlib.h> 6 #include <X11/Xlib.h>
7 } 7 }
8 8
9 #include "ui/gl/gl_surface_glx.h" 9 #include "ui/gl/gl_surface_glx.h"
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/debug/trace_event.h" 12 #include "base/debug/trace_event.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
16 #include "base/message_loop.h" 16 #include "base/message_loop.h"
17 #include "base/process_util.h" 17 #include "base/process_util.h"
18 #include "base/synchronization/cancellation_flag.h" 18 #include "base/synchronization/cancellation_flag.h"
19 #include "base/synchronization/lock.h" 19 #include "base/synchronization/lock.h"
20 #include "base/threading/non_thread_safe.h" 20 #include "base/threading/non_thread_safe.h"
21 #include "base/threading/thread.h" 21 #include "base/threading/thread.h"
22 #include "base/time.h" 22 #include "base/time.h"
23 #include "third_party/mesa/MesaLib/include/GL/osmesa.h" 23 #include "third_party/mesa/include/osmesa.h"
24 #include "ui/base/x/x11_util.h" 24 #include "ui/base/x/x11_util.h"
25 #include "ui/gl/gl_bindings.h" 25 #include "ui/gl/gl_bindings.h"
26 #include "ui/gl/gl_implementation.h" 26 #include "ui/gl/gl_implementation.h"
27 27
28 namespace gfx { 28 namespace gfx {
29 29
30 namespace { 30 namespace {
31 31
32 // scoped_ptr functor for XFree(). Use as follows: 32 // scoped_ptr functor for XFree(). Use as follows:
33 // scoped_ptr_malloc<XVisualInfo, ScopedPtrXFree> foo(...); 33 // scoped_ptr_malloc<XVisualInfo, ScopedPtrXFree> foo(...);
(...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after
661 661
662 void* PbufferGLSurfaceGLX::GetConfig() { 662 void* PbufferGLSurfaceGLX::GetConfig() {
663 return config_; 663 return config_;
664 } 664 }
665 665
666 PbufferGLSurfaceGLX::~PbufferGLSurfaceGLX() { 666 PbufferGLSurfaceGLX::~PbufferGLSurfaceGLX() {
667 Destroy(); 667 Destroy();
668 } 668 }
669 669
670 } // namespace gfx 670 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gl/gl_context_win.cc ('k') | ui/gl/gl_surface_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698