Linux plugins WIP.

webkit/glue/plugins/plugin_host.cc

 // Copyright (c) 2006-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.
 
+// HACK: we need this #define in place before npapi.h is included for
+// plugins to work. However, all sorts of headers include npapi.h, so
+// the only way to be certain the define is in place is to put it
+// here.  You might ask, "Why not set it in npapi.h directly, or in
+// this directory's SConscript, then?"  but it turns out this define
+// makes npapi.h include Xlib.h, which in turn defines a ton of symbols
+// like None and Status, causing conflicts with the aforementioned
+// many headers that include npapi.h.  Ugh.
+// See also webplugin_delegate_impl.cc.
+#define MOZ_X11 1
+
 #include "config.h"
 
 #include "webkit/glue/plugins/plugin_host.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
@@ skipping 721 matching lines @@
         NPAPI::PluginInstance::GetInitializingInstance();
     if (instance) {
       instance->GetServiceManager(reinterpret_cast<void**>(value));
     } else {
       NOTREACHED();
     }
 
     rv = NPERR_NO_ERROR;
     break;
   }
+#if defined(OS_LINUX)
+  case NPNVToolkit:
+    // Tell them we are GTK2.  (The alternative is GTK 1.2.)
+    *reinterpret_cast<int*>(value) = NPNVGtk2;
+    rv = NPERR_NO_ERROR;
+    break;
+
+  case NPNVSupportsXEmbedBool:
+    // Yes, we support XEmbed.
+    *reinterpret_cast<NPBool*>(value) = TRUE;
+    rv = NPERR_NO_ERROR;
+    break;
+#endif
   case NPNVSupportsWindowless:
   {
     NPBool* supports_windowless = reinterpret_cast<NPBool*>(value);
     *supports_windowless = TRUE;
     rv = NPERR_NO_ERROR;
     break;
   }
   case default_plugin::kMissingPluginStatusStart +
        default_plugin::MISSING_PLUGIN_AVAILABLE:
   // fall through
@@ skipping 102 matching lines @@
                          void (*func)(void *),
                          void *userData) {
   scoped_refptr<NPAPI::PluginInstance> plugin = FindInstance(id);
   if (plugin) {
     plugin->PluginThreadAsyncCall(func, userData);
   }
 }
 
 } // extern "C"