Initial port of accelerated compositor to Mac OS X 10.6. Reused...

chrome/gpu/gpu_channel.cc

 // Copyright (c) 2010 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.
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include "chrome/gpu/gpu_channel.h"
 
@@ skipping 82 matching lines @@
     IPC_MESSAGE_UNHANDLED_ERROR()
   IPC_END_MESSAGE_MAP()
 }
 
 int GpuChannel::GenerateRouteID() {
   static int last_id = 0;
   return ++last_id;
 }
 
 void GpuChannel::OnCreateViewCommandBuffer(gfx::NativeViewId view_id,
+                                           int32 render_view_id,
                                            int32* route_id) {
   *route_id = 0;
 
 #if defined(ENABLE_GPU)
 
   gfx::PluginWindowHandle handle = gfx::kNullPluginWindow;
 #if defined(OS_WIN)
   gfx::NativeView view = gfx::NativeViewFromId(view_id);
 
   // Check that the calling renderer is allowed to render to this window.
   // TODO(apatrick): consider killing the renderer process rather than failing.
   int view_renderer_id = reinterpret_cast<int>(
       GetProp(view, chrome::kChromiumRendererIdProperty));
   if (view_renderer_id != renderer_id_)
     return;
   handle = view;
 #elif defined(OS_LINUX)
   ChildThread* gpu_thread = ChildThread::current();
   // Ask the browser for the view's XID.
   // TODO(piman): This assumes that it doesn't change. It can change however
   // when tearing off tabs. This needs a fix in the browser UI code. A possible
   // alternative would be to add a socket/plug pair like with plugins but that
   // has issues with events and focus.
   gpu_thread->Send(new GpuHostMsg_GetViewXID(view_id, &handle));
+#elif defined(OS_MACOSX)
+  // On Mac OS X we currently pass a (fake) PluginWindowHandle for the
+  // NativeViewId. We could allocate fake NativeViewIds on the browser
+  // side as well, and map between those and PluginWindowHandles, but
+  // this seems excessive.
+  handle = static_cast<gfx::PluginWindowHandle>(
+      static_cast<intptr_t>(view_id));
 #else
   // TODO(apatrick): This needs to be something valid for mac and linux.
   // Offscreen rendering will work on these platforms but not rendering to the
   // window.
   DCHECK_EQ(view_id, 0);
 #endif
 
   *route_id = GenerateRouteID();
   scoped_ptr<GpuCommandBufferStub> stub(new GpuCommandBufferStub(
-      this, handle, NULL, gfx::Size(), 0, *route_id));
+      this, handle, NULL, gfx::Size(), 0, *route_id,
+      renderer_id_, render_view_id));
   router_.AddRoute(*route_id, stub.get());
   stubs_.AddWithID(stub.release(), *route_id);
 #endif  // ENABLE_GPU
 }
 
 void GpuChannel::OnCreateOffscreenCommandBuffer(int32 parent_route_id,
                                                 const gfx::Size& size,
                                                 uint32 parent_texture_id,
                                                 int32* route_id) {
 #if defined(ENABLE_GPU)
   *route_id = GenerateRouteID();
   GpuCommandBufferStub* parent_stub = NULL;
   if (parent_route_id != 0)
     parent_stub = stubs_.Lookup(parent_route_id);
 
   scoped_ptr<GpuCommandBufferStub> stub(new GpuCommandBufferStub(
       this,
       gfx::kNullPluginWindow,
       parent_stub,
       size,
       parent_texture_id,
-      *route_id));
+      *route_id,
+      0, 0));
   router_.AddRoute(*route_id, stub.get());
   stubs_.AddWithID(stub.release(), *route_id);
 #else
   *route_id = 0;
 #endif
 }
 
 void GpuChannel::OnDestroyCommandBuffer(int32 route_id) {
 #if defined(ENABLE_GPU)
   router_.RemoveRoute(route_id);
@@ skipping 20 matching lines @@
   channel_.reset(new IPC::SyncChannel(
       channel_name, IPC::Channel::MODE_SERVER, this, NULL,
       ChildProcess::current()->io_message_loop(), false,
       ChildProcess::current()->GetShutDownEvent()));
   return true;
 }
 
 std::string GpuChannel::GetChannelName() {
   return StringPrintf("%d.r%d", base::GetCurrentProcId(), renderer_id_);
 }