cc/texture.h - Issue 11227005: Reland "cc: Remove CC*.h temporary includes, part 1/4."

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: cc/texture.h

Issue 11227005: Reland "cc: Remove CC*.h temporary includes, part 1/4." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: the fix Created 8 years, 2 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:

OLD	NEW
1 // Copyright 2012 The Chromium Authors. All rights reserved.	1 // Copyright 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 CCTexture_h	5 #ifndef CCTexture_h

6 #define CCTexture_h	6 #define CCTexture_h

7	7

	8 #include "CCResourceProvider.h"

	9 #include "IntSize.h"

8 #include "third_party/khronos/GLES2/gl2.h"	10 #include "third_party/khronos/GLES2/gl2.h"

9 #include "CCResourceProvider.h"

10 #include "CCTexture.h"

11 #include "IntSize.h"

12	11

13 namespace cc {	12 namespace cc {

14	13

15 class CCTexture {	14 class CCTexture {

16 public:	15 public:

17 CCTexture() : m_id(0) { }	16 CCTexture() : m_id(0) { }

18 CCTexture(unsigned id, IntSize size, GLenum format)	17 CCTexture(unsigned id, IntSize size, GLenum format)

19 : m_id(id)	18 : m_id(id)

20 , m_size(size)	19 , m_size(size)

21 , m_format(format) { }	20 , m_format(format) { }

(...skipping 11 matching lines...) Expand all Loading...
33	32

34 private:	33 private:

35 CCResourceProvider::ResourceId m_id;	34 CCResourceProvider::ResourceId m_id;

36 IntSize m_size;	35 IntSize m_size;

37 GLenum m_format;	36 GLenum m_format;

38 };	37 };

39	38

40 }	39 }

41	40

42 #endif	41 #endif

OLD	NEW

« no previous file with comments | « cc/test/tiled_layer_test_common.h ('k') | cc/texture.cc » ('j') | no next file with comments »