Changeset 18935 for S60/trunk/WebCore

Timestamp:

01/18/07 07:59:08 (2 years ago)

Author:

yongjzha

Message:

2007-01-17 w3liu <wei.liu@nokia.com>

Reviewed by yongjun.zhang@nokia.com.
DESC:
http://bugs.webkit.org/show_bug.cgi?id=12306

WARNING: NO TEST CASES ADDED OR CHANGED

• khtml/khtml_part.cpp: (KHTMLPart::encoding):
• kwq/KWQTextCodec.cpp: (KWQTextDecoder::fromUnicode): (KWQTextDecoder::checkRealloc):

Location:

S60/trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• khtml/khtml_part.cpp (modified) (1 diff)
• kwq/KWQTextCodec.cpp (modified) (2 diffs)

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+2007-01-17  w3liu  <wei.liu@nokia.com>
+
+        Reviewed by yongjun.zhang@nokia.com.
+        DESC: 
+        http://bugs.webkit.org/show_bug.cgi?id=12306
+
+        WARNING: NO TEST CASES ADDED OR CHANGED
+
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::encoding):
+        * kwq/KWQTextCodec.cpp:
+        (KWQTextDecoder::fromUnicode):
+        (KWQTextDecoder::checkRealloc):
+
 2007-01-15  raalexan  <rasvan.alexandrescu@nokia.com>
 

S60/trunk/WebCore/khtml/khtml_part.cpp

@@ -2344 +2344 @@
 QString KHTMLPart::encoding() const
 {
+
+    if(d->m_decoder && d->m_decoder->encoding())
+        return QString(d->m_decoder->encoding());
+
     if(d->m_haveEncoding && !d->m_encoding.isEmpty())
         return d->m_encoding;
-
-    if(d->m_decoder && d->m_decoder->encoding())
-        return QString(d->m_decoder->encoding());
 
     return(settings()->encoding());

S60/trunk/WebCore/kwq/KWQTextCodec.cpp

@@ -496 +496 @@
 
     // check if the target charset is supported
-    QCString outStr(str.length()*3);
+    QCString outStr(str.length()*4);
     charConv->PrepareToConvertToOrFromL( iEncoding, *iArrayOfCharacterSetsAvailable, fileSession );
 
@@ -562 +562 @@
         outBuf->Des().Copy( aPtr );
         aPtr.Set( outBuf->Des() );
-        aPtr.SetLength( aLen );
         }
    return outBuf;