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

Unified Diff: mojo/cc/output_surface_mojo.cc

Issue 1340983002: Mandoline UI Process: Update namespaces and file names (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/cc/output_surface_mojo.h ('k') | mojo/gles2/command_buffer_client_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/cc/output_surface_mojo.cc
diff --git a/mojo/cc/output_surface_mojo.cc b/mojo/cc/output_surface_mojo.cc
index 236bd1d6a23cc02e1558f5ab53604250fa1254ca..68803baebb6ecc34329ec2abc84285a9dc2544d0 100644
--- a/mojo/cc/output_surface_mojo.cc
+++ b/mojo/cc/output_surface_mojo.cc
@@ -15,9 +15,8 @@ namespace mojo {
OutputSurfaceMojo::OutputSurfaceMojo(
const scoped_refptr<cc::ContextProvider>& context_provider,
- scoped_ptr<mojo::ViewSurface> surface)
- : cc::OutputSurface(context_provider),
- surface_(surface.Pass()) {
+ scoped_ptr<mus::ViewSurface> surface)
+ : cc::OutputSurface(context_provider), surface_(surface.Pass()) {
capabilities_.delegated_rendering = true;
capabilities_.max_frames_pending = 1;
}
@@ -40,7 +39,7 @@ void OutputSurfaceMojo::SwapBuffers(cc::CompositorFrame* frame) {
}
void OutputSurfaceMojo::OnResourcesReturned(
- mojo::ViewSurface* surface,
+ mus::ViewSurface* surface,
mojo::Array<mojo::ReturnedResourcePtr> resources) {
cc::CompositorFrameAck cfa;
cfa.resources = resources.To<cc::ReturnedResourceArray>();
« no previous file with comments | « mojo/cc/output_surface_mojo.h ('k') | mojo/gles2/command_buffer_client_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698