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

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/bind.h"
@@ skipping 1942 matching lines @@
   WebGraphicsContext3D* context = CreateGraphicsContext3D(attributes);
   if (!context)
     return NULL;
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kEnableSoftwareCompositingGLAdapter)) {
       // In the absence of a software-based delegating renderer, use this
       // 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);
   }
 }
 
 void RenderViewImpl::didAddMessageToConsole(
     const WebConsoleMessage& message, const WebString& source_name,
     unsigned source_line) {
   logging::LogSeverity log_severity = logging::LOG_VERBOSE;
   switch (message.level) {
     case WebConsoleMessage::LevelTip:
       log_severity = logging::LOG_VERBOSE;
@@ skipping 4609 matching lines @@
 }
 #endif
 
 void RenderViewImpl::OnReleaseDisambiguationPopupDIB(
     TransportDIB::Handle dib_handle) {
   TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle);
   RenderProcess::current()->ReleaseTransportDIB(dib);
 }
 
 }  // namespace content