ui/gfx/gl/gl_context_linux.cc - Issue 6722026: Refactor: Move app/gfx/gl ==> ui/gfx/gl

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/gfx/gl/gl_context_linux.cc

Issue 6722026: Refactor: Move app/gfx/gl ==> ui/gfx/gl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Try removing a dep. Created 9 years, 8 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) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 file implements the ViewGLContext and PbufferGLContext classes.	5 // This file implements the ViewGLContext and PbufferGLContext classes.

6	6

7 #include "app/gfx/gl/gl_context.h"	7 #include "ui/gfx/gl/gl_context.h"

8	8

9 extern "C" {	9 extern "C" {

10 #include <X11/Xlib.h>	10 #include <X11/Xlib.h>

11 }	11 }

12	12

13 #include <GL/osmesa.h>	13 #include <GL/osmesa.h>

14	14

15 #include "app/gfx/gl/gl_bindings.h"

16 #include "app/gfx/gl/gl_context_egl.h"

17 #include "app/gfx/gl/gl_context_osmesa.h"

18 #include "app/gfx/gl/gl_context_stub.h"

19 #include "app/gfx/gl/gl_implementation.h"

20 #include "base/basictypes.h"	15 #include "base/basictypes.h"

21 #include "base/logging.h"	16 #include "base/logging.h"

22 #include "base/memory/scoped_ptr.h"	17 #include "base/memory/scoped_ptr.h"

23 #include "ui/base/x/x11_util.h"	18 #include "ui/base/x/x11_util.h"

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

	20 #include "ui/gfx/gl/gl_context_egl.h"

	21 #include "ui/gfx/gl/gl_context_osmesa.h"

	22 #include "ui/gfx/gl/gl_context_stub.h"

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

24	24

25 namespace {	25 namespace {

26	26

27 Display* GetXDisplayHelper() {	27 Display* GetXDisplayHelper() {

28 static Display* display = NULL;	28 static Display* display = NULL;

29	29

30 if (!display) {	30 if (!display) {

31 display = XOpenDisplay(NULL);	31 display = XOpenDisplay(NULL);

32 CHECK(display);	32 CHECK(display);

33 }	33 }

(...skipping 787 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
821 }	821 }

822 case kGLImplementationMockGL:	822 case kGLImplementationMockGL:

823 return new StubGLContext;	823 return new StubGLContext;

824 default:	824 default:

825 NOTREACHED();	825 NOTREACHED();

826 return NULL;	826 return NULL;

827 }	827 }

828 }	828 }

829	829

830 } // namespace gfx	830 } // namespace gfx

OLD	NEW

« no previous file with comments | « ui/gfx/gl/gl_context_egl.cc ('k') | ui/gfx/gl/gl_context_mac.cc » ('j') | no next file with comments »