Implement OSMesa image transport for TOUCH_UI builds

content/browser/gpu/gpu_process_host_ui_shim.cc

Index: content/browser/gpu/gpu_process_host_ui_shim.cc
diff --git a/content/browser/gpu/gpu_process_host_ui_shim.cc b/content/browser/gpu/gpu_process_host_ui_shim.cc
index e2aa7e2cffad0f6688ee1da7266a4f88d7b466c9..038f95ebcc693c7f34e3ca4084c48262bfb7a34c 100644
--- a/content/browser/gpu/gpu_process_host_ui_shim.cc
+++ b/content/browser/gpu/gpu_process_host_ui_shim.cc
@@ -159,14 +159,20 @@ bool GpuProcessHostUIShim::OnControlMessageReceived(
     IPC_MESSAGE_HANDLER(GpuHostMsg_ResizeView, OnResizeView)
 #endif
 
-#if defined(OS_MACOSX) || defined(TOUCH_UI)
+#if defined(OS_MACOSX)
     IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceSetIOSurface,
                         OnAcceleratedSurfaceSetIOSurface)
+#endif
+
+#if defined(OS_MACOSX) || defined(TOUCH_UI)
     IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceBuffersSwapped,
                         OnAcceleratedSurfaceBuffersSwapped)
 #endif
 
 #if defined(TOUCH_UI)
+    IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceNew,
+                        OnAcceleratedSurfaceNew)
+
     IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceRelease,
                         OnAcceleratedSurfaceRelease)
 #endif
@@ -234,8 +240,8 @@ void GpuProcessHostUIShim::OnResizeView(int32 renderer_id,
 
 #if defined(OS_MACOSX) || defined(TOUCH_UI)
 
-void GpuProcessHostUIShim::OnAcceleratedSurfaceSetIOSurface(
-    const GpuHostMsg_AcceleratedSurfaceSetIOSurface_Params& params) {
+void GpuProcessHostUIShim::OnAcceleratedSurfaceNew(
+    const GpuHostMsg_AcceleratedSurfaceNew_Params& params) {
   RenderViewHost* host = RenderViewHost::FromID(params.renderer_id,
                                                 params.render_view_id);
   if (!host)
@@ -249,10 +255,14 @@ void GpuProcessHostUIShim::OnAcceleratedSurfaceSetIOSurface(
                                        params.height,
                                        params.identifier);
 #elif defined(TOUCH_UI)
-  view->AcceleratedSurfaceSetIOSurface(
-      params.width, params.height, params.identifier);
-  Send(new AcceleratedSurfaceMsg_SetSurfaceACK(
-      params.route_id, params.identifier));
+  uint64 surface_id = params.identifier;
+  TransportDIB::Handle surface_handle;
+
+  view->AcceleratedSurfaceNew(
+      params.width, params.height, &surface_id, &surface_handle);
+
+  Send(new AcceleratedSurfaceMsg_NewACK(
+      params.route_id, surface_id, surface_handle));
 #endif
 }