Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(127)

Side by Side Diff: mojo/services/surfaces/surfaces_impl.cc

Issue 428413002: Make async waiter explicit MojoGLES2CreateContext param (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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"
13 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h" 12 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
14 #include "mojo/services/public/cpp/surfaces/surfaces_type_converters.h" 13 #include "mojo/services/public/cpp/surfaces/surfaces_type_converters.h"
15 14
16 namespace mojo { 15 namespace mojo {
17 16
18 SurfacesImpl::SurfacesImpl(cc::SurfaceManager* manager, 17 SurfacesImpl::SurfacesImpl(cc::SurfaceManager* manager,
19 uint32_t id_namespace, 18 uint32_t id_namespace,
20 Client* client) 19 Client* client)
21 : manager_(manager), 20 : manager_(manager),
22 factory_(manager, this), 21 factory_(manager, this),
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 82
84 void SurfacesImpl::ReturnResources(const cc::ReturnedResourceArray& resources) { 83 void SurfacesImpl::ReturnResources(const cc::ReturnedResourceArray& resources) {
85 Array<ReturnedResourcePtr> ret(resources.size()); 84 Array<ReturnedResourcePtr> ret(resources.size());
86 for (size_t i = 0; i < resources.size(); ++i) { 85 for (size_t i = 0; i < resources.size(); ++i) {
87 ret[i] = ReturnedResource::From(resources[i]); 86 ret[i] = ReturnedResource::From(resources[i]);
88 } 87 }
89 client()->ReturnResources(ret.Pass()); 88 client()->ReturnResources(ret.Pass());
90 } 89 }
91 90
92 scoped_ptr<cc::OutputSurface> SurfacesImpl::CreateOutputSurface() { 91 scoped_ptr<cc::OutputSurface> SurfacesImpl::CreateOutputSurface() {
93 static GLES2Initializer* gles2 = new GLES2Initializer;
94 DCHECK(gles2);
95 return make_scoped_ptr(new cc::OutputSurface( 92 return make_scoped_ptr(new cc::OutputSurface(
96 new ContextProviderMojo(command_buffer_handle_.Pass()))); 93 new ContextProviderMojo(command_buffer_handle_.Pass())));
97 } 94 }
98 95
99 } // namespace mojo 96 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/public/platform/native/gles2_thunks.cc ('k') | mojo/services/view_manager/root_view_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698