Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(212)

Side by Side Diff: app/surface/accelerated_surface_mac.h

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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
« no previous file with comments | « app/gfx/gl/gl_context_osmesa.h ('k') | app/surface/accelerated_surface_mac.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 APP_SURFACE_ACCELERATED_SURFACE_MAC_H_ 5 #ifndef APP_SURFACE_ACCELERATED_SURFACE_MAC_H_
6 #define APP_SURFACE_ACCELERATED_SURFACE_MAC_H_ 6 #define APP_SURFACE_ACCELERATED_SURFACE_MAC_H_
7 #pragma once 7 #pragma once
8 8
9 #include <CoreFoundation/CoreFoundation.h> 9 #include <CoreFoundation/CoreFoundation.h>
10 10
11 #include "app/gfx/gl/gl_context.h" 11 #include "app/gfx/gl/gl_context.h"
12 #include "app/surface/transport_dib.h" 12 #include "app/surface/transport_dib.h"
13 #include "base/callback.h" 13 #include "base/callback.h"
14 #include "base/mac/scoped_cftyperef.h" 14 #include "base/mac/scoped_cftyperef.h"
15 #include "base/scoped_ptr.h" 15 #include "base/scoped_ptr.h"
16 #include "gfx/rect.h" 16 #include "ui/gfx/rect.h"
17 #include "gfx/size.h" 17 #include "ui/gfx/size.h"
18 18
19 // Should not include GL headers in a header file. Forward declare these types 19 // Should not include GL headers in a header file. Forward declare these types
20 // instead. 20 // instead.
21 typedef struct _CGLContextObject* CGLContextObj; 21 typedef struct _CGLContextObject* CGLContextObj;
22 typedef unsigned int GLenum; 22 typedef unsigned int GLenum;
23 typedef unsigned int GLuint; 23 typedef unsigned int GLuint;
24 24
25 namespace gfx { 25 namespace gfx {
26 class Rect; 26 class Rect;
27 } 27 }
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 // true. 158 // true.
159 GLuint fbo_; 159 GLuint fbo_;
160 GLuint depth_stencil_renderbuffer_; 160 GLuint depth_stencil_renderbuffer_;
161 // Allocate a TransportDIB in the renderer. 161 // Allocate a TransportDIB in the renderer.
162 scoped_ptr<Callback2<size_t, TransportDIB::Handle*>::Type> 162 scoped_ptr<Callback2<size_t, TransportDIB::Handle*>::Type>
163 dib_alloc_callback_; 163 dib_alloc_callback_;
164 scoped_ptr<Callback1<TransportDIB::Id>::Type> dib_free_callback_; 164 scoped_ptr<Callback1<TransportDIB::Id>::Type> dib_free_callback_;
165 }; 165 };
166 166
167 #endif // APP_SURFACE_ACCELERATED_SURFACE_MAC_H_ 167 #endif // APP_SURFACE_ACCELERATED_SURFACE_MAC_H_
OLDNEW
« no previous file with comments | « app/gfx/gl/gl_context_osmesa.h ('k') | app/surface/accelerated_surface_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698