Refactor host network

chrome_frame/chrome_frame_npapi_entrypoints.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_entrypoints.h"
 #include "chrome_frame/chrome_frame_npapi.h"
 
 #define NPAPI WINAPI
 
 // Plugin entry points.
@@ skipping 101 matching lines @@
   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;
+  ChromeFrameNPAPI* plugin_instance =
+      ChromeFrameNPAPI::ChromeFrameInstanceFromPluginInstance(instance);
+  if (plugin_instance == NULL) {
+    return NPERR_INVALID_INSTANCE_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;
+  return plugin_instance->NewStream(type, stream, seekable, stream_type);
 }
 
 NPError NPP_DestroyStream(NPP instance, NPStream* stream, NPReason reason) {
-  NPAPIUrlRequest* url_request = ChromeFrameNPAPI::ValidateRequest(
-      instance, stream->notifyData);
-  if (url_request) {
-    url_request->OnStreamDestroyed(reason);
+  ChromeFrameNPAPI* plugin_instance =
+      ChromeFrameNPAPI::ChromeFrameInstanceFromPluginInstance(instance);
+  if (plugin_instance == NULL) {
+    return NPERR_INVALID_INSTANCE_ERROR;
   }
 
-  return NPERR_NO_ERROR;
+  return plugin_instance->DestroyStream(stream, reason);
 }
 
 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) {
   static const int kMaxBytesForPluginConsumption = 0x7FFFFFFF;
 
-  NPAPIUrlRequest* url_request = ChromeFrameNPAPI::ValidateRequest(
-      instance, stream->notifyData);
-  if (url_request) {
-    return url_request->OnWriteReady();
+  ChromeFrameNPAPI* plugin_instance =
+      ChromeFrameNPAPI::ChromeFrameInstanceFromPluginInstance(instance);
+
+  if (plugin_instance == NULL) {
+    return kMaxBytesForPluginConsumption;
   }
 
-  return kMaxBytesForPluginConsumption;
+  return plugin_instance->WriteReady(stream);
 }
 
 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);
-  }
+  ChromeFrameNPAPI* plugin_instance =
+      ChromeFrameNPAPI::ChromeFrameInstanceFromPluginInstance(instance);
 
-  return len;
+  if (plugin_instance == NULL)
+    return len;
+
+  return plugin_instance->Write(stream, offset, len, buffer);
 }
 
 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);
 }
 
 }  // namespace chrome_frame