Unobfuscate RWHVMac accelerated compositing code path by separating it from plugin code

content/browser/gpu/gpu_process_host_ui_shim.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/browser/gpu/gpu_process_host_ui_shim.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 184 matching lines @@
                         OnAcceleratedSurfacePostSubBuffer)
     IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceSuspend,
                         OnAcceleratedSurfaceSuspend)
     IPC_MESSAGE_HANDLER(GpuHostMsg_GraphicsInfoCollected,
                         OnGraphicsInfoCollected)
 
 #if defined(TOOLKIT_USES_GTK) || defined(OS_WIN)
     IPC_MESSAGE_HANDLER(GpuHostMsg_ResizeView, OnResizeView)
 #endif
 
-#if defined(OS_MACOSX) || defined(USE_AURA)
+#if defined(USE_AURA)
     IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceNew,
                         OnAcceleratedSurfaceNew)
 #endif
 
 #if defined(USE_AURA)
     IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceRelease,
                         OnAcceleratedSurfaceRelease)
 #endif
 
     IPC_MESSAGE_UNHANDLED_ERROR()
@@ skipping 60 matching lines @@
       0, 0,
       std::max(1, size.width()),
       std::max(1, size.height()),
       SWP_NOSENDCHANGING | SWP_NOCOPYBITS | SWP_NOZORDER |
           SWP_NOACTIVATE | SWP_DEFERERASE);
 #endif
 }
 
 #endif
 
-#if defined(OS_MACOSX) || defined(USE_AURA)
+#if defined(USE_AURA)
 
 void GpuProcessHostUIShim::OnAcceleratedSurfaceNew(
     const GpuHostMsg_AcceleratedSurfaceNew_Params& params) {
   ScopedSendOnIOThread delayed_send(
       host_id_,
       new AcceleratedSurfaceMsg_NewACK(
           params.route_id,
           params.surface_handle,
           TransportDIB::DefaultHandleValue()));
 
   RenderWidgetHostViewPort* view = GetRenderWidgetHostViewFromSurfaceID(
       params.surface_id);
   if (!view)
     return;
 
   uint64 surface_handle = params.surface_handle;
   TransportDIB::Handle shm_handle = TransportDIB::DefaultHandleValue();
 
-#if defined(OS_MACOSX)
-  if (params.create_transport_dib) {
-    scoped_ptr<base::SharedMemory> shared_memory(new base::SharedMemory());
-    if (shared_memory->CreateAnonymous(params.width * params.height * 4)) {
-      // Create a local handle for RWHVMac to map the SHM.
-      TransportDIB::Handle local_handle;
-      if (!shared_memory->ShareToProcess(0 /* pid, not needed */,
-                                         &local_handle)) {
-        return;
-      } else {
-        view->AcceleratedSurfaceSetTransportDIB(params.window,
-                                                params.width,
-                                                params.height,
-                                                local_handle);
-        // Create a remote handle for the GPU process to map the SHM.
-        if (!shared_memory->ShareToProcess(0 /* pid, not needed */,
-                                           &shm_handle)) {
-          return;
-        }
-      }
-    }
-  } else {
-    view->AcceleratedSurfaceSetIOSurface(params.window,
-                                         params.width,
-                                         params.height,
-                                         surface_handle);
-  }
-#else  // defined(USE_AURA)
   view->AcceleratedSurfaceNew(
       params.width, params.height, &surface_handle, &shm_handle);
-#endif
   delayed_send.Cancel();
   Send(new AcceleratedSurfaceMsg_NewACK(
       params.route_id, surface_handle, shm_handle));
 }
 
 #endif
 
 static base::TimeDelta GetSwapDelay() {
   CommandLine* cmd_line = CommandLine::ForCurrentProcess();
   int delay = 0;
@@ skipping 65 matching lines @@
 void GpuProcessHostUIShim::OnAcceleratedSurfaceRelease(
     const GpuHostMsg_AcceleratedSurfaceRelease_Params& params) {
   RenderWidgetHostViewPort* view = GetRenderWidgetHostViewFromSurfaceID(
       params.surface_id);
   if (!view)
     return;
   view->AcceleratedSurfaceRelease(params.identifier);
 }
 
 #endif