| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "services/gfx/compositor/compositor_impl.h" | 5 #include "services/gfx/compositor/compositor_impl.h" |
| 6 | 6 |
| 7 #include <utility> |
| 8 |
| 7 #include "services/gfx/compositor/scene_impl.h" | 9 #include "services/gfx/compositor/scene_impl.h" |
| 8 | 10 |
| 9 namespace compositor { | 11 namespace compositor { |
| 10 | 12 |
| 11 CompositorImpl::CompositorImpl(CompositorEngine* engine) : engine_(engine) {} | 13 CompositorImpl::CompositorImpl(CompositorEngine* engine) : engine_(engine) {} |
| 12 | 14 |
| 13 CompositorImpl::~CompositorImpl() {} | 15 CompositorImpl::~CompositorImpl() {} |
| 14 | 16 |
| 15 void CompositorImpl::CreateScene( | 17 void CompositorImpl::CreateScene( |
| 16 mojo::InterfaceRequest<mojo::gfx::composition::Scene> scene_request, | 18 mojo::InterfaceRequest<mojo::gfx::composition::Scene> scene_request, |
| 17 const mojo::String& label, | 19 const mojo::String& label, |
| 18 const CreateSceneCallback& callback) { | 20 const CreateSceneCallback& callback) { |
| 19 mojo::gfx::composition::SceneTokenPtr scene_token = | 21 mojo::gfx::composition::SceneTokenPtr scene_token = |
| 20 engine_->CreateScene(scene_request.Pass(), label); | 22 engine_->CreateScene(scene_request.Pass(), label); |
| 21 callback.Run(scene_token.Pass()); | 23 callback.Run(scene_token.Pass()); |
| 22 } | 24 } |
| 23 | 25 |
| 24 void CompositorImpl::CreateRenderer( | 26 void CompositorImpl::CreateRenderer( |
| 25 mojo::ContextProviderPtr context_provider, | 27 mojo::InterfaceHandle<mojo::ContextProvider> context_provider, |
| 26 mojo::InterfaceRequest<mojo::gfx::composition::Renderer> renderer_request, | 28 mojo::InterfaceRequest<mojo::gfx::composition::Renderer> renderer_request, |
| 27 const mojo::String& label) { | 29 const mojo::String& label) { |
| 28 engine_->CreateRenderer(context_provider.Pass(), renderer_request.Pass(), | 30 engine_->CreateRenderer( |
| 29 label); | 31 mojo::ContextProviderPtr::Create(std::move(context_provider)), |
| 32 renderer_request.Pass(), label); |
| 30 } | 33 } |
| 31 | 34 |
| 32 } // namespace compositor | 35 } // namespace compositor |
| OLD | NEW |