| 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/services/surfaces/surfaces_impl.h" | 5 #include "mojo/services/surfaces/surfaces_impl.h" |
| 6 | 6 |
| 7 #include "cc/output/compositor_frame.h" | 7 #include "cc/output/compositor_frame.h" |
| 8 #include "cc/resources/returned_resource.h" | 8 #include "cc/resources/returned_resource.h" |
| 9 #include "cc/surfaces/display.h" | 9 #include "cc/surfaces/display.h" |
| 10 #include "cc/surfaces/surface_id_allocator.h" | 10 #include "cc/surfaces/surface_id_allocator.h" |
| 11 #include "mojo/cc/context_provider_mojo.h" | 11 #include "mojo/cc/context_provider_mojo.h" |
| 12 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h" | 12 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h" |
| 13 #include "mojo/services/public/cpp/surfaces/surfaces_type_converters.h" | 13 #include "mojo/services/public/cpp/surfaces/surfaces_type_converters.h" |
| 14 | 14 |
| 15 namespace mojo { | 15 namespace mojo { |
| 16 | 16 |
| 17 SurfacesImpl::SurfacesImpl(cc::SurfaceManager* manager, | 17 SurfacesImpl::SurfacesImpl(cc::SurfaceManager* manager, |
| 18 uint32_t id_namespace, | 18 uint32_t id_namespace, |
| 19 Client* client) | 19 Client* client) |
| 20 : manager_(manager), | 20 : manager_(manager), |
| 21 factory_(manager, this), | 21 factory_(manager, this), |
| 22 id_namespace_(id_namespace), | 22 id_namespace_(id_namespace), |
| 23 client_(client) { | 23 client_(client) { |
| 24 } | 24 } |
| 25 | 25 |
| 26 SurfacesImpl::~SurfacesImpl() { | 26 SurfacesImpl::~SurfacesImpl() { |
| 27 } | 27 } |
| 28 | 28 |
| 29 void SurfacesImpl::OnConnectionEstablished() { | |
| 30 client()->SetIdNamespace(id_namespace_); | |
| 31 } | |
| 32 | |
| 33 void SurfacesImpl::CreateSurface(SurfaceIdPtr id, mojo::SizePtr size) { | 29 void SurfacesImpl::CreateSurface(SurfaceIdPtr id, mojo::SizePtr size) { |
| 34 cc::SurfaceId cc_id = id.To<cc::SurfaceId>(); | 30 cc::SurfaceId cc_id = id.To<cc::SurfaceId>(); |
| 35 if (cc::SurfaceIdAllocator::NamespaceForId(cc_id) != id_namespace_) { | 31 if (cc::SurfaceIdAllocator::NamespaceForId(cc_id) != id_namespace_) { |
| 36 // Bad message, do something bad to the caller? | 32 // Bad message, do something bad to the caller? |
| 37 NOTREACHED(); | 33 NOTREACHED(); |
| 38 return; | 34 return; |
| 39 } | 35 } |
| 40 factory_.Create(id.To<cc::SurfaceId>(), size.To<gfx::Size>()); | 36 factory_.Create(id.To<cc::SurfaceId>(), size.To<gfx::Size>()); |
| 41 } | 37 } |
| 42 | 38 |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 | 91 |
| 96 scoped_ptr<cc::OutputSurface> SurfacesImpl::CreateOutputSurface() { | 92 scoped_ptr<cc::OutputSurface> SurfacesImpl::CreateOutputSurface() { |
| 97 return make_scoped_ptr(new cc::OutputSurface( | 93 return make_scoped_ptr(new cc::OutputSurface( |
| 98 new ContextProviderMojo(command_buffer_handle_.Pass()))); | 94 new ContextProviderMojo(command_buffer_handle_.Pass()))); |
| 99 } | 95 } |
| 100 | 96 |
| 101 void SurfacesImpl::DisplayDamaged() { | 97 void SurfacesImpl::DisplayDamaged() { |
| 102 } | 98 } |
| 103 | 99 |
| 104 } // namespace mojo | 100 } // namespace mojo |
| OLD | NEW |