| 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/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/io_surface_support_mac.h" |
| 14 #include "ui/gl/scoped_make_current.h" | 15 #include "ui/gl/scoped_make_current.h" |
| 15 #include "ui/surface/io_surface_support_mac.h" | |
| 16 | 16 |
| 17 AcceleratedSurface::AcceleratedSurface() | 17 AcceleratedSurface::AcceleratedSurface() |
| 18 : io_surface_id_(0), | 18 : io_surface_id_(0), |
| 19 allocate_fbo_(false), | 19 allocate_fbo_(false), |
| 20 texture_(0), | 20 texture_(0), |
| 21 fbo_(0) { | 21 fbo_(0) { |
| 22 } | 22 } |
| 23 | 23 |
| 24 AcceleratedSurface::~AcceleratedSurface() {} | 24 AcceleratedSurface::~AcceleratedSurface() {} |
| 25 | 25 |
| (...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 266 // make our IOSurfaces global and send back their identifiers. On | 266 // make our IOSurfaces global and send back their identifiers. On |
| 267 // the browser process side the identifier is reconstituted into an | 267 // the browser process side the identifier is reconstituted into an |
| 268 // IOSurface for on-screen rendering. | 268 // IOSurface for on-screen rendering. |
| 269 io_surface_id_ = io_surface_support->IOSurfaceGetID(io_surface_); | 269 io_surface_id_ = io_surface_support->IOSurfaceGetID(io_surface_); |
| 270 return io_surface_id_; | 270 return io_surface_id_; |
| 271 } | 271 } |
| 272 | 272 |
| 273 uint32 AcceleratedSurface::GetSurfaceId() { | 273 uint32 AcceleratedSurface::GetSurfaceId() { |
| 274 return io_surface_id_; | 274 return io_surface_id_; |
| 275 } | 275 } |
| OLD | NEW |