| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_GFX_SURFACE_ACCELERATED_SURFACE_MAC_H_ | 5 #ifndef UI_GFX_SURFACE_ACCELERATED_SURFACE_MAC_H_ |
| 6 #define UI_GFX_SURFACE_ACCELERATED_SURFACE_MAC_H_ | 6 #define UI_GFX_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" | |
| 12 #include "base/callback.h" | 11 #include "base/callback.h" |
| 13 #include "base/mac/scoped_cftyperef.h" | 12 #include "base/mac/scoped_cftyperef.h" |
| 14 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 15 #include "ui/gfx/rect.h" | 14 #include "ui/gfx/rect.h" |
| 16 #include "ui/gfx/size.h" | 15 #include "ui/gfx/size.h" |
| 16 #include "ui/gfx/gl/gl_context.h" |
| 17 #include "ui/gfx/surface/transport_dib.h" | 17 #include "ui/gfx/surface/transport_dib.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; |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 // UI_GFX_SURFACE_ACCELERATED_SURFACE_MAC_H_ | 167 #endif // UI_GFX_SURFACE_ACCELERATED_SURFACE_MAC_H_ |
| OLD | NEW |