ui/gl/gl_surface_mac.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_mac.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 "third_party/mesa/MesaLib/include/GL/osmesa.h"	9 #include "third_party/mesa/MesaLib/include/GL/osmesa.h"

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

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

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

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

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

15	15

16 #if defined(USE_AURA)	16 #if defined(USE_AURA)

17 #include "ui/gfx/gl/gl_surface_nsview.h"	17 #include "ui/gl/gl_surface_nsview.h"

18 #endif	18 #endif

19	19

20 namespace gfx {	20 namespace gfx {

21	21

22 bool GLSurface::InitializeOneOffInternal() {	22 bool GLSurface::InitializeOneOffInternal() {

23 switch (GetGLImplementation()) {	23 switch (GetGLImplementation()) {

24 case kGLImplementationDesktopGL:	24 case kGLImplementationDesktopGL:

25 case kGLImplementationAppleGL:	25 case kGLImplementationAppleGL:

26 if (!GLSurfaceCGL::InitializeOneOff()) {	26 if (!GLSurfaceCGL::InitializeOneOff()) {

27 LOG(ERROR) << "GLSurfaceCGL::InitializeOneOff failed.";	27 LOG(ERROR) << "GLSurfaceCGL::InitializeOneOff failed.";

(...skipping 58 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
86 }	86 }

87 case kGLImplementationMockGL:	87 case kGLImplementationMockGL:

88 return new GLSurfaceStub;	88 return new GLSurfaceStub;

89 default:	89 default:

90 NOTREACHED();	90 NOTREACHED();

91 return NULL;	91 return NULL;

92 }	92 }

93 }	93 }

94	94

95 } // namespace gfx	95 } // namespace gfx

OLD	NEW

« no previous file with comments | « ui/gl/gl_surface_linux.cc ('k') | ui/gl/gl_surface_nsview.h » ('j') | no next file with comments »