Chromium Code Reviews| 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/cc/direct_output_surface.h" | 12 #include "mojo/cc/direct_output_surface.h" |
| 13 #include "mojo/converters/geometry/geometry_type_converters.h" | 13 #include "mojo/converters/geometry/geometry_type_converters.h" |
| 14 #include "mojo/converters/surfaces/surfaces_type_converters.h" | 14 #include "mojo/converters/surfaces/surfaces_type_converters.h" |
| 15 | 15 |
| 16 namespace mojo { | 16 namespace mojo { |
| 17 | 17 |
| 18 SurfacesImpl::SurfacesImpl(cc::SurfaceManager* manager, | 18 SurfacesImpl::SurfacesImpl(cc::SurfaceManager* manager, |
| 19 uint32_t id_namespace, | 19 uint32_t id_namespace, |
| 20 Client* client) | 20 Client* client) |
| 21 : manager_(manager), | 21 : manager_(manager), |
| 22 factory_(manager, this), | 22 factory_(manager, this), |
| 23 id_namespace_(id_namespace), | 23 id_namespace_(id_namespace), |
| 24 client_(client) { | 24 client_(client) { |
| 25 } | 25 } |
| 26 | 26 |
| 27 SurfacesImpl::~SurfacesImpl() { | 27 SurfacesImpl::~SurfacesImpl() { |
| 28 // Destory any outstanding surfaces when the connection goes down for any | |
|
jamesr
2014/11/05 19:02:24
s/Destory/Destroy/
| |
| 29 // reason to avoid ~SurfaceFactory() logging about us failing to do so. | |
|
jamesr
2014/11/05 19:02:24
this comment is misleading. we aren't destroying t
| |
| 30 factory_.DestroyAll(); | |
| 28 } | 31 } |
| 29 | 32 |
| 30 void SurfacesImpl::CreateSurface(SurfaceIdPtr id, mojo::SizePtr size) { | 33 void SurfacesImpl::CreateSurface(SurfaceIdPtr id, mojo::SizePtr size) { |
| 31 cc::SurfaceId cc_id = id.To<cc::SurfaceId>(); | 34 cc::SurfaceId cc_id = id.To<cc::SurfaceId>(); |
| 32 if (cc::SurfaceIdAllocator::NamespaceForId(cc_id) != id_namespace_) { | 35 if (cc::SurfaceIdAllocator::NamespaceForId(cc_id) != id_namespace_) { |
| 33 // Bad message, do something bad to the caller? | 36 // Bad message, do something bad to the caller? |
| 34 NOTREACHED(); | 37 NOTREACHED(); |
| 35 return; | 38 return; |
| 36 } | 39 } |
| 37 factory_.Create(id.To<cc::SurfaceId>(), size.To<gfx::Size>()); | 40 factory_.Create(id.To<cc::SurfaceId>(), size.To<gfx::Size>()); |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 106 base::TimeDelta interval) { | 109 base::TimeDelta interval) { |
| 107 } | 110 } |
| 108 | 111 |
| 109 void SurfacesImpl::OutputSurfaceLost() { | 112 void SurfacesImpl::OutputSurfaceLost() { |
| 110 } | 113 } |
| 111 | 114 |
| 112 void SurfacesImpl::SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) { | 115 void SurfacesImpl::SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) { |
| 113 } | 116 } |
| 114 | 117 |
| 115 } // namespace mojo | 118 } // namespace mojo |
| OLD | NEW |