linux: only create browser-side plugin container after plugin requests it

webkit/tools/test_shell/test_webview_delegate_gtk.cc

 // Copyright (c) 2008 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.
 
 // This file was forked off the Mac port.
 
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
 #include <gtk/gtk.h>
+#include <gdk/gdkx.h>
 
 #include "base/gfx/gtk_util.h"
 #include "base/gfx/point.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "net/base/net_errors.h"
 #include "chrome/common/page_transition_types.h"
 #include "webkit/api/public/WebRect.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/glue/webdropdata.h"
@@ skipping 64 matching lines @@
   bool allow_wildcard = true;
   WebPluginInfo info;
   if (!NPAPI::PluginList::Singleton()->GetPluginInfo(url, mime_type, clsid,
                                                      allow_wildcard, &info,
                                                      actual_mime_type))
     return NULL;
 
   const std::string& mtype =
       (actual_mime_type && !actual_mime_type->empty()) ? *actual_mime_type
                                                        : mime_type;
-
+  // TODO(evanm): we probably shouldn't be doing this mapping to X ids at
+  // this level.
   GdkNativeWindow plugin_parent =
-      shell_->webViewHost()->CreatePluginContainer();
+      GDK_WINDOW_XWINDOW(shell_->webViewHost()->view_handle()->window);
 
   return WebPluginDelegateImpl::Create(info.path, mtype, plugin_parent);
 }
 
+gfx::PluginWindowHandle TestWebViewDelegate::CreatePluginContainer() {
+  return shell_->webViewHost()->CreatePluginContainer();
+}
+
 void TestWebViewDelegate::WillDestroyPluginWindow(unsigned long id) {
   shell_->webViewHost()->OnPluginWindowDestroyed(id);
 }
 
 void TestWebViewDelegate::ShowJavaScriptAlert(const std::wstring& message) {
   GtkWidget* dialog = gtk_message_dialog_new(
       shell_->mainWnd(), GTK_DIALOG_MODAL, GTK_MESSAGE_INFO,
       GTK_BUTTONS_OK, "%s", WideToUTF8(message).c_str());
   gtk_window_set_title(GTK_WINDOW(dialog), "JavaScript Alert");
   gtk_dialog_run(GTK_DIALOG(dialog));  // Runs a nested message loop.
@@ skipping 114 matching lines @@
                                   const WebPluginGeometry& move) {
   WebWidgetHost* host = GetHostForWidget(webwidget);
 
   // The "window" on WebPluginGeometry is actually the XEmbed parent
   // X window id.
   GtkWidget* widget = ((WebViewHost*)host)->MapIDToWidget(move.window);
   // If we don't know about this plugin (maybe we're shutting down the
   // window?), ignore the message.
   if (!widget)
     return;
-  DCHECK(!GTK_WIDGET_NO_WINDOW(widget) && GTK_WIDGET_REALIZED(widget));
+  DCHECK(!GTK_WIDGET_NO_WINDOW(widget));
+  DCHECK(GTK_WIDGET_REALIZED(widget));
 
   if (!move.visible) {
     gtk_widget_hide(widget);
     return;
   } else {
     gtk_widget_show(widget);
   }
 
   // Update the clipping region on the GdkWindow.
   GdkRectangle clip_rect = move.clip_rect.ToGdkRectangle();
@@ skipping 62 matching lines @@
 // Private methods -----------------------------------------------------------
 
 void TestWebViewDelegate::SetPageTitle(const std::wstring& title) {
   gtk_window_set_title(GTK_WINDOW(shell_->mainWnd()),
                        ("Test Shell - " + WideToUTF8(title)).c_str());
 }
 
 void TestWebViewDelegate::SetAddressBarURL(const GURL& url) {
   gtk_entry_set_text(GTK_ENTRY(shell_->editWnd()), url.spec().c_str());
 }