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" |
(...skipping 27 matching lines...) Expand all Loading... |
38 | 38 |
39 void SurfacesImpl::SubmitFrame(SurfaceIdPtr id, FramePtr frame_ptr) { | 39 void SurfacesImpl::SubmitFrame(SurfaceIdPtr id, FramePtr frame_ptr) { |
40 cc::SurfaceId cc_id = id.To<cc::SurfaceId>(); | 40 cc::SurfaceId cc_id = id.To<cc::SurfaceId>(); |
41 if (cc::SurfaceIdAllocator::NamespaceForId(cc_id) != id_namespace_) { | 41 if (cc::SurfaceIdAllocator::NamespaceForId(cc_id) != id_namespace_) { |
42 // Bad message, do something bad to the caller? | 42 // Bad message, do something bad to the caller? |
43 LOG(FATAL) << "Received frame for id " << cc_id.id << " namespace " | 43 LOG(FATAL) << "Received frame for id " << cc_id.id << " namespace " |
44 << cc::SurfaceIdAllocator::NamespaceForId(cc_id) | 44 << cc::SurfaceIdAllocator::NamespaceForId(cc_id) |
45 << " should be namespace " << id_namespace_; | 45 << " should be namespace " << id_namespace_; |
46 return; | 46 return; |
47 } | 47 } |
48 factory_.SubmitFrame( | 48 factory_.SubmitFrame(id.To<cc::SurfaceId>(), |
49 id.To<cc::SurfaceId>(), mojo::ConvertTo(frame_ptr), base::Closure()); | 49 frame_ptr.To<scoped_ptr<cc::CompositorFrame> >(), |
| 50 base::Closure()); |
50 client_->FrameSubmitted(); | 51 client_->FrameSubmitted(); |
51 } | 52 } |
52 | 53 |
53 void SurfacesImpl::DestroySurface(SurfaceIdPtr id) { | 54 void SurfacesImpl::DestroySurface(SurfaceIdPtr id) { |
54 cc::SurfaceId cc_id = id.To<cc::SurfaceId>(); | 55 cc::SurfaceId cc_id = id.To<cc::SurfaceId>(); |
55 if (cc::SurfaceIdAllocator::NamespaceForId(cc_id) != id_namespace_) { | 56 if (cc::SurfaceIdAllocator::NamespaceForId(cc_id) != id_namespace_) { |
56 // Bad message, do something bad to the caller? | 57 // Bad message, do something bad to the caller? |
57 NOTREACHED(); | 58 NOTREACHED(); |
58 return; | 59 return; |
59 } | 60 } |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
91 | 92 |
92 scoped_ptr<cc::OutputSurface> SurfacesImpl::CreateOutputSurface() { | 93 scoped_ptr<cc::OutputSurface> SurfacesImpl::CreateOutputSurface() { |
93 return make_scoped_ptr(new cc::OutputSurface( | 94 return make_scoped_ptr(new cc::OutputSurface( |
94 new ContextProviderMojo(command_buffer_handle_.Pass()))); | 95 new ContextProviderMojo(command_buffer_handle_.Pass()))); |
95 } | 96 } |
96 | 97 |
97 void SurfacesImpl::DisplayDamaged() { | 98 void SurfacesImpl::DisplayDamaged() { |
98 } | 99 } |
99 | 100 |
100 } // namespace mojo | 101 } // namespace mojo |
OLD | NEW |