gpu/gles2_conform_support/egl/display.h - 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: gpu/gles2_conform_support/egl/display.h

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 #ifndef GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_	5 #ifndef GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_

6 #define GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_	6 #define GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_

7	7

8 #include <EGL/egl.h>	8 #include <EGL/egl.h>

9	9

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

11 #include "gpu/command_buffer/client/gles2_cmd_helper.h"	11 #include "gpu/command_buffer/client/gles2_cmd_helper.h"

12 #include "gpu/command_buffer/service/command_buffer_service.h"	12 #include "gpu/command_buffer/service/command_buffer_service.h"

	13 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"

13 #include "gpu/command_buffer/service/gpu_scheduler.h"	14 #include "gpu/command_buffer/service/gpu_scheduler.h"

14 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"

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

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

17 #include "ui/gfx/native_widget_types.h"	15 #include "ui/gfx/native_widget_types.h"

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

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

18	18

19 namespace gpu {	19 namespace gpu {

20 class CommandBufferService;	20 class CommandBufferService;

21 class GpuScheduler;	21 class GpuScheduler;

22 class TransferBuffer;	22 class TransferBuffer;

23	23

24 namespace gles2 {	24 namespace gles2 {

25 class GLES2CmdHelper;	25 class GLES2CmdHelper;

26 class GLES2Implementation;	26 class GLES2Implementation;

27 } // namespace gles2	27 } // namespace gles2

(...skipping 50 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
78 scoped_ptr<Config> config_;	78 scoped_ptr<Config> config_;

79 scoped_ptr<Surface> surface_;	79 scoped_ptr<Surface> surface_;

80 scoped_ptr<gpu::gles2::GLES2Implementation> context_;	80 scoped_ptr<gpu::gles2::GLES2Implementation> context_;

81	81

82 DISALLOW_COPY_AND_ASSIGN(Display);	82 DISALLOW_COPY_AND_ASSIGN(Display);

83 };	83 };

84	84

85 } // namespace egl	85 } // namespace egl

86	86

87 #endif // GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_	87 #endif // GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_

OLD	NEW

« no previous file with comments | « gpu/demos/framework/window.h ('k') | gpu/gles2_conform_support/egl/egl.cc » ('j') | no next file with comments »