Revert 47726 (turned nacl_ui_tests red) - Mac: First steps for default plugin...

webkit/default_plugin/plugin_main.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.
 
 #include "webkit/default_plugin/plugin_main.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "webkit/default_plugin/plugin_impl.h"
 #include "webkit/glue/webkit_glue.h"
 
 namespace default_plugin {
-
-#if defined(OS_WIN)
 //
 // Forward declare the linker-provided pseudo variable for the
 // current module handle.
 //
 extern "C" IMAGE_DOS_HEADER __ImageBase;
 
 // get the handle to the currently executing module
 inline HMODULE GetCurrentModuleHandle() {
   return reinterpret_cast<HINSTANCE>(&__ImageBase);
 }
-#endif
 
 // Initialized in NP_Initialize.
 NPNetscapeFuncs* g_browser = NULL;
 
 NPError API_CALL NP_GetEntryPoints(NPPluginFuncs* funcs) {
   funcs->version = 11;
   funcs->size = sizeof(*funcs);
   funcs->newp = NPP_New;
   funcs->destroy = NPP_Destroy;
   funcs->setwindow = NPP_SetWindow;
@@ skipping 31 matching lines @@
     return;
   }
 
   std::string script = "javascript:onSuccess()";
   NPString script_string;
   script_string.UTF8Characters = script.c_str();
   script_string.UTF8Length =
       static_cast<unsigned int>(script.length());
 
   NPVariant result_var;
-  g_browser->evaluate(instance, window_obj,
-                      &script_string, &result_var);
+  NPError result = g_browser->evaluate(instance, window_obj,
+                                       &script_string, &result_var);
   g_browser->releaseobject(window_obj);
 }
 
 }  // namespace CHROMIUM_DefaultPluginTest
 
-bool NegotiateModels(NPP instance) {
-#if defined(OS_MACOSX)
-  NPError err;
-  // Set drawing model to core graphics
-  NPBool supportsCoreGraphics = FALSE;
-  err = g_browser->getvalue(instance,
-                            NPNVsupportsCoreGraphicsBool,
-                            &supportsCoreGraphics);
-  if (err != NPERR_NO_ERROR || !supportsCoreGraphics) {
-    NOTREACHED();
-    return false;
-  }
-  err = g_browser->setvalue(instance,
-                            NPPVpluginDrawingModel,
-                            (void*)NPDrawingModelCoreGraphics);
-  if (err != NPERR_NO_ERROR) {
-    NOTREACHED();
-    return false;
-  }
-
-  // Set event model to cocoa
-  NPBool supportsCocoaEvents = FALSE;
-  err = g_browser->getvalue(instance,
-                            NPNVsupportsCocoaBool,
-                            &supportsCocoaEvents);
-  if (err != NPERR_NO_ERROR || !supportsCocoaEvents) {
-    NOTREACHED();
-    return false;
-  }
-  err = g_browser->setvalue(instance,
-                            NPPVpluginEventModel,
-                            (void*)NPEventModelCocoa);
-  if (err != NPERR_NO_ERROR) {
-    NOTREACHED();
-    return false;
-  }
-#endif
-  return true;
-}
-
 NPError NPP_New(NPMIMEType plugin_type, NPP instance, uint16 mode, int16 argc,
                 char* argn[], char* argv[], NPSavedData* saved) {
   if (instance == NULL)
     return NPERR_INVALID_INSTANCE_ERROR;
 
   // We don't want the null plugin to work in the following cases:-
   // 1. Test-shell
   // 2. The plugin is running in the renderer process.
   if (webkit_glue::IsPluginRunningInRendererProcess()) {
     if (!base::strcasecmp(plugin_type,
         "application/chromium-test-default-plugin")) {
       SignalTestResult(instance);
       return NPERR_NO_ERROR;
     }
     return NPERR_GENERIC_ERROR;
   }
 
-  if (!NegotiateModels(instance))
-    return NPERR_INCOMPATIBLE_VERSION_ERROR;
-  
+
   PluginInstallerImpl* plugin_impl = new PluginInstallerImpl(mode);
-  plugin_impl->Initialize(
-#if defined(OS_WIN)
-                          GetCurrentModuleHandle(),
-#else
-                          NULL,
-#endif
-                          instance, plugin_type, argc,
+  plugin_impl->Initialize(GetCurrentModuleHandle(), instance, plugin_type, argc,
                           argn, argv);
-
   instance->pdata = reinterpret_cast<void*>(plugin_impl);
   return NPERR_NO_ERROR;
 }
 
 NPError NPP_Destroy(NPP instance, NPSavedData** save) {
   PluginInstallerImpl* plugin_impl =
     reinterpret_cast<PluginInstallerImpl*>(instance->pdata);
 
   if (plugin_impl) {
     plugin_impl->Shutdown();
@@ skipping 20 matching lines @@
   }
 
   PluginInstallerImpl* plugin_impl =
       reinterpret_cast<PluginInstallerImpl*>(instance->pdata);
 
   if (plugin_impl == NULL) {
     NOTREACHED();
     return NPERR_GENERIC_ERROR;
   }
 
-  if (!plugin_impl->NPP_SetWindow(window_info)) {
+  HWND window_handle = reinterpret_cast<HWND>(window_info->window);
+  if (!plugin_impl->SetWindow(window_handle)) {
     delete plugin_impl;
     return NPERR_GENERIC_ERROR;
   }
 
   return NPERR_NO_ERROR;
 }
 
 NPError NPP_NewStream(NPP instance, NPMIMEType type, NPStream* stream,
                       NPBool seekable, uint16* stype) {
   if (instance == NULL)
@@ skipping 79 matching lines @@
   if (instance == NULL)
     return 0;
 
   PluginInstallerImpl* plugin_impl =
       reinterpret_cast<PluginInstallerImpl*>(instance->pdata);
 
   return plugin_impl->NPP_HandleEvent(event);
 }
 
 }   // default_plugin