| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "cc/surfaces/surface.h" | 5 #include "cc/surfaces/surface.h" |
| 6 | 6 |
| 7 #include "cc/output/compositor_frame.h" | 7 #include "cc/output/compositor_frame.h" |
| 8 #include "cc/surfaces/surface_manager.h" | 8 #include "cc/surfaces/surface_manager.h" |
| 9 | 9 |
| 10 namespace cc { | 10 namespace cc { |
| 11 | 11 |
| 12 Surface::Surface(SurfaceManager* manager, | 12 Surface::Surface(SurfaceManager* manager, |
| 13 SurfaceClient* client, | 13 SurfaceClient* client, |
| 14 const gfx::Size& size) | 14 const gfx::Size& size) |
| 15 : manager_(manager), | 15 : manager_(manager), |
| 16 client_(client), | 16 client_(client), |
| 17 size_(size) { | 17 size_(size) { |
| 18 surface_id_ = manager_->RegisterAndAllocateIDForSurface(this); | 18 surface_id_ = manager_->RegisterAndAllocateIDForSurface(this); |
| 19 } | 19 } |
| 20 | 20 |
| 21 Surface::~Surface() { | 21 Surface::~Surface() { |
| 22 manager_->DeregisterSurface(surface_id_); | 22 manager_->DeregisterSurface(surface_id_); |
| 23 } | 23 } |
| 24 | 24 |
| 25 void Surface::QueueFrame(scoped_ptr<CompositorFrame> frame) { | 25 void Surface::QueueFrame(scoped_ptr<CompositorFrame> frame) { |
| 26 current_frame_ = frame.Pass(); | 26 current_frame_ = frame.Pass(); |
| 27 } | 27 } |
| 28 | 28 |
| 29 CompositorFrame* Surface::GetEligibleFrame() { return current_frame_.get(); } | 29 CompositorFrame* Surface::GetEligibleFrame() { return current_frame_.get(); } |
| 30 scoped_ptr<CompositorFrame> Surface::TakeFrame() { |
| 31 return current_frame_.Pass(); |
| 32 } |
| 30 | 33 |
| 31 } // namespace cc | 34 } // namespace cc |
| OLD | NEW |