backing out more parts of Bug 295047 to find the cause for the Tp loss...

intl/uconv/src/nsConverterInputStream.cpp

@@ -42,8 +42,8 @@
 
 #define CONVERTER_BUFFER_SIZE 8192
 
-NS_IMPL_ISUPPORTS3(nsConverterInputStream, nsIConverterInputStream,
-                   nsIUnicharInputStream, nsIUnicharLineInputStream)
+NS_IMPL_ISUPPORTS2(nsConverterInputStream, nsIConverterInputStream,
+                   nsIUnicharInputStream/*, nsIUnicharLineInputStream*/)
     
 static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
 
@@ -53,8 +53,8 @@ nsConverterInputStream::Init(nsIInputStream* aStream,
                              PRInt32 aBufferSize,
                              PRUnichar aReplacementChar)
 {
-    if (!aCharset)
-        aCharset = "UTF-8";
+//    if (!aCharset)
+//        aCharset = "UTF-8";
 
     nsresult rv;
 
@@ -85,7 +85,7 @@ NS_IMETHODIMP
 nsConverterInputStream::Close()
 {
     nsresult rv = mInput ? mInput->Close() : NS_OK;
-    PR_FREEIF(mLineBuffer);
+//    PR_FREEIF(mLineBuffer);
     mInput = nsnull;
     mConverter = nsnull;
     mByteData = nsnull;
@@ -262,6 +262,7 @@ nsConverterInputStream::Fill(nsresult * aErrorCode)
   return mUnicharDataLength;
 }
 
+#if 0
 NS_IMETHODIMP
 nsConverterInputStream::ReadLine(nsAString& aLine, PRBool* aResult)
 {
@@ -271,3 +272,4 @@ nsConverterInputStream::ReadLine(nsAString& aLine, PRBool* aResult)
   }
   return NS_ReadLine(this, mLineBuffer, aLine, aResult);
 }
+#endif

intl/uconv/src/nsConverterInputStream.h

@@ -37,7 +37,7 @@
 
 #include "nsIInputStream.h"
 #include "nsIConverterInputStream.h"
-#include "nsIUnicharLineInputStream.h"
+//#include "nsIUnicharLineInputStream.h"
 #include "nsString.h"
 #include "nsReadLine.h"
 
@@ -55,13 +55,13 @@
 
 
 
-class nsConverterInputStream : public nsIConverterInputStream,
-                               public nsIUnicharLineInputStream {
+class nsConverterInputStream : public nsIConverterInputStream /*,
+                               public nsIUnicharLineInputStream*/ {
 
  public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSIUNICHARINPUTSTREAM
-    NS_DECL_NSIUNICHARLINEINPUTSTREAM
+//    NS_DECL_NSIUNICHARLINEINPUTSTREAM
     NS_DECL_NSICONVERTERINPUTSTREAM
 
     nsConverterInputStream() :
@@ -69,8 +69,8 @@ class nsConverterInputStream : public nsIConverterInputStream,
         mLeftOverBytes(0),
         mUnicharDataOffset(0),
         mUnicharDataLength(0),
-        mReplacementChar(DEFAULT_REPLACEMENT_CHARACTER),
-        mLineBuffer(nsnull) { }
+        mReplacementChar(DEFAULT_REPLACEMENT_CHARACTER) /*,
+        mLineBuffer(nsnull) */ { }
     
     virtual ~nsConverterInputStream() { Close(); }
 
@@ -90,5 +90,5 @@ class nsConverterInputStream : public nsIConverterInputStream,
     PRUint32  mUnicharDataLength;
     PRUnichar mReplacementChar;
 
-    nsLineBuffer<PRUnichar>* mLineBuffer;    
+//    nsLineBuffer<PRUnichar>* mLineBuffer;    
 };