gpu/demos/framework/window.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/demos/framework/window.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_DEMOS_FRAMEWORK_WINDOW_H_	5 #ifndef GPU_DEMOS_FRAMEWORK_WINDOW_H_

6 #define GPU_DEMOS_FRAMEWORK_WINDOW_H_	6 #define GPU_DEMOS_FRAMEWORK_WINDOW_H_

7	7

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

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

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

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

11 #include "gpu/command_buffer/service/gpu_scheduler.h"	12 #include "gpu/command_buffer/service/gpu_scheduler.h"

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

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

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

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

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

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

16	16

17 namespace gpu {	17 namespace gpu {

18	18

19 class TransferBuffer;	19 class TransferBuffer;

20	20

21 namespace gles2 {	21 namespace gles2 {

22	22

23 class GLES2Implementation;	23 class GLES2Implementation;

24	24

25 } // namespace gles2	25 } // namespace gles2

(...skipping 38 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
64 scoped_ptr<gpu::TransferBuffer> transfer_buffer_;	64 scoped_ptr<gpu::TransferBuffer> transfer_buffer_;

65 scoped_ptr<gpu::gles2::GLES2Implementation> gles2_implementation_;	65 scoped_ptr<gpu::gles2::GLES2Implementation> gles2_implementation_;

66	66

67 DISALLOW_COPY_AND_ASSIGN(Window);	67 DISALLOW_COPY_AND_ASSIGN(Window);

68 };	68 };

69	69

70 } // namespace demos	70 } // namespace demos

71 } // namespace gpu	71 } // namespace gpu

72 #endif // GPU_DEMOS_FRAMEWORK_WINDOW_H_	72 #endif // GPU_DEMOS_FRAMEWORK_WINDOW_H_

73	73

OLD	NEW

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