ui/gl/gl_surface_linux.cc - Issue 10392068: ui: Move gl/ directory out of gfx/, up to ui/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ui/gl/gl_surface_linux.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

OLD	NEW
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.h"	5 #include "ui/gl/gl_surface.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 "third_party/mesa/MesaLib/include/GL/osmesa.h"	10 #include "third_party/mesa/MesaLib/include/GL/osmesa.h"

11 #include "ui/gfx/gl/gl_bindings.h"	11 #include "ui/gl/gl_bindings.h"

12 #include "ui/gfx/gl/gl_implementation.h"	12 #include "ui/gl/gl_implementation.h"

13 #include "ui/gfx/gl/gl_surface_egl.h"	13 #include "ui/gl/gl_surface_egl.h"

14 #include "ui/gfx/gl/gl_surface_glx.h"	14 #include "ui/gl/gl_surface_glx.h"

15 #include "ui/gfx/gl/gl_surface_osmesa.h"	15 #include "ui/gl/gl_surface_osmesa.h"

16 #include "ui/gfx/gl/gl_surface_stub.h"	16 #include "ui/gl/gl_surface_stub.h"

17	17

18 namespace gfx {	18 namespace gfx {

19	19

20 namespace {	20 namespace {

21 Display* g_osmesa_display;	21 Display* g_osmesa_display;

22 } // namespace anonymous	22 } // namespace anonymous

23	23

24 // This OSMesa GL surface can use XLib to swap the contents of the buffer to a	24 // This OSMesa GL surface can use XLib to swap the contents of the buffer to a

25 // view.	25 // view.

26 class NativeViewGLSurfaceOSMesa : public GLSurfaceOSMesa {	26 class NativeViewGLSurfaceOSMesa : public GLSurfaceOSMesa {

(...skipping 303 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
330 }	330 }

331 case kGLImplementationMockGL:	331 case kGLImplementationMockGL:

332 return new GLSurfaceStub;	332 return new GLSurfaceStub;

333 default:	333 default:

334 NOTREACHED();	334 NOTREACHED();

335 return NULL;	335 return NULL;

336 }	336 }

337 }	337 }

338	338

339 } // namespace gfx	339 } // namespace gfx

OLD	NEW

« no previous file with comments | « ui/gl/gl_surface_glx.cc ('k') | ui/gl/gl_surface_mac.cc » ('j') | no next file with comments »