Changeset 20431 in webkit

Timestamp:

Mar 23, 2007 7:56:53 AM (17 years ago)

Author:

spadma

Message:

2007-03-22 hongzhao <set EMAIL_ADDRESS environment variable>

Reviewed by ​zbujtas@gmail.com
DESC: [S60] Some images crash when browsing some wap page - TKWG-6Z59YX in 3.1m branch
Fix: Remove extra image content-type strings added by the server before passing it to the image decoder.
​http://bugs.webkit.org/show_bug.cgi?id=13151

• BrowserCore/Renderers/src/ImageRenderer.cpp: (CImageRenderer::ConstructL):

Location:

S60/branches/3.1m/WebKit

Files:

• BrowserCore/Renderers/src/ImageRenderer.cpp (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

S60/branches/3.1m/WebKit/BrowserCore/Renderers/src/ImageRenderer.cpp

@@ -60 +60 @@
 
 // CONSTANTS
-
+_LIT(KSemicolonDelimiter, ";");
 // MACROS
 
@@ -91 +91 @@
 void CImageRenderer::ConstructL(const TDesC& aMIMEType)
     {
-    iMIMEType = aMIMEType.AllocL();
+    //check if aMIMEType adds some strings after original mime type
+    //It's because some server adds the some strings in operator server's side
+    //ex. for images, server can return content-type as: "image/gif; fwd=no"
+    TInt bfExtraStrPos = aMIMEType.Find(KSemicolonDelimiter);
+    if (bfExtraStrPos != KErrNotFound)
+      {
+      //Then just take the string before KSemicolonDelimiter
+      iMIMEType = aMIMEType.Left(bfExtraStrPos).AllocL();
+      }
+    else
+      {
+      iMIMEType = aMIMEType.AllocL();
+      }
 #ifdef __OOM__
     CImageRendererFactory::Instance()->OOMRegisterImage( this );

S60/branches/3.1m/WebKit/ChangeLog

@@ +1 @@
+2007-03-22  hongzhao  <set EMAIL_ADDRESS environment variable>
+
+        Reviewed by zbujtas@gmail.com
+        DESC: [S60] Some images crash when browsing some wap page - TKWG-6Z59YX in 3.1m branch
+        Fix: Remove extra image content-type strings added by the server before passing it to the image decoder.
+        http://bugs.webkit.org/show_bug.cgi?id=13151
+
+        * BrowserCore/Renderers/src/ImageRenderer.cpp:
+        (CImageRenderer::ConstructL):
+
 2007-03-22  spadma