[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[robert at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 48a9089f5a53e24a9de0eaa15294d04922923d3f
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 15 14:51:56 2011 +0000

    2011-01-15  Robert Hogan  <robert at 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 at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75878 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1e23237..3c8ce8f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-15  Robert Hogan  <robert at 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 at chromium.org>
 
         Unreviewed; updated chromium test expectations.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 583beae..0c3986f 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -5379,7 +5379,3 @@ fast/workers/storage/change-version-sync.html
 fast/workers/storage/interrupt-database.html
 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
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 14facb4..9264a70 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-15  Robert Hogan  <robert at 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 at gmail.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index ba0370d..474b768 100644
--- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -1304,6 +1304,8 @@ void FrameLoaderClientQt::transferLoadingResourceFromPage(unsigned long, Documen
 ObjectContentType FrameLoaderClientQt::objectContentType(const KURL& url, const String& _mimeType)
 {
 //    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;
 
@@ -1311,10 +1313,11 @@ ObjectContentType FrameLoaderClientQt::objectContentType(const KURL& url, const
         return ObjectContentNone;
 
     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())
         return ObjectContentFrame;

-- 
WebKit Debian packaging