Backing out changes to nsIPluginStreamListener2 fixed by bug 82415 r=dougt sr=attinasi a=dbaron

plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp

@@ -1388,7 +1388,7 @@ NPP_Write(NPP instance, NPStream *stream, int32 offset, int32 len, void *buffer)
         return -1;
     nsresult err = inStr->SetReadBuffer((PRUint32)len, (const char*)buffer);
     if (err != NS_OK) return -1;
-    err = inStr->GetListener()->OnDataAvailable(inStr->GetPluginStreamInfo(), inStr, 0, len);
+    err = inStr->GetListener()->OnDataAvailable(inStr->GetPluginStreamInfo(), inStr, len);
     if (err != NS_OK) return -1;
     return len;
 }

plugin/oji/MRJ/plugin/Source/JSEvaluator.cpp

@@ -93,7 +93,7 @@ const char* JSEvaluator::eval(const char* script)
 	return mResult;
 }
 
-NS_METHOD JSEvaluator::OnDataAvailable(nsIPluginStreamInfo* pluginInfo, nsIInputStream* input, PRUint32 offset, PRUint32 length)
+NS_METHOD JSEvaluator::OnDataAvailable(nsIPluginStreamInfo* pluginInfo, nsIInputStream* input, PRUint32 length)
 {
 	// hopefully all our data is available.
 	mResult = new char[length + 1];

plugin/oji/MRJ/plugin/Source/JSEvaluator.h

@@ -75,7 +75,7 @@ public:
      * @return The return value is currently ignored.
      */
     NS_IMETHOD
-    OnDataAvailable(nsIPluginStreamInfo* pluginInfo, nsIInputStream* input, PRUint32 offset, PRUint32 length);
+    OnDataAvailable(nsIPluginStreamInfo* pluginInfo, nsIInputStream* input, PRUint32 length);
 
     NS_IMETHOD
     OnFileAvailable(nsIPluginStreamInfo* pluginInfo, const char* fileName)

plugin/oji/MRJ/plugin/Source/MRJPlugin.cpp

@@ -649,7 +649,7 @@ NS_METHOD MRJPluginInstance::Initialize(nsIPluginInstancePeer* peer)
 	return NS_OK;
 }
 
-NS_METHOD MRJPluginInstance::OnDataAvailable(nsIPluginStreamInfo* pluginInfo, nsIInputStream* input, PRUint32 offset, PRUint32 length)
+NS_METHOD MRJPluginInstance::OnDataAvailable(nsIPluginStreamInfo* pluginInfo, nsIInputStream* input, PRUint32 length)
 {
 	// hopefully all our data is available.
 	char* documentBase = new char[length + 1];

plugin/oji/MRJ/plugin/Source/MRJPlugin.h

@@ -408,7 +408,7 @@ public:
      * @return The return value is currently ignored.
      */
     NS_IMETHOD
-    OnDataAvailable(nsIPluginStreamInfo* pluginInfo, nsIInputStream* input, PRUint32 offset, PRUint32 length);
+    OnDataAvailable(nsIPluginStreamInfo* pluginInfo, nsIInputStream* input, PRUint32 length);
 
     NS_IMETHOD
     OnFileAvailable(nsIPluginStreamInfo* pluginInfo, const char* fileName)

plugin/oji/MRJ/plugin/Source/nsLiveConnect.cpp

@@ -113,7 +113,7 @@ nsLiveconnect::Eval(JNIEnv *env, jsobject obj, const jchar *script, jsize length
     return NS_OK;
 }
 
-NS_METHOD nsLiveconnect::OnDataAvailable(nsIPluginStreamInfo* pluginInfo, nsIInputStream* input, PRUint32 offset, PRUint32 length)
+NS_METHOD nsLiveconnect::OnDataAvailable(nsIPluginStreamInfo* pluginInfo, nsIInputStream* input, PRUint32 length)
 {
     // hopefully all our data is available.
     mResult = new char[length + 1];

plugin/oji/MRJ/plugin/Source/nsLiveConnect.h

@@ -212,7 +212,7 @@ public:
      * @return The return value is currently ignored.
      */
     NS_IMETHOD
-    OnDataAvailable(nsIPluginStreamInfo* pluginInfo, nsIInputStream* input, PRUint32 offset, PRUint32 length);
+    OnDataAvailable(nsIPluginStreamInfo* pluginInfo, nsIInputStream* input, PRUint32 length);
 
     NS_IMETHOD
     OnFileAvailable(nsIPluginStreamInfo* pluginInfo, const char* fileName)