linux: OOP windowed plugins

There are still a few issues, but that's a start.
- only windowed plugins
- we can't currently create the gtksocket in background tabs, because their gtkwidgets are not yet in the hierarchy, so they can't be realized (that's what gives the XID).
- the plugin process talks to the browser process through the renderer process to create/destroy the gtksockets, because the plugin doesn't know which renderer it's talking to. We need a bit more plumbing to be able to have direct IPC.
- some code is duplicated between chrome and test_shell. We should probably factor it, but I'm not sure where the common part should live.

Review URL: http://codereview.chromium.org/146078

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19983 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 81 insertions, 5 deletions

diff --git a/chrome/browser/plugin_process_host.cc b/chrome/browser/plugin_process_host.cc
index 55885bd..bfe5ea8 100644
--- a/chrome/browser/plugin_process_host.cc
+++ b/chrome/browser/plugin_process_host.cc
@@ -20,6 +20,7 @@
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
+#include "base/gfx/native_widget_types.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
@@ -58,6 +59,10 @@
 #include "chrome/common/ipc_channel_posix.h"
 #endif
 
+#if defined(OS_LINUX)
+#include "base/gfx/gtk_native_view_id_manager.h"
+#endif
+
 static const char kDefaultPluginFinderURL[] =
     "http://dl.google.com/chrome/plugins/plugins2.xml";
 
@@ -288,6 +293,14 @@ void PluginProcessHost::AddWindow(HWND window) {
 
 #endif  // defined(OS_WIN)
 
+#if defined(OS_LINUX)
+void PluginProcessHost::OnMapNativeViewId(gfx::NativeViewId id,
+                                          gfx::PluginWindowHandle* output) {
+  *output = 0;
+  Singleton<GtkNativeViewManager>()->GetXIDForId(output, id);
+}
+#endif  // defined(OS_LINUX)
+
 PluginProcessHost::PluginProcessHost()
     : ChildProcessHost(
           PLUGIN_PROCESS,
@@ -438,6 +451,10 @@ void PluginProcessHost::OnMessageReceived(const IPC::Message& msg) {
                         OnPluginWindowDestroyed)
     IPC_MESSAGE_HANDLER(PluginProcessHostMsg_DownloadUrl, OnDownloadUrl)
 #endif
+#if defined(OS_LINUX)
+    IPC_MESSAGE_HANDLER(PluginProcessHostMsg_MapNativeViewId,
+                        OnMapNativeViewId)
+#endif
     IPC_MESSAGE_UNHANDLED_ERROR()
   IPC_END_MESSAGE_MAP()
 }
diff --git a/chrome/browser/plugin_process_host.h b/chrome/browser/plugin_process_host.h
index 72a5d78..62efdbd 100644
--- a/chrome/browser/plugin_process_host.h
+++ b/chrome/browser/plugin_process_host.h
@@ -110,6 +110,10 @@ class PluginProcessHost : public ChildProcessHost,
                      gfx::NativeWindow caller_window);
 #endif
 
+#if defined(OS_LINUX)
+  void OnMapNativeViewId(gfx::NativeViewId id, gfx::PluginWindowHandle* output);
+#endif
+
   virtual bool CanShutdown() { return sent_requests_.empty(); }
 
   struct ChannelRequest {
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index b7e0ad5..c06d4fa 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -671,6 +671,10 @@ bool RenderViewHost::SuddenTerminationAllowed() const {
 // RenderViewHost, IPC message handlers:
 
 void RenderViewHost::OnMessageReceived(const IPC::Message& msg) {
+#if !defined(OS_LINUX)
+  // On Windows there's a potential deadlock with sync messsages going in
+  // a circle from browser -> plugin -> renderer -> browser.
+  // On Linux we can avoid this by avoiding sync messages from browser->plugin.
   if (msg.is_sync() && !msg.is_caller_pumping_messages()) {
     NOTREACHED() << "Can't send sync messages to UI thread without pumping "
         "messages in the renderer or else deadlocks can occur if the page "
@@ -680,6 +684,7 @@ void RenderViewHost::OnMessageReceived(const IPC::Message& msg) {
     Send(reply);
     return;
   }
+#endif
 
   bool msg_is_ok = true;
   IPC_BEGIN_MESSAGE_MAP_EX(RenderViewHost, msg, msg_is_ok)
diff --git a/chrome/browser/renderer_host/render_widget_host.cc b/chrome/browser/renderer_host/render_widget_host.cc
index 5dec932..88c8c51 100644
--- a/chrome/browser/renderer_host/render_widget_host.cc
+++ b/chrome/browser/renderer_host/render_widget_host.cc
@@ -120,6 +120,12 @@ IPC_DEFINE_MESSAGE_MAP(RenderWidgetHost)
   IPC_MESSAGE_HANDLER(ViewHostMsg_SetCursor, OnMsgSetCursor)
   IPC_MESSAGE_HANDLER(ViewHostMsg_ImeUpdateStatus, OnMsgImeUpdateStatus)
   IPC_MESSAGE_HANDLER_GENERIC(ViewHostMsg_ShowPopup, OnMsgShowPopup(msg))
+#if defined(OS_LINUX)
+  IPC_MESSAGE_HANDLER(ViewHostMsg_CreatePluginContainer,
+                      OnMsgCreatePluginContainer)
+  IPC_MESSAGE_HANDLER(ViewHostMsg_DestroyPluginContainer,
+                      OnMsgDestroyPluginContainer)
+#endif
   IPC_MESSAGE_UNHANDLED_ERROR()
 IPC_END_MESSAGE_MAP()
 
@@ -748,6 +754,18 @@ void RenderWidgetHost::OnMsgShowPopup(const IPC::Message& message) {
 #endif
 }
 
+#if defined(OS_LINUX)
+void RenderWidgetHost::OnMsgCreatePluginContainer(
+    gfx::PluginWindowHandle *container) {
+  *container = view_->CreatePluginContainer();
+}
+
+void RenderWidgetHost::OnMsgDestroyPluginContainer(
+    gfx::PluginWindowHandle container) {
+  view_->DestroyPluginContainer(container);
+}
+#endif
+
 void RenderWidgetHost::PaintBackingStoreRect(TransportDIB* bitmap,
                                              const gfx::Rect& bitmap_rect,
                                              const gfx::Size& view_size) {
diff --git a/chrome/browser/renderer_host/render_widget_host.h b/chrome/browser/renderer_host/render_widget_host.h
index c551498..cf3f9d5 100644
--- a/chrome/browser/renderer_host/render_widget_host.h
+++ b/chrome/browser/renderer_host/render_widget_host.h
@@ -392,6 +392,10 @@ class RenderWidgetHost : public IPC::Channel::Listener {
   // having to bring in render_messages.h in a header file.
   void OnMsgImeUpdateStatus(int control, const gfx::Rect& caret_rect);
   void OnMsgShowPopup(const IPC::Message& message);
+#if defined(OS_LINUX)
+  void OnMsgCreatePluginContainer(gfx::PluginWindowHandle *container);
+  void OnMsgDestroyPluginContainer(gfx::PluginWindowHandle container);
+#endif
 
   // Paints the given bitmap to the current backing store at the given location.
   void PaintBackingStoreRect(TransportDIB* dib,
diff --git a/chrome/browser/renderer_host/render_widget_host_view.h b/chrome/browser/renderer_host/render_widget_host_view.h
index 2c4a3dc..dca077e 100644
--- a/chrome/browser/renderer_host/render_widget_host_view.h
+++ b/chrome/browser/renderer_host/render_widget_host_view.h
@@ -151,6 +151,11 @@ class RenderWidgetHostView {
                                   const std::vector<WebMenuItem>& items) = 0;
 #endif
 
+#if defined(OS_LINUX)
+  virtual gfx::PluginWindowHandle CreatePluginContainer() = 0;
+  virtual void DestroyPluginContainer(gfx::PluginWindowHandle container) = 0;
+#endif
+
   void set_activatable(bool activatable) {
     activatable_ = activatable;
   }
diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
index 1da195f..29d7275 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
@@ -34,7 +34,8 @@ using WebKit::WebInputEventFactory;
 class RenderWidgetHostViewGtkWidget {
  public:
   static GtkWidget* CreateNewWidget(RenderWidgetHostViewGtk* host_view) {
-    GtkWidget* widget = gtk_drawing_area_new();
+    GtkWidget* widget = gtk_fixed_new();
+    gtk_fixed_set_has_window(GTK_FIXED(widget), TRUE);
     gtk_widget_set_double_buffered(widget, FALSE);
 #if defined(NDEBUG)
     gtk_widget_modify_bg(widget, GTK_STATE_NORMAL, &gfx::kGdkWhite);
@@ -375,6 +376,7 @@ RenderWidgetHostViewGtk::~RenderWidgetHostViewGtk() {
 
 void RenderWidgetHostViewGtk::InitAsChild() {
   view_.Own(RenderWidgetHostViewGtkWidget::CreateNewWidget(this));
+  plugin_container_manager_.set_host_widget(view_.get());
   gtk_widget_show(view_.get());
 }
 
@@ -384,6 +386,7 @@ void RenderWidgetHostViewGtk::InitAsPopup(
   parent_ = parent_host_view->GetNativeView();
   GtkWidget* popup = gtk_window_new(GTK_WINDOW_POPUP);
   view_.Own(RenderWidgetHostViewGtkWidget::CreateNewWidget(this));
+  plugin_container_manager_.set_host_widget(view_.get());
   gtk_container_add(GTK_CONTAINER(popup), view_.get());
 
   // If we are not activatable, we don't want to grab keyboard input,
@@ -471,10 +474,9 @@ gfx::NativeView RenderWidgetHostViewGtk::GetNativeView() {
 
 void RenderWidgetHostViewGtk::MovePluginWindows(
     const std::vector<WebPluginGeometry>& plugin_window_moves) {
-  if (plugin_window_moves.empty())
-    return;
-
-  NOTIMPLEMENTED();
+  for (size_t i = 0; i < plugin_window_moves.size(); ++i) {
+    plugin_container_manager_.MovePluginContainer(plugin_window_moves[i]);
+  }
 }
 
 void RenderWidgetHostViewGtk::Focus() {
@@ -573,6 +575,7 @@ void RenderWidgetHostViewGtk::DidScrollRect(const gfx::Rect& rect, int dx,
 
 void RenderWidgetHostViewGtk::RenderViewGone() {
   Destroy();
+  plugin_container_manager_.set_host_widget(NULL);
 }
 
 void RenderWidgetHostViewGtk::Destroy() {
@@ -707,3 +710,12 @@ void RenderWidgetHostViewGtk::ReceivedSelectionText(GtkClipboard* clipboard,
   host_view->host_->Send(new ViewMsg_InsertText(host_view->host_->routing_id(),
                                                 UTF8ToUTF16(text)));
 }
+
+gfx::PluginWindowHandle RenderWidgetHostViewGtk::CreatePluginContainer() {
+  return plugin_container_manager_.CreatePluginContainer();
+}
+
+void RenderWidgetHostViewGtk::DestroyPluginContainer(
+    gfx::PluginWindowHandle container) {
+  plugin_container_manager_.DestroyPluginContainer(container);
+}
diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.h b/chrome/browser/renderer_host/render_widget_host_view_gtk.h
index 3df3006..1caa1ac 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_gtk.h
+++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.h
@@ -12,6 +12,7 @@
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/common/owned_widget_gtk.h"
 #include "chrome/common/render_messages.h"
+#include "webkit/glue/plugins/gtk_plugin_container_manager.h"
 #include "webkit/glue/webcursor.h"
 
 class RenderWidgetHost;
@@ -59,6 +60,8 @@ class RenderWidgetHostViewGtk : public RenderWidgetHostView {
   virtual void PasteFromSelectionClipboard();
   virtual void ShowingContextMenu(bool showing);
   virtual BackingStore* AllocBackingStore(const gfx::Size& size);
+  virtual gfx::PluginWindowHandle CreatePluginContainer();
+  virtual void DestroyPluginContainer(gfx::PluginWindowHandle container);
 
   gfx::NativeView native_view() const { return view_.get(); }
 
@@ -137,6 +140,9 @@ class RenderWidgetHostViewGtk : public RenderWidgetHostView {
   // This state is used when GtkIMContext signal handlers create Char events
   // because they don't use the GdkEventKey objects and cannot get the state.
   int im_modifier_state_;
+
+  // Helper class that lets us allocate plugin containers and move them.
+  GtkPluginContainerManager plugin_container_manager_;
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_GTK_H_
diff --git a/chrome/browser/renderer_host/test/test_render_view_host.h b/chrome/browser/renderer_host/test/test_render_view_host.h
index d87ce14..0b16181 100644
--- a/chrome/browser/renderer_host/test/test_render_view_host.h
+++ b/chrome/browser/renderer_host/test/test_render_view_host.h
@@ -79,6 +79,11 @@ class TestRenderWidgetHostView : public RenderWidgetHostView {
                                   const std::vector<WebMenuItem>& items) {}
 #endif
 
+#if defined(OS_LINUX)
+  virtual gfx::PluginWindowHandle CreatePluginContainer() { return 0; }
+  virtual void DestroyPluginContainer(gfx::PluginWindowHandle container) { }
+#endif
+
   bool is_showing() const { return is_showing_; }
 
  private: