Aura: Browser-side changes for Composite-To-Mailbox

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index fe416ccad596990cf1cb3a4ca7010e2d6cf459cc..eac9387bbb63368c6a264a889b4e2d86064b3c37 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1960,9 +1960,14 @@ WebKit::WebCompositorOutputSurface* RenderViewImpl::createOutputSurface() {
       // stopgap adapter class to present the software renderer output using a
       // 3d context.
       return new CompositorOutputSurface(routing_id(), NULL,
-          new CompositorSoftwareOutputDeviceGLAdapter(context));
+          new CompositorSoftwareOutputDeviceGLAdapter(context), false);
   } else {
-      return new CompositorOutputSurface(routing_id(), context, NULL);
+      bool composite_to_mailbox =
+          command_line.HasSwitch(cc::switches::kCompositeToMailbox);
+      DCHECK(!composite_to_mailbox || command_line.HasSwitch(
+          cc::switches::kEnableCompositorFrameMessage));
+      return new CompositorOutputSurface(
+          routing_id(), context, NULL, composite_to_mailbox);
   }
 }