| 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_display_output_surface.h" | 5 #include "cc/surfaces/surface_display_output_surface.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "cc/output/compositor_frame.h" | 8 #include "cc/output/compositor_frame.h" |
| 9 #include "cc/output/compositor_frame_ack.h" | |
| 10 #include "cc/surfaces/display.h" | 9 #include "cc/surfaces/display.h" |
| 11 #include "cc/surfaces/surface.h" | 10 #include "cc/surfaces/surface.h" |
| 12 #include "cc/surfaces/surface_id_allocator.h" | 11 #include "cc/surfaces/surface_id_allocator.h" |
| 13 #include "cc/surfaces/surface_manager.h" | 12 #include "cc/surfaces/surface_manager.h" |
| 14 | 13 |
| 15 namespace cc { | 14 namespace cc { |
| 16 | 15 |
| 17 SurfaceDisplayOutputSurface::SurfaceDisplayOutputSurface( | 16 SurfaceDisplayOutputSurface::SurfaceDisplayOutputSurface( |
| 18 SurfaceManager* surface_manager, | 17 SurfaceManager* surface_manager, |
| 19 SurfaceIdAllocator* surface_id_allocator, | 18 SurfaceIdAllocator* surface_id_allocator, |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 } | 126 } |
| 128 | 127 |
| 129 uint32_t SurfaceDisplayOutputSurface::GetFramebufferCopyTextureFormat() { | 128 uint32_t SurfaceDisplayOutputSurface::GetFramebufferCopyTextureFormat() { |
| 130 // This is a delegating output surface, no framebuffer/direct drawing support. | 129 // This is a delegating output surface, no framebuffer/direct drawing support. |
| 131 NOTREACHED(); | 130 NOTREACHED(); |
| 132 return 0; | 131 return 0; |
| 133 } | 132 } |
| 134 | 133 |
| 135 void SurfaceDisplayOutputSurface::ReturnResources( | 134 void SurfaceDisplayOutputSurface::ReturnResources( |
| 136 const ReturnedResourceArray& resources) { | 135 const ReturnedResourceArray& resources) { |
| 137 CompositorFrameAck ack; | |
| 138 ack.resources = resources; | |
| 139 if (client_) | 136 if (client_) |
| 140 client_->ReclaimResources(&ack); | 137 client_->ReclaimResources(resources); |
| 141 } | 138 } |
| 142 | 139 |
| 143 void SurfaceDisplayOutputSurface::SetBeginFrameSource( | 140 void SurfaceDisplayOutputSurface::SetBeginFrameSource( |
| 144 BeginFrameSource* begin_frame_source) { | 141 BeginFrameSource* begin_frame_source) { |
| 145 DCHECK(client_); | 142 DCHECK(client_); |
| 146 client_->SetBeginFrameSource(begin_frame_source); | 143 client_->SetBeginFrameSource(begin_frame_source); |
| 147 } | 144 } |
| 148 | 145 |
| 149 void SurfaceDisplayOutputSurface::DisplayOutputSurfaceLost() { | 146 void SurfaceDisplayOutputSurface::DisplayOutputSurfaceLost() { |
| 150 output_surface_lost_ = true; | 147 output_surface_lost_ = true; |
| 151 DidLoseOutputSurface(); | 148 DidLoseOutputSurface(); |
| 152 } | 149 } |
| 153 | 150 |
| 154 void SurfaceDisplayOutputSurface::DisplaySetMemoryPolicy( | 151 void SurfaceDisplayOutputSurface::DisplaySetMemoryPolicy( |
| 155 const ManagedMemoryPolicy& policy) { | 152 const ManagedMemoryPolicy& policy) { |
| 156 SetMemoryPolicy(policy); | 153 SetMemoryPolicy(policy); |
| 157 } | 154 } |
| 158 | 155 |
| 159 void SurfaceDisplayOutputSurface::SwapBuffersComplete(SurfaceDrawStatus drawn) { | 156 void SurfaceDisplayOutputSurface::SwapBuffersComplete(SurfaceDrawStatus drawn) { |
| 160 // TODO(danakj): Why the lost check? | 157 // TODO(danakj): Why the lost check? |
| 161 if (!output_surface_lost_) | 158 if (!output_surface_lost_) |
| 162 client_->DidSwapBuffersComplete(); | 159 client_->DidSwapBuffersComplete(); |
| 163 } | 160 } |
| 164 | 161 |
| 165 } // namespace cc | 162 } // namespace cc |
| OLD | NEW |