ui/surface/accelerated_surface_mac.h - Issue 1227363005: mac: Include <IOSurface/IOSurface.h> instead of <IOSurface/IOSurfaceAPI.h>

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/surface/accelerated_surface_mac.h

Issue 1227363005: mac: Include <IOSurface/IOSurface.h> instead of <IOSurface/IOSurfaceAPI.h> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 5 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 | « ui/gl/gl_image_io_surface.h ('k') | no next file » | no next file with comments »

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

6 #define UI_SURFACE_ACCELERATED_SURFACE_MAC_H_	6 #define UI_SURFACE_ACCELERATED_SURFACE_MAC_H_

7	7

8 #include <CoreFoundation/CoreFoundation.h>	8 #include <CoreFoundation/CoreFoundation.h>

9 #include <IOSurface/IOSurfaceAPI.h>	9 #include <IOSurface/IOSurface.h>

10	10

11 #include "base/callback.h"	11 #include "base/callback.h"

12 #include "base/mac/scoped_cftyperef.h"	12 #include "base/mac/scoped_cftyperef.h"

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

14 #include "ui/gfx/geometry/rect.h"	14 #include "ui/gfx/geometry/rect.h"

15 #include "ui/gfx/geometry/size.h"	15 #include "ui/gfx/geometry/size.h"

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

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

18 #include "ui/gl/gpu_preference.h"	18 #include "ui/gl/gpu_preference.h"

19 #include "ui/surface/surface_export.h"	19 #include "ui/surface/surface_export.h"

(...skipping 117 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
137 bool allocate_fbo_;	137 bool allocate_fbo_;

138 // This texture object is always allocated, regardless of whether	138 // This texture object is always allocated, regardless of whether

139 // the user requests an FBO be allocated.	139 // the user requests an FBO be allocated.

140 GLuint texture_;	140 GLuint texture_;

141 // The FBO and renderbuffer are only allocated if allocate_fbo_ is	141 // The FBO and renderbuffer are only allocated if allocate_fbo_ is

142 // true.	142 // true.

143 GLuint fbo_;	143 GLuint fbo_;

144 };	144 };

145	145

146 #endif // UI_SURFACE_ACCELERATED_SURFACE_MAC_H_	146 #endif // UI_SURFACE_ACCELERATED_SURFACE_MAC_H_

OLD	NEW