gpu: Add support for GLX_EXT_texture_from_pixmap extension.

content/common/gpu/gpu_channel_manager.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/common/gpu/gpu_channel_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "content/common/child_thread.h"
 #include "content/common/gpu/gpu_channel.h"
@@ skipping 24 matching lines @@
   DCHECK(io_message_loop);
   DCHECK(shutdown_event);
 }
 
 GpuChannelManager::~GpuChannelManager() {
   gpu_channels_.clear();
   if (default_offscreen_surface_.get()) {
     default_offscreen_surface_->Destroy();
     default_offscreen_surface_ = NULL;
   }
+  DCHECK(image_operations_.empty());
 }
 
 gpu::gles2::ProgramCache* GpuChannelManager::program_cache() {
   if (!program_cache_.get() &&
       (gfx::g_ARB_get_program_binary || gfx::g_OES_get_program_binary) &&
       !CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableGpuProgramCache)) {
     program_cache_.reset(new gpu::gles2::MemoryProgramCache());
   }
   return program_cache_.get();
@@ skipping 33 matching lines @@
 }
 
 bool GpuChannelManager::OnMessageReceived(const IPC::Message& msg) {
   bool msg_is_ok = true;
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP_EX(GpuChannelManager, msg, msg_is_ok)
     IPC_MESSAGE_HANDLER(GpuMsg_EstablishChannel, OnEstablishChannel)
     IPC_MESSAGE_HANDLER(GpuMsg_CloseChannel, OnCloseChannel)
     IPC_MESSAGE_HANDLER(GpuMsg_CreateViewCommandBuffer,
                         OnCreateViewCommandBuffer)
+    IPC_MESSAGE_HANDLER(GpuMsg_CreateImage, OnCreateImage)
+    IPC_MESSAGE_HANDLER(GpuMsg_DeleteImage, OnDeleteImage)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP_EX()
   return handled;
 }
 
 bool GpuChannelManager::Send(IPC::Message* msg) {
   return gpu_child_thread_->Send(msg);
 }
 
 void GpuChannelManager::OnEstablishChannel(int client_id, bool share_context) {
@@ skipping 54 matching lines @@
 
   GpuChannelMap::const_iterator iter = gpu_channels_.find(client_id);
   if (iter != gpu_channels_.end()) {
     iter->second->CreateViewCommandBuffer(
         window, surface_id, init_params, &route_id);
   }
 
   Send(new GpuHostMsg_CommandBufferCreated(route_id));
 }
 
+void GpuChannelManager::CreateImage(
+    gfx::PluginWindowHandle window, int32 client_id, int32 image_id) {
+  gfx::Size size;
+
+  GpuChannelMap::const_iterator iter = gpu_channels_.find(client_id);
+  if (iter != gpu_channels_.end()) {
+    iter->second->CreateImage(window, image_id, &size);
+  }
+
+  Send(new GpuHostMsg_ImageCreated(size));
+}
+
+void GpuChannelManager::OnCreateImage(
+    gfx::PluginWindowHandle window, int32 client_id, int32 image_id) {
+  DCHECK(image_id);
+
+  if (image_operations_.empty())
+    CreateImage(window, client_id, image_id);
+  else

[piman, 2012/10/17 17:46:20]

nit: style requires braces here because the statement spans multiple lines.
Also, it means you have to use braces on the other side of the else.

[reveman, 2012/10/17 21:22:55]

Ah, braces required for multiple lines and not just multiple statements. Didn't
know that.

+    image_operations_.push_back(
+        std::make_pair(0, base::Bind(&GpuChannelManager::CreateImage,
+                                     base::Unretained(this),
+                                     window,
+                                     client_id,
+                                     image_id)));
+}
+
+void GpuChannelManager::DeleteImage(int32 client_id, int32 image_id) {
+  GpuChannelMap::const_iterator iter = gpu_channels_.find(client_id);
+  if (iter != gpu_channels_.end()) {
+    iter->second->DeleteImage(image_id);
+  }
+}
+
+void GpuChannelManager::OnDeleteImage(
+    int32 client_id, int32 image_id, int32 sync_point) {
+  DCHECK(image_id);
+
+  if (!sync_point && image_operations_.empty()) {
+    DeleteImage(client_id, image_id);
+  } else {
+    image_operations_.push_back(
+        std::make_pair(sync_point, base::Bind(&GpuChannelManager::DeleteImage,
+                                              base::Unretained(this),
+                                              client_id,
+                                              image_id)));
+    if (sync_point)

[piman, 2012/10/17 17:46:20]

nit: style requires braces

+      sync_point_manager()->AddSyncPointCallback(
+          sync_point,
+          base::Bind(&GpuChannelManager::OnDeleteImageSyncPointRetired,
+                     base::Unretained(this),
+                     &image_operations_.back()));

[piman, 2012/10/17 17:46:20]

I don't think taking a pointer to the deque entry is safe here, since all
insertions/removals invalidate all iterators.

[reveman, 2012/10/17 21:22:55]

Oops, that's bad.

+  }
+}
+
+void GpuChannelManager::OnDeleteImageSyncPointRetired(
+    ImageOperation* delete_image_operation) {
+  // Mark operation as no longer having a pending sync point.
+  delete_image_operation->first = 0;
+
+  // De-queue operations until we reach a pending sync point.
+  while (!image_operations_.empty()) {
+    // Check if operation has a pending sync point.
+    if (image_operations_.front().first)
+      return;
+
+    image_operations_.front().second.Run();
+    image_operations_.pop_front();
+  }
+}
+
 void GpuChannelManager::LoseAllContexts() {
   MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&GpuChannelManager::OnLoseAllContexts,
                  weak_factory_.GetWeakPtr()));
 }
 
 void GpuChannelManager::OnLoseAllContexts() {
   gpu_channels_.clear();
 }
 
 gfx::GLSurface* GpuChannelManager::GetDefaultOffscreenSurface() {
   if (!default_offscreen_surface_.get()) {
     default_offscreen_surface_ = gfx::GLSurface::CreateOffscreenGLSurface(
         false, gfx::Size(1, 1));
   }
   return default_offscreen_surface_.get();
 }