| 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/public/cpp/gles2/gles2.h" | 12 #include "mojo/public/cpp/gles2/gles2.h" |
| 13 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h" | 13 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h" |
| 14 #include "mojo/services/public/cpp/surfaces/surfaces_type_converters.h" | 14 #include "mojo/services/public/cpp/surfaces/surfaces_type_converters.h" |
| 15 | 15 |
| 16 namespace mojo { | 16 namespace mojo { |
| 17 namespace surfaces { | |
| 18 | 17 |
| 19 SurfacesImpl::SurfacesImpl(cc::SurfaceManager* manager, | 18 SurfacesImpl::SurfacesImpl(cc::SurfaceManager* manager, |
| 20 uint32_t id_namespace, | 19 uint32_t id_namespace, |
| 21 Client* client) | 20 Client* client) |
| 22 : manager_(manager), | 21 : manager_(manager), |
| 23 factory_(manager, this), | 22 factory_(manager, this), |
| 24 id_namespace_(id_namespace), | 23 id_namespace_(id_namespace), |
| 25 client_(client) { | 24 client_(client) { |
| 26 } | 25 } |
| 27 | 26 |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 client()->ReturnResources(ret.Pass()); | 89 client()->ReturnResources(ret.Pass()); |
| 91 } | 90 } |
| 92 | 91 |
| 93 scoped_ptr<cc::OutputSurface> SurfacesImpl::CreateOutputSurface() { | 92 scoped_ptr<cc::OutputSurface> SurfacesImpl::CreateOutputSurface() { |
| 94 static GLES2Initializer* gles2 = new GLES2Initializer; | 93 static GLES2Initializer* gles2 = new GLES2Initializer; |
| 95 DCHECK(gles2); | 94 DCHECK(gles2); |
| 96 return make_scoped_ptr(new cc::OutputSurface( | 95 return make_scoped_ptr(new cc::OutputSurface( |
| 97 new ContextProviderMojo(command_buffer_handle_.Pass()))); | 96 new ContextProviderMojo(command_buffer_handle_.Pass()))); |
| 98 } | 97 } |
| 99 | 98 |
| 100 } // namespace surfaces | |
| 101 } // namespace mojo | 99 } // namespace mojo |
| OLD | NEW |