Changeset 17881 in webkit

Timestamp:

Nov 26, 2006 12:53:57 PM (17 years ago)

Author:

zbujtas

Message:

2006-11-22 w3liu <​wei.liu@nokia.com>

Reviewed by ​zbujtas@gmail.com.
DESC:
​http://bugs.webkit.org/show_bug.cgi?id=11665
Text decoder regression in S60 browser

WARNING: NO TEST CASES ADDED OR CHANGED

• kwq/KWQTextCodec.cpp: (KWQTextDecoder::KWQTextDecoder): (QTextCodec::fromUnicode): (QTextCodec::toUnicode): (KWQTextDecoder::fromUnicode): (KWQTextDecoder::checkRealloc):
• kwq/KWQTextCodec.h:

Location:

S60/trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• kwq/KWQTextCodec.cpp (modified) (7 diffs)
• kwq/KWQTextCodec.h (modified) (2 diffs)

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+2006-11-22  w3liu  <wei.liu@nokia.com>
+
+        Reviewed by zbujtas@gmail.com.
+        DESC: 
+        http://bugs.webkit.org/show_bug.cgi?id=11665
+        Text decoder regression in S60 browser
+
+        WARNING: NO TEST CASES ADDED OR CHANGED
+
+        * kwq/KWQTextCodec.cpp:
+        (KWQTextDecoder::KWQTextDecoder):
+        (QTextCodec::fromUnicode):
+        (QTextCodec::toUnicode):
+        (KWQTextDecoder::fromUnicode):
+        (KWQTextDecoder::checkRealloc):
+        * kwq/KWQTextCodec.h:
+
 2006-11-16  rathnasa  <sornalatha.rathnasamy@nokia.com>
 

S60/trunk/WebCore/kwq/KWQTextCodec.cpp

@@ -50 +50 @@
 friend class QTextCodec;
 public:
-    KWQTextDecoder(TUint aEnc) : iEncoding(aEnc), iRemainderBuf(NULL)   {}
+    KWQTextDecoder(TUint aEnc) : iEncoding(aEnc), iRemainderBuf( NULL )   {}
     ~KWQTextDecoder()                 { delete iRemainderBuf; }
 
@@ -235 +235 @@
 QCString QTextCodec::fromUnicode(const QString &qcs) const
 {
-  return KWQTextDecoder( iEncoding ).fromUnicode( qcs );
+    return makeDecoder()->fromUnicode( qcs );
 }
 
@@ -245 +245 @@
 QString QTextCodec::toUnicode(const QByteArray &qba, int len) const
 {
-    return KWQTextDecoder( iEncoding ).toUnicode(qba.data(), len, true);
+    return makeDecoder()->toUnicode(qba.data(), len, true);
 }
 
@@ -525 +525 @@
                 }
             }
-        
+
         ptr.Append( tmpBuf );
 
@@ -531 +531 @@
         inBuf.Set( inBuf.Right( ret ) );
         }
-    
+
     //check if realloc needs for zero terminated string
     if(ptr.MaxLength() == ptr.Length())
@@ -546 +546 @@
             }
         }
-    
+
     outStr.append( (const char*)( ptr.PtrZ() ) );
     delete outBuf;
@@ -554 +554 @@
 
 HBufC8* KWQTextDecoder::checkRealloc( TPtr8& aPtr, TInt aLen )
-{    
+{
    HBufC8* outBuf = HBufC8::NewMax( aLen );
    if(outBuf)

S60/trunk/WebCore/kwq/KWQTextCodec.h

@@ -42 +42 @@
     static QTextCodec *codecForLocale();
 
-    QTextCodec( TUint aEnc, KWQEncodingFlags f = NoEncodingFlags ) : iEncoding( aEnc ), _flags(f)          {}
+    QTextCodec( TUint aEnc, KWQEncodingFlags f = NoEncodingFlags ) : iEncoding( aEnc ), _flags( f ), iQTextDecoder( NULL ) {}
     ~QTextCodec();
     const char *name() const;
@@ -76 +76 @@
     virtual ~QTextDecoder()                                         {}
     virtual QString toUnicode(const char *, int, bool flush = false) = 0;
+    virtual QCString fromUnicode(const QString &) = 0;
 };