This CL is for Neb. It contains his change 501124, with conflicts merged.

webkit/tools/pepper_test_plugin/main.cc

 /*
  IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in
  consideration of your agreement to the following terms, and your use, installation,
  modification or redistribution of this Apple software constitutes acceptance of these
  terms.  If you do not agree with these terms, please do not use, install, modify or
  redistribute this Apple software.
 
  In consideration of your agreement to abide by the following terms, and subject to these
  terms, Apple grants you a personal, non-exclusive license, under Apple’s copyrights in
  this original Apple software (the "Apple Software"), to use, reproduce, modify and
@@ skipping 16 matching lines @@
  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
           OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE,
  REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND
  WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR
  OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <stdlib.h>
 #include <stdio.h>
 
+#if defined(INDEPENDENT_PLUGIN)
+#include <iostream>
+#define LOG(x) std::cerr
+#else
 #include "base/logging.h"
 #include "base/string_util.h"
+#endif
+#include "webkit/glue/plugins/nphostapi.h"
 #include "webkit/tools/pepper_test_plugin/plugin_object.h"
 #include "webkit/tools/pepper_test_plugin/event_handler.h"
 
-#ifdef WIN32
-#define NPAPI WINAPI
-#else
-#define NPAPI
+#if __GNUC__ >= 4
+#define EXPORT __attribute__ ((visibility("default")))
+#elif defined(_MSC_VER)
+#define EXPORT __declspec(dllexport)
 #endif
 
 namespace {
 
 void Log(NPP instance, const char* format, ...) {
   va_list args;
   va_start(args, format);
   std::string message("PLUGIN: ");
+#if defined(INDEPENDENT_PLUGIN)
+  char msgbuf[100];
+  vsnprintf(msgbuf, sizeof(msgbuf), format, args);
+#else
   StringAppendV(&message, format, args);
+#endif
   va_end(args);
 
   NPObject* window_object = 0;
   NPError error = browser->getvalue(instance, NPNVWindowNPObject,
                                     &window_object);
   if (error != NPERR_NO_ERROR) {
     LOG(ERROR) << "Failed to retrieve window object while logging: "
                << message;
     return;
   }
@@ skipping 27 matching lines @@
   browser->releasevariantvalue(&result);
   browser->releaseobject(console_object);
   browser->releaseobject(window_object);
 }
 
 }  // namespace
 
 // Plugin entry points
 extern "C" {
 
-#if defined(OS_WIN)
-//__declspec(dllexport)
-#endif
-NPError NPAPI NP_Initialize(NPNetscapeFuncs* browser_funcs
+EXPORT NPError API_CALL NP_Initialize(NPNetscapeFuncs* browser_funcs
 #if defined(OS_LINUX)
                             , NPPluginFuncs* plugin_funcs
 #endif
                             );
-#if defined(OS_WIN)
-//__declspec(dllexport)
-#endif
-NPError NPAPI NP_GetEntryPoints(NPPluginFuncs* plugin_funcs);
+EXPORT NPError API_CALL NP_GetEntryPoints(NPPluginFuncs* plugin_funcs);
 
-#if defined(OS_WIN)
-//__declspec(dllexport)
-#endif
-void NPAPI NP_Shutdown() {
+EXPORT void API_CALL NP_Shutdown() {
 }
 
 #if defined(OS_LINUX)
-NPError NP_GetValue(NPP instance, NPPVariable variable, void* value);
-const char* NP_GetMIMEDescription();
+EXPORT NPError API_CALL NP_GetValue(NPP instance,
+                                    NPPVariable variable,
+                                    void* value);
+EXPORT const char* API_CALL NP_GetMIMEDescription();
 #endif
 
 }  // extern "C"
 
 // Plugin entry points
-NPError NPAPI NP_Initialize(NPNetscapeFuncs* browser_funcs
+EXPORT NPError API_CALL NP_Initialize(NPNetscapeFuncs* browser_funcs
 #if defined(OS_LINUX)
                             , NPPluginFuncs* plugin_funcs
 #endif
                             ) {
   browser = browser_funcs;
 #if defined(OS_LINUX)
   return NP_GetEntryPoints(plugin_funcs);
 #else
   return NPERR_NO_ERROR;
 #endif
 }
 
 // Entrypoints -----------------------------------------------------------------
 
-NPError NPAPI NP_GetEntryPoints(NPPluginFuncs* plugin_funcs) {
+NPError API_CALL NP_GetEntryPoints(NPPluginFuncs* plugin_funcs) {
   plugin_funcs->version = 11;
   plugin_funcs->size = sizeof(plugin_funcs);
   plugin_funcs->newp = NPP_New;
   plugin_funcs->destroy = NPP_Destroy;
   plugin_funcs->setwindow = NPP_SetWindow;
   plugin_funcs->newstream = NPP_NewStream;
   plugin_funcs->destroystream = NPP_DestroyStream;
   plugin_funcs->asfile = NPP_StreamAsFile;
   plugin_funcs->writeready = NPP_WriteReady;
   plugin_funcs->write = (NPP_WriteProcPtr)NPP_Write;
@@ skipping 109 matching lines @@
   }
 
   return err;
 }
 
 NPError NPP_SetValue(NPP instance, NPNVariable variable, void* value) {
   return NPERR_GENERIC_ERROR;
 }
 
 #if defined(OS_LINUX)
-NPError NP_GetValue(NPP instance, NPPVariable variable, void* value) {
+NPError API_CALL NP_GetValue(NPP instance, NPPVariable variable, void* value) {
   return NPP_GetValue(instance, variable, value);
 }
 
-const char* NP_GetMIMEDescription() {
-  return "pepper-application/x-pepper-test-plugin pepper test;";
+const char* API_CALL NP_GetMIMEDescription() {
+  return "pepper-application/x-pepper-test-plugin::Pepper Test";
 }
 #endif