--- a/webengine/osswebengine/WebKit/s60/plugins/PluginStreamLoaderClient.cpp	Thu Aug 19 10:58:56 2010 +0300
+++ b/webengine/osswebengine/WebKit/s60/plugins/PluginStreamLoaderClient.cpp	Tue Aug 31 16:17:46 2010 +0300
@@ -31,41 +31,38 @@
 #include "PluginStream.h"
 #include "PluginHandler.h"
 
-#include "NetScapePlugInStreamLoader.h"
+#include "NetscapePlugInStreamLoader.h"
 
 using namespace WebCore;
 
     
-NetscapePlugInStreamLoaderClient* NetscapePlugInStreamLoaderClient::NewL(const String& url, PluginSkin* pluginskin, Frame* frame, void* notifydata, TBool notify/*=EFalse*/)
+NetscapePlugInStreamLoaderClient* NetscapePlugInStreamLoaderClient::NewL(const String& url, PluginSkin* pluginskin, Frame* frame, void* notifydata)
 {
     NetscapePlugInStreamLoaderClient* self = new (ELeave) NetscapePlugInStreamLoaderClient();    
     CleanupStack::PushL( self );
-    self->ConstructL( url, pluginskin, frame, notifydata, notify );
+    self->ConstructL( url, pluginskin, frame, notifydata );
     CleanupStack::Pop();    
     return self;    
 }
 
 
-NetscapePlugInStreamLoaderClient* NetscapePlugInStreamLoaderClient::NewL(const ResourceRequest& request, PluginSkin* pluginskin, Frame* frame, void* notifydata, TBool notify/*=EFalse*/)
+NetscapePlugInStreamLoaderClient* NetscapePlugInStreamLoaderClient::NewL(const ResourceRequest& request, PluginSkin* pluginskin, Frame* frame, void* notifydata)
 {
     NetscapePlugInStreamLoaderClient* self = new (ELeave) NetscapePlugInStreamLoaderClient();
     CleanupStack::PushL( self );
             
-    self->ConstructL( request, pluginskin, frame, notifydata, notify );
+    self->ConstructL( request, pluginskin, frame, notifydata );
     
     CleanupStack::Pop();    
     return self;    
 }
 
-void NetscapePlugInStreamLoaderClient::ConstructL(const String& url, PluginSkin* pluginskin, Frame* frame, void* notifydata, TBool notify/*=EFalse*/)  
+void NetscapePlugInStreamLoaderClient::ConstructL(const String& url, PluginSkin* pluginskin, Frame* frame, void* notifydata)  
 {            
     m_loader = 0; 
     m_request = 0;
     m_pluginstream = 0;
-    m_pluginskin = pluginskin;
-    m_notifydata = notifydata;
     m_frame = frame;
-    m_notify = notify;
     m_pluginstream = new (ELeave) PluginStream(pluginskin, this, notifydata);
     m_request = new (ELeave) ResourceRequest(m_frame->loader()->completeURL(url));
     
@@ -81,16 +78,13 @@
         m_loader->setShouldBufferData(false);
 }
 
-void NetscapePlugInStreamLoaderClient::ConstructL(const ResourceRequest& request, PluginSkin* pluginskin, Frame* frame, void* notifydata, TBool notify/*=EFalse*/)  
+void NetscapePlugInStreamLoaderClient::ConstructL(const ResourceRequest& request, PluginSkin* pluginskin, Frame* frame, void* notifydata)  
 {            
     
     m_loader = 0; 
     m_request = 0;
     m_pluginstream = 0;
-    m_pluginskin = pluginskin;
-    m_notifydata = notifydata;
     m_frame = frame;
-    m_notify = notify;
     m_pluginstream = new (ELeave) PluginStream(pluginskin, this, notifydata);
     m_request = new (ELeave) ResourceRequest(request.url());
 
@@ -130,8 +124,6 @@
     
     delete m_request;     
     delete m_pluginstream;    
-    m_pluginskin = NULL;
-    m_notifydata = NULL;
     
 }
 
@@ -155,10 +147,9 @@
 
 void NetscapePlugInStreamLoaderClient::cancelWithError(const ResourceError& error)
 {
-    if (m_loader && !m_loader->isDone()){
-        m_loader->cancel(error);
+    if (m_loader && !m_loader->isDone()) 
+        m_loader->cancel(error);           
     }
-}
 
 void NetscapePlugInStreamLoaderClient::didReceiveResponse(const ResourceResponse& response)
 {
@@ -167,20 +158,11 @@
         cancelWithError(ResourceError(String(response.url()), KErrGeneral, String(response.url()), String(response.httpStatusText())));        
         return;
     }
-    
-    // Currently we fill only response encoding type in the header field of NPStream structure, as url,MimeType and content-Length
-    // are already a part of NPStream Structure
-    
-    HBufC8* headerPtr = HBufC8::NewLC(response.textEncodingName().length() + 1);
-    headerPtr->Des().Copy(response.textEncodingName().des());
-    headerPtr->Des().Append('\0');
-    const char* headers = (const char*)headerPtr->Ptr();
-    
+        
     if (m_pluginstream) {
-        TRAP(m_error, m_pluginstream->createNPStreamL(response.url().des(), response.mimeType().des(), response.expectedContentLength(), headers));
+        TRAP(m_error, m_pluginstream->createNPStreamL(response.url().des(), response.mimeType().des(), response.expectedContentLength()));
     }
-    
-    CleanupStack::PopAndDestroy(headerPtr);
+        
 }
 
 void NetscapePlugInStreamLoaderClient::didReceiveData(const char* data, int length, long long lengthReceived)
@@ -209,22 +191,14 @@
 void NetscapePlugInStreamLoaderClient::didFail(const ResourceError& error)
 {
     if (m_pluginstream) {
-        int err = error.errorCode() ? error.errorCode() : KErrCancel;
-        HBufC* failedURL = HBufC::NewLC(error.failingURL().length());
-        failedURL->Des().Copy(error.failingURL());
-        m_pluginstream->destroyStream(err, failedURL);
-        CleanupStack::PopAndDestroy(failedURL);
+        m_pluginstream->destroyStream(error.errorCode() ? error.errorCode() : KErrCancel);
     }
 }
 
 void NetscapePlugInStreamLoaderClient::didCancel(const ResourceError& error)
 {
     if (m_pluginstream) {
-        int err = error.errorCode() ? error.errorCode() : KErrCancel;
-        HBufC* failedURL = HBufC::NewLC(error.failingURL().length());
-        failedURL->Des().Copy(error.failingURL());
-        m_pluginstream->destroyStream(err, failedURL);
-        CleanupStack::PopAndDestroy(failedURL);
+        m_pluginstream->destroyStream(error.errorCode() ? error.errorCode() : KErrCancel);
     }
 }