Implement OSMesa image transport for TOUCH_UI builds

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"
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/gpu/gpu_data_manager.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/common/gpu/gpu_messages.h"
 
 #if defined(TOOLKIT_USES_GTK)
 // These two #includes need to come after gpu_messages.h.
 #include <gdk/gdkwindow.h>  // NOLINT
 #include <gdk/gdkx.h>  // NOLINT
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/size.h"
 #endif
+
 namespace {
 
 // One of the linux specific headers defines this as a macro.
 #ifdef DestroyAll
 #undef DestroyAll
 #endif
 
 base::LazyInstance<IDMap<GpuProcessHostUIShim> > g_hosts_by_id(
     base::LINKER_INITIALIZED);
 
@@ skipping 115 matching lines @@
   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)
-    IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceSetIOSurface,
-                        OnAcceleratedSurfaceSetIOSurface)
+    IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceNew,
+                        OnAcceleratedSurfaceNew)
     IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceBuffersSwapped,
                         OnAcceleratedSurfaceBuffersSwapped)
 #endif
 
 #if defined(TOUCH_UI)
     IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceRelease,
                         OnAcceleratedSurfaceRelease)
 #endif
     IPC_MESSAGE_UNHANDLED_ERROR()
   IPC_END_MESSAGE_MAP()
@@ skipping 52 matching lines @@
   // Always respond even if the window no longer exists. The GPU process cannot
   // make progress on the resizing command buffer until it receives the
   // response.
   Send(new GpuMsg_ResizeViewACK(renderer_id, command_buffer_route_id));
 }
 
 #endif
 
 #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)
     return;
   RenderWidgetHostView* view = host->view();
   if (!view)
     return;
+
 #if defined(OS_MACOSX)
   view->AcceleratedSurfaceSetIOSurface(params.window,
                                        params.width,
                                        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;
+  TransportDIB::Handle surface_handle;
+
+  surface_id = params.identifier;
+  view->AcceleratedSurfaceNew(
+      params.width, params.height, &surface_id, &surface_handle);
+
+  Send(new AcceleratedSurfaceMsg_NewACK(
+      params.route_id, surface_id, surface_handle));
 #endif
 }
 
 void GpuProcessHostUIShim::OnAcceleratedSurfaceBuffersSwapped(
     const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params) {
   TRACE_EVENT0("renderer",
       "GpuProcessHostUIShim::OnAcceleratedSurfaceBuffersSwapped");
   RenderViewHost* host = RenderViewHost::FromID(params.renderer_id,
                                                 params.render_view_id);
   if (!host)
@@ skipping 28 matching lines @@
                                                 params.render_view_id);
   if (!host)
     return;
   RenderWidgetHostView* view = host->view();
   if (!view)
     return;
   view->AcceleratedSurfaceRelease(params.identifier);
 }
 
 #endif