3D Compositing in <browser>, first draft.

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 189 matching lines @@
     IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfacePostSubBuffer,
                         OnAcceleratedSurfacePostSubBuffer)
     IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceSuspend,
                         OnAcceleratedSurfaceSuspend)
     IPC_MESSAGE_HANDLER(GpuHostMsg_GraphicsInfoCollected,
                         OnGraphicsInfoCollected)
 
 #if defined(TOOLKIT_GTK) || defined(OS_WIN)
     IPC_MESSAGE_HANDLER(GpuHostMsg_ResizeView, OnResizeView)
 #endif
-
-#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()
   IPC_END_MESSAGE_MAP()
 
   return true;
 }
 
 void GpuProcessHostUIShim::OnLogMessage(
     int level,
     const std::string& header,
@@ skipping 21 matching lines @@
                                         gfx::Size size) {
   // 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.
   ScopedSendOnIOThread delayed_send(
       host_id_,
       new AcceleratedSurfaceMsg_ResizeViewACK(route_id));
 
   RenderWidgetHostViewPort* view =
       GetRenderWidgetHostViewFromSurfaceID(surface_id);
-  if (!view)
+  if (!view || !view->ResizeNeedsNewSurface())

[Fady Samuel, 2012/07/06 15:14:44]

Why would a resize not require a new surface?

[scshunt, 2012/07/06 16:39:03]

Various platform-specific reasons (note that this codepath was never used on Mac
or Aura). In the texture image transport case, a texture can be of any size
without additional allocation, so you don't need to grab two new texture handles
when you resize.

     return;
 
   gfx::GLSurfaceHandle surface = view->GetCompositingSurface();
 
   // Resize the window synchronously. The GPU process must not issue GL
   // calls on the command buffer until the window is the size it expects it
   // to be.
 #if defined(TOOLKIT_GTK)
   GdkWindow* window = reinterpret_cast<GdkWindow*>(
       gdk_xid_table_lookup(surface.handle));
@@ skipping 10 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(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();
 
   view->AcceleratedSurfaceNew(
       params.width, params.height, &surface_handle, &shm_handle);
   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;
   if (cmd_line->HasSwitch(switches::kGpuSwapDelay)) {
     base::StringToInt(cmd_line->GetSwitchValueNative(
         switches::kGpuSwapDelay).c_str(), &delay);
   }
   return base::TimeDelta::FromMilliseconds(delay);
 }
 
@@ skipping 46 matching lines @@
       "GpuProcessHostUIShim::OnAcceleratedSurfaceSuspend");
 
   RenderWidgetHostViewPort* view =
       GetRenderWidgetHostViewFromSurfaceID(surface_id);
   if (!view)
     return;
 
   view->AcceleratedSurfaceSuspend();
 }
 
-#if defined(USE_AURA)
-
 void GpuProcessHostUIShim::OnAcceleratedSurfaceRelease(
     const GpuHostMsg_AcceleratedSurfaceRelease_Params& params) {
   RenderWidgetHostViewPort* view = GetRenderWidgetHostViewFromSurfaceID(
       params.surface_id);
   if (!view)
     return;
   view->AcceleratedSurfaceRelease(params.identifier);
 }
-
-#endif