Changeset 75567 in webkit

Timestamp:

Jan 11, 2011 4:33:21 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-01-11 Nicolas Dufresne <​nicolas.dufresne@collabora.co.uk>

Reviewed by Adam Barth.

Use plug-in DB for extensions to MIME type convertion

Plugins extension to MIME type conversion was not used in the
frameLoader. This was causing some fallback to be use which as the side
effect of loosing all the <OBJECT> parameters or <EMBED> attributes.
This patch ensure that we try to convert the extension to MIME type
using the plugin database beofre using this fallback.

Attribute lost with Flash plugin without mime type set
​https://bugs.webkit.org/show_bug.cgi?id=50657

• plugins/no-mime-with-valid-extension.html: Added.
• plugins/no-mime-with-valid-extension-expected.txt: Added.

2011-01-11 Nicolas Dufresne <​nicolas.dufresne@collabora.co.uk>

Reviewed by Adam Barth.

Use plug-in DB for extensions to MIME type convertion

Plugins extension to MIME type conversion was not used in the
frameLoader. This was causing some fallback to be use which as the side
effect of loosing all the <OBJECT> parameters or <EMBED> attributes.
This patch ensure that we try to convert the extension to MIME type
using the plugin database beofre using this fallback.

Attribute lost with Flash plugin without mime type set
​https://bugs.webkit.org/show_bug.cgi?id=50657

Test: plugins/no-mime-with-valid-extension.html

• loader/FrameLoader.cpp: (WebCore::FrameLoader::defaultObjectContentType): Use PluginDatabase for MIME

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/plugins/no-mime-with-valid-extension-expected.txt (added)
• LayoutTests/plugins/no-mime-with-valid-extension.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/FrameLoader.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-01-11  Nicolas Dufresne  <nicolas.dufresne@collabora.co.uk>
+
+        Reviewed by Adam Barth.
+
+        Use plug-in DB for extensions to MIME type convertion
+
+        Plugins extension to MIME type conversion was not used in the
+        frameLoader. This was causing some fallback to be use which as the side
+        effect of loosing all the <OBJECT> parameters or <EMBED> attributes.
+        This patch ensure that we try to convert the extension to MIME type
+        using the plugin database beofre using this fallback.
+
+        Attribute lost with Flash plugin without mime type set
+        https://bugs.webkit.org/show_bug.cgi?id=50657
+
+        * plugins/no-mime-with-valid-extension.html: Added.
+        * plugins/no-mime-with-valid-extension-expected.txt: Added.
+
 2011-01-11  Justin Schuh  <jschuh@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-11  Nicolas Dufresne  <nicolas.dufresne@collabora.co.uk>
+
+        Reviewed by Adam Barth.
+
+        Use plug-in DB for extensions to MIME type convertion
+
+        Plugins extension to MIME type conversion was not used in the
+        frameLoader. This was causing some fallback to be use which as the side
+        effect of loosing all the <OBJECT> parameters or <EMBED> attributes.
+        This patch ensure that we try to convert the extension to MIME type
+        using the plugin database beofre using this fallback.
+
+        Attribute lost with Flash plugin without mime type set
+        https://bugs.webkit.org/show_bug.cgi?id=50657
+
+        Test: plugins/no-mime-with-valid-extension.html
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::defaultObjectContentType): Use PluginDatabase for MIME
+
 2011-01-11  James Simonsen  <simonjam@chromium.org>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -961 +961 @@
 {
     String mimeType = mimeTypeIn;
+    String extension = url.path().substring(url.path().reverseFind('.') + 1);
+
     // We don't use MIMETypeRegistry::getMIMETypeForPath() because it returns "application/octet-stream" upon failure
     if (mimeType.isEmpty())
-        mimeType = MIMETypeRegistry::getMIMETypeForExtension(url.path().substring(url.path().reverseFind('.') + 1));
+        mimeType = MIMETypeRegistry::getMIMETypeForExtension(extension);
+
+#if !PLATFORM(MAC) && !PLATFORM(CHROMIUM) && !PLATFORM(EFL) // Mac has no PluginDatabase, nor does Chromium or EFL
+    if (mimeType.isEmpty())
+        mimeType = PluginDatabase::installedPlugins()->MIMETypeForExtension(extension);
+#endif
 
     if (mimeType.isEmpty())