Changeset 71006 in webkit

Timestamp:

Oct 31, 2010 7:48:41 PM (13 years ago)

Author:

robert@webkit.org

Message:

2010-10-31 Robert Hogan <​robert@webkit.org>

Reviewed by Antonio Gomes.

[Qt] [Gtk] Plug-ins having upper case in mime type are failing to load

Qt and Gtk are case-sensitive when storing the declared mime-type
of plugins. Since plugin mime-types are lowercased prior to searching
for them in the plugin database, ensure they are loaded with the
mime-type in lower case too.

​https://bugs.webkit.org/show_bug.cgi?id=36815

• plugins/gtk/PluginPackageGtk.cpp: (WebCore::PluginPackage::fetchInfo):
• plugins/qt/PluginPackageQt.cpp: (WebCore::PluginPackage::setMIMEDescription):

2010-10-31 Robert Hogan <​robert@webkit.org>

Reviewed by Antonio Gomes.

[Qt] [Gtk] Plug-ins having upper case in mime type are failing to load

Qt and Gtk are case-sensitive when storing the declared mime-type
of plugins. Since plugin mime-types are lowercased prior to searching
for them in the plugin database, ensure they are loaded with the
mime-type in lower case too.

Change the test netscape plugin to declare its mimetype in sentence
case so that the correct behaviour is enforced.

​https://bugs.webkit.org/show_bug.cgi?id=36815

• DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp: (NP_GetMIMEDescription):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/plugins/gtk/PluginPackageGtk.cpp (modified) (1 diff)
• WebCore/plugins/qt/PluginPackageQt.cpp (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-31  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] [Gtk] Plug-ins having upper case in mime type are failing to load
+
+        Qt and Gtk are case-sensitive when storing the declared mime-type
+        of plugins. Since plugin mime-types are lowercased prior to searching
+        for them in the plugin database, ensure they are loaded with the
+        mime-type in lower case too.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36815
+
+        * plugins/gtk/PluginPackageGtk.cpp:
+        (WebCore::PluginPackage::fetchInfo):
+        * plugins/qt/PluginPackageQt.cpp:
+        (WebCore::PluginPackage::setMIMEDescription):
+
 2010-10-31  Robert Hogan  <robert@webkit.org>
 

trunk/WebCore/plugins/gtk/PluginPackageGtk.cpp

@@ -75 +75 @@
     gchar** mimeDescs = g_strsplit(types, ";", -1);
     for (int i = 0; mimeDescs[i] && mimeDescs[i][0]; i++) {
-        gchar** mimeData = g_strsplit(mimeDescs[i], ":", 3);
+        gchar** mimeData = g_strsplit(g_strdown(mimeDescs[i]), ":", 3);
         if (g_strv_length(mimeData) < 3) {
             g_strfreev(mimeData);

trunk/WebCore/plugins/qt/PluginPackageQt.cpp

@@ -70 +70 @@
 void PluginPackage::setMIMEDescription(const String& mimeDescription)
 {
-    m_fullMIMEDescription = mimeDescription;
+    m_fullMIMEDescription = mimeDescription.lower();
 
     Vector<String> types;
-    mimeDescription.split(UChar(';'), false, types);
+    mimeDescription.lower().split(UChar(';'), false, types);
     for (unsigned i = 0; i < types.size(); ++i) {
         Vector<String> mime;

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-10-31  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] [Gtk] Plug-ins having upper case in mime type are failing to load
+
+        Qt and Gtk are case-sensitive when storing the declared mime-type
+        of plugins. Since plugin mime-types are lowercased prior to searching
+        for them in the plugin database, ensure they are loaded with the
+        mime-type in lower case too.
+
+        Change the test netscape plugin to declare its mimetype in sentence
+        case so that the correct behaviour is enforced.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36815
+
+        * DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp:
+        (NP_GetMIMEDescription):
+
 2010-10-31  Robert Hogan  <robert@webkit.org>
 

trunk/WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp

@@ -373 +373 @@
 NP_GetMIMEDescription(void)
 {
-    return const_cast<char*>("application/x-webkit-test-netscape:testnetscape:test netscape content");
+    // We sentence-case the mime-type here to ensure that ports are not
+    // case-sensitive when loading plugins. See https://webkit.org/b/36815
+    return const_cast<char*>("application/x-Webkit-Test-Netscape:testnetscape:test netscape content");
 }