| 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 "mojo/cc/output_surface_mojo.h" | 5 #include "mojo/cc/output_surface_mojo.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" | 9 #include "cc/output/compositor_frame_ack.h" |
| 10 #include "cc/output/output_surface_client.h" | 10 #include "cc/output/output_surface_client.h" |
| 11 #include "components/mus/public/cpp/view_surface.h" | 11 #include "components/mus/public/cpp/view_surface.h" |
| 12 #include "mojo/converters/surfaces/surfaces_type_converters.h" | 12 #include "mojo/converters/surfaces/surfaces_type_converters.h" |
| 13 | 13 |
| 14 namespace mojo { | 14 namespace mojo { |
| 15 | 15 |
| 16 OutputSurfaceMojo::OutputSurfaceMojo( | 16 OutputSurfaceMojo::OutputSurfaceMojo( |
| 17 const scoped_refptr<cc::ContextProvider>& context_provider, | 17 const scoped_refptr<cc::ContextProvider>& context_provider, |
| 18 scoped_ptr<mojo::ViewSurface> surface) | 18 scoped_ptr<mus::ViewSurface> surface) |
| 19 : cc::OutputSurface(context_provider), | 19 : cc::OutputSurface(context_provider), surface_(surface.Pass()) { |
| 20 surface_(surface.Pass()) { | |
| 21 capabilities_.delegated_rendering = true; | 20 capabilities_.delegated_rendering = true; |
| 22 capabilities_.max_frames_pending = 1; | 21 capabilities_.max_frames_pending = 1; |
| 23 } | 22 } |
| 24 | 23 |
| 25 OutputSurfaceMojo::~OutputSurfaceMojo() { | 24 OutputSurfaceMojo::~OutputSurfaceMojo() { |
| 26 } | 25 } |
| 27 | 26 |
| 28 bool OutputSurfaceMojo::BindToClient(cc::OutputSurfaceClient* client) { | 27 bool OutputSurfaceMojo::BindToClient(cc::OutputSurfaceClient* client) { |
| 29 surface_->BindToThread(); | 28 surface_->BindToThread(); |
| 30 surface_->set_client(this); | 29 surface_->set_client(this); |
| 31 return cc::OutputSurface::BindToClient(client); | 30 return cc::OutputSurface::BindToClient(client); |
| 32 } | 31 } |
| 33 | 32 |
| 34 void OutputSurfaceMojo::SwapBuffers(cc::CompositorFrame* frame) { | 33 void OutputSurfaceMojo::SwapBuffers(cc::CompositorFrame* frame) { |
| 35 // TODO(fsamuel, rjkroege): We should probably throttle compositor frames. | 34 // TODO(fsamuel, rjkroege): We should probably throttle compositor frames. |
| 36 surface_->SubmitCompositorFrame(mojo::CompositorFrame::From(*frame)); | 35 surface_->SubmitCompositorFrame(mojo::CompositorFrame::From(*frame)); |
| 37 | 36 |
| 38 client_->DidSwapBuffers(); | 37 client_->DidSwapBuffers(); |
| 39 client_->DidSwapBuffersComplete(); | 38 client_->DidSwapBuffersComplete(); |
| 40 } | 39 } |
| 41 | 40 |
| 42 void OutputSurfaceMojo::OnResourcesReturned( | 41 void OutputSurfaceMojo::OnResourcesReturned( |
| 43 mojo::ViewSurface* surface, | 42 mus::ViewSurface* surface, |
| 44 mojo::Array<mojo::ReturnedResourcePtr> resources) { | 43 mojo::Array<mojo::ReturnedResourcePtr> resources) { |
| 45 cc::CompositorFrameAck cfa; | 44 cc::CompositorFrameAck cfa; |
| 46 cfa.resources = resources.To<cc::ReturnedResourceArray>(); | 45 cfa.resources = resources.To<cc::ReturnedResourceArray>(); |
| 47 ReclaimResources(&cfa); | 46 ReclaimResources(&cfa); |
| 48 } | 47 } |
| 49 | 48 |
| 50 } // namespace mojo | 49 } // namespace mojo |
| OLD | NEW |