| 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 #include "ui/surface/accelerated_surface_mac.h" | 5 #include "ui/surface/accelerated_surface_mac.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/mac/scoped_cftyperef.h" | 8 #include "base/mac/scoped_cftyperef.h" |
| 9 #include "ui/gfx/rect.h" | 9 #include "ui/gfx/geometry/rect.h" |
| 10 #include "ui/gl/gl_bindings.h" | 10 #include "ui/gl/gl_bindings.h" |
| 11 #include "ui/gl/gl_context.h" | 11 #include "ui/gl/gl_context.h" |
| 12 #include "ui/gl/gl_implementation.h" | 12 #include "ui/gl/gl_implementation.h" |
| 13 #include "ui/gl/gl_surface.h" | 13 #include "ui/gl/gl_surface.h" |
| 14 #include "ui/gl/scoped_make_current.h" | 14 #include "ui/gl/scoped_make_current.h" |
| 15 | 15 |
| 16 // Note that this must be included after gl_bindings.h to avoid conflicts. | 16 // Note that this must be included after gl_bindings.h to avoid conflicts. |
| 17 #include <OpenGL/CGLIOSurface.h> | 17 #include <OpenGL/CGLIOSurface.h> |
| 18 | 18 |
| 19 AcceleratedSurface::AcceleratedSurface() | 19 AcceleratedSurface::AcceleratedSurface() |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 257 // make our IOSurfaces global and send back their identifiers. On | 257 // make our IOSurfaces global and send back their identifiers. On |
| 258 // the browser process side the identifier is reconstituted into an | 258 // the browser process side the identifier is reconstituted into an |
| 259 // IOSurface for on-screen rendering. | 259 // IOSurface for on-screen rendering. |
| 260 io_surface_id_ = IOSurfaceGetID(io_surface_); | 260 io_surface_id_ = IOSurfaceGetID(io_surface_); |
| 261 return io_surface_id_; | 261 return io_surface_id_; |
| 262 } | 262 } |
| 263 | 263 |
| 264 uint32 AcceleratedSurface::GetSurfaceId() { | 264 uint32 AcceleratedSurface::GetSurfaceId() { |
| 265 return io_surface_id_; | 265 return io_surface_id_; |
| 266 } | 266 } |
| OLD | NEW |