cc/resources/resource_format.h - Issue 1939143002: Remove all uses of skia::RefPtr and stale includes

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/resources/resource_format.h

Issue 1939143002: Remove all uses of skia::RefPtr and stale includes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix bad rebase Created 4 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

« no previous file with comments | « cc/quads/render_pass.h ('k') | cc/resources/resource_provider.h » ('j') | no next file with comments »

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

6 #define CC_RESOURCES_RESOURCE_FORMAT_H_	6 #define CC_RESOURCES_RESOURCE_FORMAT_H_

7	7

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

9 #include "cc/base/cc_export.h"	9 #include "cc/base/cc_export.h"

10 #include "third_party/skia/include/core/SkBitmap.h"	10 #include "third_party/skia/include/core/SkImageInfo.h"

11 #include "ui/gfx/gpu_memory_buffer.h"	11 #include "ui/gfx/gpu_memory_buffer.h"

12	12

13 // TODO(prashant.n): Including third_party/khronos/GLES2/gl2.h causes	13 // TODO(prashant.n): Including third_party/khronos/GLES2/gl2.h causes

14 // redefinition errors as macros/functions defined in it conflict with	14 // redefinition errors as macros/functions defined in it conflict with

15 // macros/functions defined in ui/gl/gl_bindings.h. (http://crbug.com/512833).	15 // macros/functions defined in ui/gl/gl_bindings.h. (http://crbug.com/512833).

16 typedef unsigned int GLenum;	16 typedef unsigned int GLenum;

17	17

18 namespace cc {	18 namespace cc {

19	19

20 // Keep in sync with arrays below.	20 // Keep in sync with arrays below.

(...skipping 17 matching lines...) Expand all Loading...
38 CC_EXPORT GLenum GLDataFormat(ResourceFormat format);	38 CC_EXPORT GLenum GLDataFormat(ResourceFormat format);

39 CC_EXPORT GLenum GLInternalFormat(ResourceFormat format);	39 CC_EXPORT GLenum GLInternalFormat(ResourceFormat format);

40 CC_EXPORT gfx::BufferFormat BufferFormat(ResourceFormat format);	40 CC_EXPORT gfx::BufferFormat BufferFormat(ResourceFormat format);

41	41

42 bool IsResourceFormatCompressed(ResourceFormat format);	42 bool IsResourceFormatCompressed(ResourceFormat format);

43 bool DoesResourceFormatSupportAlpha(ResourceFormat format);	43 bool DoesResourceFormatSupportAlpha(ResourceFormat format);

44	44

45 } // namespace cc	45 } // namespace cc

46	46

47 #endif // CC_RESOURCES_RESOURCE_FORMAT_H_	47 #endif // CC_RESOURCES_RESOURCE_FORMAT_H_

OLD	NEW