Enable accelerated WebKit compositor for Aura.

content/browser/gpu/gpu_process_host_ui_shim.cc

 // Copyright (c) 2011 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/id_map.h"
 #include "base/process_util.h"
@@ skipping 127 matching lines @@
 
 bool GpuProcessHostUIShim::OnMessageReceived(const IPC::Message& message) {
   DCHECK(CalledOnValidThread());
 
   if (message.routing_id() != MSG_ROUTING_CONTROL)
     return false;
 
   return OnControlMessageReceived(message);
 }
 
-#if defined(OS_MACOSX) || defined(TOUCH_UI)
+#if defined(OS_MACOSX) || defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
 
 void GpuProcessHostUIShim::SendToGpuHost(int host_id, IPC::Message* msg) {
   GpuProcessHostUIShim* ui_shim = FromID(host_id);
   if (!ui_shim) {
     delete msg;
     return;
   }
 
   ui_shim->Send(msg);
 }
 
 #endif
 
 GpuProcessHostUIShim::~GpuProcessHostUIShim() {
   DCHECK(CalledOnValidThread());
   g_hosts_by_id.Pointer()->Remove(host_id_);
 }
 
 bool GpuProcessHostUIShim::OnControlMessageReceived(
     const IPC::Message& message) {
   DCHECK(CalledOnValidThread());
 
   IPC_BEGIN_MESSAGE_MAP(GpuProcessHostUIShim, message)
     IPC_MESSAGE_HANDLER(GpuHostMsg_OnLogMessage,
                         OnLogMessage)
 #if defined(TOOLKIT_USES_GTK) && !defined(TOUCH_UI) || defined(OS_WIN)
     IPC_MESSAGE_HANDLER(GpuHostMsg_ResizeView, OnResizeView)
 #endif
 
-#if defined(OS_MACOSX) || defined(TOUCH_UI)
+#if defined(OS_MACOSX) || defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
     IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceBuffersSwapped,
                         OnAcceleratedSurfaceBuffersSwapped)
     IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceNew,
                         OnAcceleratedSurfaceNew)
 #endif
 
-#if defined(TOUCH_UI)
+#if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
     IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceRelease,
                         OnAcceleratedSurfaceRelease)
 #endif
     IPC_MESSAGE_UNHANDLED_ERROR()
   IPC_END_MESSAGE_MAP()
 
   return true;
 }
 
 void GpuProcessHostUIShim::OnLogMessage(
@@ skipping 50 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(TOUCH_UI)
+#if defined(OS_MACOSX) || defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
 
 void GpuProcessHostUIShim::OnAcceleratedSurfaceNew(
     const GpuHostMsg_AcceleratedSurfaceNew_Params& params) {
   ScopedSendOnIOThread delayed_send(
       host_id_,
       new AcceleratedSurfaceMsg_NewACK(
           params.route_id,
           params.surface_id,
           TransportDIB::DefaultHandleValue()));
 
@@ skipping 29 matching lines @@
           return;
         }
       }
     }
   } else {
     view->AcceleratedSurfaceSetIOSurface(params.window,
                                          params.width,
                                          params.height,
                                          surface_id);
   }
-#elif defined(TOUCH_UI)
+#else  // defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
   view->AcceleratedSurfaceNew(
       params.width, params.height, &surface_id, &surface_handle);
 #endif
   delayed_send.Cancel();
   Send(new AcceleratedSurfaceMsg_NewACK(
       params.route_id, surface_id, surface_handle));
 }
 
 void GpuProcessHostUIShim::OnAcceleratedSurfaceBuffersSwapped(
     const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params) {
@@ skipping 17 matching lines @@
 
 #if defined (OS_MACOSX)
   view->AcceleratedSurfaceBuffersSwapped(
       // Parameters needed to swap the IOSurface.
       params.window,
       params.surface_id,
       // Parameters needed to formulate an acknowledgment.
       params.renderer_id,
       params.route_id,
       host_id_);
-#elif defined(TOUCH_UI)
+#else  // defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
   // view must send ACK message after next composite
   view->AcceleratedSurfaceBuffersSwapped(
       params.surface_id, params.route_id, host_id_);
 #endif
 }
 
 #endif
 
-#if defined(TOUCH_UI)
+#if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
 
 void GpuProcessHostUIShim::OnAcceleratedSurfaceRelease(
     const GpuHostMsg_AcceleratedSurfaceRelease_Params& params) {
   RenderViewHost* host = RenderViewHost::FromID(params.renderer_id,
                                                 params.render_view_id);
   if (!host)
     return;
   RenderWidgetHostView* view = host->view();
   if (!view)
     return;
   view->AcceleratedSurfaceRelease(params.identifier);
 }
 
 #endif