| 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 | 69 |
| 70 cc::SurfaceId cc_id = id.To<cc::SurfaceId>(); | 70 cc::SurfaceId cc_id = id.To<cc::SurfaceId>(); |
| 71 if (cc::SurfaceIdAllocator::NamespaceForId(cc_id) != id_namespace_) { | 71 if (cc::SurfaceIdAllocator::NamespaceForId(cc_id) != id_namespace_) { |
| 72 // Bad message, do something bad to the caller? | 72 // Bad message, do something bad to the caller? |
| 73 LOG(FATAL) << "Received request for id " << cc_id.id << " namespace " | 73 LOG(FATAL) << "Received request for id " << cc_id.id << " namespace " |
| 74 << cc::SurfaceIdAllocator::NamespaceForId(cc_id) | 74 << cc::SurfaceIdAllocator::NamespaceForId(cc_id) |
| 75 << " should be namespace " << id_namespace_; | 75 << " should be namespace " << id_namespace_; |
| 76 return; | 76 return; |
| 77 } | 77 } |
| 78 if (!display_) { | 78 if (!display_) { |
| 79 display_.reset(new cc::Display(this, manager_, NULL, NULL)); | 79 display_.reset( |
| 80 new cc::Display(this, manager_, NULL, NULL, cc::RendererSettings())); |
| 80 client_->SetDisplay(display_.get()); | 81 client_->SetDisplay(display_.get()); |
| 81 display_->Initialize(make_scoped_ptr(new DirectOutputSurface( | 82 display_->Initialize(make_scoped_ptr(new DirectOutputSurface( |
| 82 new ContextProviderMojo(command_buffer_handle_.Pass())))); | 83 new ContextProviderMojo(command_buffer_handle_.Pass())))); |
| 83 } | 84 } |
| 84 factory_.Create(cc_id, size.To<gfx::Size>()); | 85 factory_.Create(cc_id, size.To<gfx::Size>()); |
| 85 display_->Resize(cc_id, size.To<gfx::Size>()); | 86 display_->Resize(cc_id, size.To<gfx::Size>()); |
| 86 } | 87 } |
| 87 | 88 |
| 88 void SurfacesImpl::ReturnResources(const cc::ReturnedResourceArray& resources) { | 89 void SurfacesImpl::ReturnResources(const cc::ReturnedResourceArray& resources) { |
| 89 Array<ReturnedResourcePtr> ret(resources.size()); | 90 Array<ReturnedResourcePtr> ret(resources.size()); |
| (...skipping 16 matching lines...) Expand all Loading... |
| 106 base::TimeDelta interval) { | 107 base::TimeDelta interval) { |
| 107 } | 108 } |
| 108 | 109 |
| 109 void SurfacesImpl::OutputSurfaceLost() { | 110 void SurfacesImpl::OutputSurfaceLost() { |
| 110 } | 111 } |
| 111 | 112 |
| 112 void SurfacesImpl::SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) { | 113 void SurfacesImpl::SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) { |
| 113 } | 114 } |
| 114 | 115 |
| 115 } // namespace mojo | 116 } // namespace mojo |
| OLD | NEW |