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

Side by Side Diff: mojo/cc/output_surface_mojo.cc

Issue 1344573002: Mandoline: Rename components/view_manager to components/mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 5 years, 3 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
« no previous file with comments | « mojo/cc/output_surface_mojo.h ('k') | mojo/converters/surfaces/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/cc/output_surface_mojo.h" 5 #include "mojo/cc/output_surface_mojo.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "cc/output/compositor_frame.h" 8 #include "cc/output/compositor_frame.h"
9 #include "cc/output/compositor_frame_ack.h" 9 #include "cc/output/compositor_frame_ack.h"
10 #include "cc/output/output_surface_client.h" 10 #include "cc/output/output_surface_client.h"
11 #include "components/view_manager/public/cpp/view_surface.h" 11 #include "components/mus/public/cpp/view_surface.h"
12 #include "mojo/converters/surfaces/surfaces_type_converters.h" 12 #include "mojo/converters/surfaces/surfaces_type_converters.h"
13 13
14 namespace mojo { 14 namespace mojo {
15 15
16 OutputSurfaceMojo::OutputSurfaceMojo( 16 OutputSurfaceMojo::OutputSurfaceMojo(
17 const scoped_refptr<cc::ContextProvider>& context_provider, 17 const scoped_refptr<cc::ContextProvider>& context_provider,
18 scoped_ptr<mojo::ViewSurface> surface) 18 scoped_ptr<mojo::ViewSurface> surface)
19 : cc::OutputSurface(context_provider), 19 : cc::OutputSurface(context_provider),
20 surface_(surface.Pass()) { 20 surface_(surface.Pass()) {
21 capabilities_.delegated_rendering = true; 21 capabilities_.delegated_rendering = true;
(...skipping 19 matching lines...) Expand all
41 41
42 void OutputSurfaceMojo::OnResourcesReturned( 42 void OutputSurfaceMojo::OnResourcesReturned(
43 mojo::ViewSurface* surface, 43 mojo::ViewSurface* surface,
44 mojo::Array<mojo::ReturnedResourcePtr> resources) { 44 mojo::Array<mojo::ReturnedResourcePtr> resources) {
45 cc::CompositorFrameAck cfa; 45 cc::CompositorFrameAck cfa;
46 cfa.resources = resources.To<cc::ReturnedResourceArray>(); 46 cfa.resources = resources.To<cc::ReturnedResourceArray>();
47 ReclaimResources(&cfa); 47 ReclaimResources(&cfa);
48 } 48 }
49 49
50 } // namespace mojo 50 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/cc/output_surface_mojo.h ('k') | mojo/converters/surfaces/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698