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>(); |