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