Bug 85036 – [BlackBerry] Rendering bmp file as text file when Content-Type:image/x-ms-bmp from apache web server.

• Component: WebKit BlackBerry
• Status: RESOLVED FIXED

[Jason Liu]

1. Go to
http://browser.swlab.rim.net/test/rendering/html/EnclosureElements/bmp.bmp


Expected:
   See the picture
Actual:
    BM6g6........................(garbage text display)

[Jason Liu]

Created attachment 139315 [details]
Patch

[Rob Buis]

Comment on attachment 139315 [details]
Patch

I know of a more generic fix that also removed the pjpeg hack, that one did not seem very elegant.

[Rob Buis]

Created attachment 140280 [details]
Patch

[WebKit Review Bot]

Attachment 140280 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1
Source/WebKit/blackberry/Api/WebSettings.cpp:24:  Alphabetical sorting problem.  [build/include_order] [4]
Total errors found: 1 in 6 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Rob Buis]

Created attachment 140284 [details]
Patch

[Antonio Gomes]

Comment on attachment 140284 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=140284&action=review

> Source/WebCore/platform/MIMETypeRegistry.cpp:689
> +String MIMETypeRegistry::getNormalizedMIMEType(const String& mimeType)

can this be inline?

> Source/WebCore/platform/MIMETypeRegistry.cpp:696
> +#if PLATFORM(BLACKBERRY)
> +    MIMETypeAssociationMap::const_iterator it = mimeTypeAssociationMap().find(mimeType);
> +
> +    return it == mimeTypeAssociationMap().end() ? mimeType : it->second;
> +#else
> +    return mimeType;

691#if PLATFORM(BLACKBERRY)
 692 MIMETypeAssociationMap::const_iterator it = mimeTypeAssociationMap().find(mimeType);
 693 if (it != mimeTypeAssociationMap().end())
 694     return it->second;
 695#endif
 696 return mimeType;

[Rob Buis]

(In reply to comment #6)
> (From update of attachment 140284 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=140284&action=review
> 
> > Source/WebCore/platform/MIMETypeRegistry.cpp:689
> > +String MIMETypeRegistry::getNormalizedMIMEType(const String& mimeType)
> 
> can this be inline?

I know what you mean, would be better for performance, but a lot of datastructure stuff would have to be moved into the header.

[Rob Buis]

Created attachment 140298 [details]
Patch

[Rob Buis]

Landed in r116145.