Attempt 2 at landing this....

chrome_frame/chrome_frame_npapi.cc

 // Copyright (c) 2009 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 "chrome_frame/chrome_frame_npapi.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
@@ skipping 67 matching lines @@
 
   COMPILE_ASSERT(arraysize(plugin_method_identifier_names_) ==
                  arraysize(plugin_methods_),
                  you_must_add_both_plugin_method_and_name);
 
   COMPILE_ASSERT(arraysize(plugin_property_identifier_names_) ==
                  arraysize(plugin_property_identifiers_),
                  you_must_add_both_plugin_property_and_name);
 }
 
-static const int kMaxBytesForPluginConsumption = 0x7FFFFFFF;
-
 static const char kPluginSrcAttribute[] = "src";
 static const char kPluginForceFullPageAttribute[] = "force_full_page";
 static const char kPluginOnloadAttribute[] = "onload";
 static const char kPluginOnErrorAttribute[] = "onloaderror";
 static const char kPluginOnMessageAttribute[] = "onmessage";
 static const char kPluginOnPrivateMessageAttribute[] = "onprivatemessage";
 // These properties can only be set in arguments at control instantiation.
 // When the privileged_mode property is provided and set to true, the control
 // will probe for whether its hosting document has the system principal, in
 // which case privileged mode will be enabled.
 static const char kPluginPrivilegedModeAttribute[] = "privileged_mode";
 // If privileged mode is enabled, the string value of this argument will
 // be appended to the chrome.exe command line.
 static const char kPluginChromeExtraArguments[] = "chrome_extra_arguments";
 // If privileged mode is enabled, the string value of this argument will
 // be used as the profile name for our chrome.exe instance.
 static const char kPluginChromeProfileName[] = "chrome_profile_name";
 // If privileged mode is enabled, this argument will be taken as a
 // comma-separated list of API function calls to automate.
 static const char kPluginChromeFunctionsAutomatedAttribute[] =
     "chrome_functions_automated";
 // If chrome network stack is to be used
 static const char kPluginUseChromeNetwork[] = "usechromenetwork";
 
