Changeset 75878 in webkit

Timestamp:

Jan 15, 2011 6:51:56 AM (13 years ago)

Author:

robert@webkit.org

Message:

2011-01-15 Robert Hogan <​robert@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] plugins/no-mime-with-valid-extension.html fails

Check extension of resource against installed
plugins when determining mime-type.

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

• platform/qt/Skipped:

2011-01-15 Robert Hogan <​robert@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] plugins/no-mime-with-valid-extension.html fails
Check extension of resource against installed
plugins when determining mime-type.

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

• WebCoreSupport/FrameLoaderClientQt.cpp: (WebCore::FrameLoaderClientQt::objectContentType):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-01-15  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] plugins/no-mime-with-valid-extension.html fails
+
+        Check extension of resource against installed
+        plugins when determining mime-type.
+
+        https://bugs.webkit.org/show_bug.cgi?id=52288
+        https://bugs.webkit.org/show_bug.cgi?id=50657
+        * platform/qt/Skipped:
+
 2011-01-15  Stephen White  <senorblanco@chromium.org>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -5380 +5380 @@
 fast/xmlhttprequest/null-document-xmlhttprequest-open.html
 fast/xmlhttprequest/xmlhttprequest-nonexistent-file.html
-
-# [Qt] plugins/no-mime-with-valid-extension.html fails
-# https://bugs.webkit.org/show_bug.cgi?id=52288
-plugins/no-mime-with-valid-extension.html

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2011-01-15  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] plugins/no-mime-with-valid-extension.html fails
+        Check extension of resource against installed
+        plugins when determining mime-type.
+
+        https://bugs.webkit.org/show_bug.cgi?id=52288
+        https://bugs.webkit.org/show_bug.cgi?id=50657
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::objectContentType):
+
 2011-01-14  Sam Magnuson  <smagnuso@gmail.com>
 

trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

@@ -1305 +1305 @@
 {
 //    qDebug()<<" ++++++++++++++++ url is "<<url.prettyURL()<<", mime = "<<_mimeType;
+    QFileInfo fi(url.path());
+    String extension = fi.suffix();
     if (_mimeType == "application/x-qt-plugin" || _mimeType == "application/x-qt-styled-widget")
         return ObjectContentOtherPlugin;
@@ -1312 +1314 @@
 
     String mimeType = _mimeType;
-    if (!mimeType.length()) {
-        QFileInfo fi(url.path());
-        mimeType = MIMETypeRegistry::getMIMETypeForExtension(fi.suffix());
-    }
+    if (!mimeType.length())
+        mimeType = MIMETypeRegistry::getMIMETypeForExtension(extension);
+
+    if (!mimeType.length())
+        mimeType = PluginDatabase::installedPlugins()->MIMETypeForExtension(extension);
 
     if (!mimeType.length())