ui/gl/gl_context_egl.cc - Issue 14772009: Rationalize dependency on khronos EGL headers in place of angle.

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

Issue 14772009: Rationalize dependency on khronos EGL headers in place of angle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: updated khronos headers. Created 7 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/gl/gl_context_egl.h"	5 #include "ui/gl/gl_context_egl.h"

6	6

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

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

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

10 #include "build/build_config.h"	10 #include "build/build_config.h"

11 #include "third_party/angle/include/EGL/egl.h"	11 #include "third_party/khronos/EGL/egl.h"

12 #include "third_party/angle/include/EGL/eglext.h"	12 #include "third_party/khronos/EGL/eglext.h"

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

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

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

16	16

17 #if defined(USE_X11)	17 #if defined(USE_X11)

18 extern "C" {	18 extern "C" {

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

20 }	20 }

21 #endif	21 #endif

22	22

(...skipping 169 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
192	192

193 #if !defined(OS_ANDROID)	193 #if !defined(OS_ANDROID)

194 bool GLContextEGL::GetTotalGpuMemory(size_t* bytes) {	194 bool GLContextEGL::GetTotalGpuMemory(size_t* bytes) {

195 DCHECK(bytes);	195 DCHECK(bytes);

196 *bytes = 0;	196 *bytes = 0;

197 return false;	197 return false;

198 }	198 }

199 #endif	199 #endif

200	200

201 } // namespace gfx	201 } // namespace gfx

OLD	NEW

« no previous file with comments | « ui/gl/gl.gyp ('k') | ui/surface/surface.gyp » ('j') | no next file with comments »