-
-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;
-
-  ChromeFrameNPAPI::ChromeFrameNPObject* chrome_frame_npapi_obj =
-      reinterpret_cast<ChromeFrameNPAPI::ChromeFrameNPObject*>(
-          npapi::CreateObject(instance, ChromeFrameNPAPI::PluginClass()));
-  DCHECK(chrome_frame_npapi_obj != NULL);
-
-  ChromeFrameNPAPI* plugin_instance =
-      chrome_frame_npapi_obj->chrome_frame_plugin_instance;
-  DCHECK(plugin_instance != NULL);
-
-  // Note that we MUST set instance->pdata BEFORE calling Initialize. This is
-  // because Initialize can call back into the NPAPI host which will need the
-  // pdata field to be set.
-  chrome_frame_npapi_obj->chrome_frame_plugin_instance =
-      plugin_instance;
-  instance->pdata = chrome_frame_npapi_obj;
-
-  bool init = plugin_instance->Initialize(plugin_type, instance,
-                                          mode, argc, argn, argv);
-  DCHECK(init);
-
-  return NPERR_NO_ERROR;
-}
-
-NPError NPP_Destroy(NPP instance, NPSavedData** save) {
-  // Takes ownership and releases the object at the end of scope.
-  ScopedNpObject<ChromeFrameNPAPI::ChromeFrameNPObject> chrome_frame_npapi_obj(
-      reinterpret_cast<ChromeFrameNPAPI::ChromeFrameNPObject*>(
-          instance->pdata));
-
-  if (chrome_frame_npapi_obj.get()) {
-    ChromeFrameNPAPI* plugin_instance =
-        ChromeFrameNPAPI::ChromeFrameInstanceFromPluginInstance(instance);
-
-    plugin_instance->Uninitialize();
-    instance->pdata = NULL;
-  }
-
-  return NPERR_NO_ERROR;
-}
-
-NPError NPP_SetWindow(NPP instance, NPWindow* window_info) {
-  if (window_info == NULL) {
-    NOTREACHED();
-    return NPERR_GENERIC_ERROR;
-  }
-
-  ChromeFrameNPAPI* plugin_instance =
-      ChromeFrameNPAPI::ChromeFrameInstanceFromPluginInstance(instance);
-
-  if (plugin_instance == NULL) {
-    return NPERR_INVALID_INSTANCE_ERROR;
-  }
-
-  plugin_instance->SetWindow(window_info);
-  return NPERR_NO_ERROR;
-}
-
-NPError NPP_NewStream(NPP instance, NPMIMEType type, NPStream* stream,
-                      NPBool seekable, uint16* stream_type) {
-  NPAPIUrlRequest* url_request = ChromeFrameNPAPI::ValidateRequest(
-      instance, stream->notifyData);
-  if (url_request) {
-    if (!url_request->OnStreamCreated(type, stream))
-      return NPERR_GENERIC_ERROR;
-  }
-
-  // We need to return the requested stream mode if we are returning a success
-  // code. If we don't do this it causes Opera to blow up.
-  *stream_type = NP_NORMAL;
-  return NPERR_NO_ERROR;
-}
-
-NPError NPP_DestroyStream(NPP instance, NPStream* stream, NPReason reason) {
-  NPAPIUrlRequest* url_request = ChromeFrameNPAPI::ValidateRequest(
-      instance, stream->notifyData);
-  if (url_request) {
-    url_request->OnStreamDestroyed(reason);
-  }
-
-  return NPERR_NO_ERROR;
-}
-
-NPError NPP_GetValue(NPP instance, NPPVariable variable, void* value) {
-  if (variable == NPPVpluginScriptableNPObject) {
-    void** plugin = reinterpret_cast<void**>(value);
-    ChromeFrameNPAPI::ChromeFrameNPObject* chrome_frame_npapi_obj =
-        reinterpret_cast<ChromeFrameNPAPI::ChromeFrameNPObject*>(
-            instance->pdata);
-    // Return value is expected to be retained
-    npapi::RetainObject(reinterpret_cast<NPObject*>(chrome_frame_npapi_obj));
-    *plugin = chrome_frame_npapi_obj;
-    return NPERR_NO_ERROR;
-  }
-  return NPERR_GENERIC_ERROR;
-}
-
-NPError NPP_SetValue(NPP instance, NPNVariable variable, void* value) {
-  return NPERR_GENERIC_ERROR;
-}
-
-int32 NPP_WriteReady(NPP instance, NPStream* stream) {
-  NPAPIUrlRequest* url_request = ChromeFrameNPAPI::ValidateRequest(
-      instance, stream->notifyData);
-  if (url_request) {
-    return url_request->OnWriteReady();
-  }
-
-  return kMaxBytesForPluginConsumption;
-}
-
-int32 NPP_Write(NPP instance, NPStream* stream, int32 offset, int32 len,
-                void* buffer) {
-  NPAPIUrlRequest* url_request = ChromeFrameNPAPI::ValidateRequest(
-      instance, stream->notifyData);
-  if (url_request) {
-    return url_request->OnWrite(buffer, len);
-  }
-
-  return len;
-}
-
-void NPP_URLNotify(NPP instance, const char* url, NPReason reason,
-                   void* notifyData) {
-  ChromeFrameNPAPI* plugin_instance =
-      ChromeFrameNPAPI::ChromeFrameInstanceFromPluginInstance(instance);
-  if (plugin_instance) {
-    plugin_instance->UrlNotify(url, reason, notifyData);
-  }
-}
-
-void NPP_Print(NPP instance, NPPrint* print_info) {
-  ChromeFrameNPAPI* plugin_instance =
-      ChromeFrameNPAPI::ChromeFrameInstanceFromPluginInstance(instance);
-
-  if (plugin_instance == NULL) {
-    NOTREACHED();
-    return;
-  }
-
-  plugin_instance->Print(print_info);
-}
-
 // ChromeFrameNPAPI member defines.
 
 // TODO(tommi): remove ignore_setfocus_ since that's not how focus is
 //  handled anymore.
 
 ChromeFrameNPAPI::ChromeFrameNPAPI()
     : instance_(NULL),
     mode_(NP_EMBED),
     force_full_page_plugin_(false),
     ready_state_(READYSTATE_LOADING),
@@ skipping 1333 matching lines @@
   return request;
 }
 
 bool ChromeFrameNPAPI::HandleContextMenuCommand(UINT cmd,
     const IPC::ContextMenuParams& params) {
   if (cmd == IDC_ABOUT_CHROME_FRAME) {
     // TODO: implement "About Chrome Frame"
   }
   return false;
 }