ui/gl/gl_context_x11.cc - Issue 895853003: Update from https://crrev.com/314320

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_context_x11.cc

Issue 895853003: Update from https://crrev.com/314320 (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 5 years, 10 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

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

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/gl/gl_context.h"	5 #include "ui/gl/gl_context.h"

6	6

7 #include "base/debug/trace_event.h"

8 #include "base/logging.h"	7 #include "base/logging.h"

9 #include "base/memory/scoped_ptr.h"	8 #include "base/memory/scoped_ptr.h"

	9 #include "base/trace_event/trace_event.h"

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

11 #include "ui/gl/gl_context_egl.h"	11 #include "ui/gl/gl_context_egl.h"

12 #include "ui/gl/gl_context_glx.h"	12 #include "ui/gl/gl_context_glx.h"

13 #include "ui/gl/gl_context_osmesa.h"	13 #include "ui/gl/gl_context_osmesa.h"

14 #include "ui/gl/gl_context_stub.h"	14 #include "ui/gl/gl_context_stub.h"

15 #include "ui/gl/gl_implementation.h"	15 #include "ui/gl/gl_implementation.h"

16 #include "ui/gl/gl_surface_egl.h"	16 #include "ui/gl/gl_surface_egl.h"

17 #include "ui/gl/gl_surface_glx.h"	17 #include "ui/gl/gl_surface_glx.h"

18 #include "ui/gl/gl_surface_osmesa.h"	18 #include "ui/gl/gl_surface_osmesa.h"

19 #include "ui/gl/gl_surface_stub.h"	19 #include "ui/gl/gl_surface_stub.h"

(...skipping 31 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
51 }	51 }

52 case kGLImplementationMockGL:	52 case kGLImplementationMockGL:

53 return new GLContextStub;	53 return new GLContextStub;

54 default:	54 default:

55 NOTREACHED();	55 NOTREACHED();

56 return NULL;	56 return NULL;

57 }	57 }

58 }	58 }

59	59

60 } // namespace gfx	60 } // namespace gfx

OLD	NEW