2010-09-13 Andreas Kling <andreas.kling@nokia.com>
authorAdemar de Souza Reis Jr <ademar.reis@openbossa.org>
Wed, 26 Jan 2011 21:05:18 +0000 (18:05 -0300)
committerAdemar de Souza Reis Jr <ademar.reis@openbossa.org>
Wed, 26 Jan 2011 21:05:18 +0000 (18:05 -0300)
commit495f6f1a12bf6d67ffe50a9dcf8cb7c60b9cc497
tree39207ddfc0a387ea8ff14b0ecc820d14bd5c47aa
parent1f0a7bea034d790d4dc82380b8d29460eae230dc
2010-09-13  Andreas Kling  <andreas.kling@nokia.com>

        Reviewed by Kenneth Rohde Christiansen.

        [Qt] Don't add empty strings to list of supported image MIME types
        https://bugs.webkit.org/show_bug.cgi?id=45643

        After <http://trac.webkit.org/changeset/67355> getMIMETypeForExtension()
        returns an empty string instead of "application/octet-stream" for unsupported
        extensions. Don't add these to the list of supported types, and clean out
        the logic that removed "application/octet-stream" from supported types.

        Fixes crash in initializeMIMETypeRegistry() due to inserting String() into
        a HashSet<String>.

        * platform/MIMETypeRegistry.cpp:
        (WebCore::initializeSupportedImageMIMETypes):
        (WebCore::initializeSupportedImageMIMETypesForEncoding):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67375 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Conflicts:

WebCore/platform/MIMETypeRegistry.cpp
WebCore/ChangeLog
WebCore/platform/MIMETypeRegistry.cpp