[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[robert at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 266963dc84b28d6a22119b0fb09716982c3eedde
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 13 00:19:43 2010 +0000

    2010-09-12  Robert Hogan  <robert at webkit.org>
    
            Reviewed by Andreas Kling.
    
            [Qt] Fix http/tests/navigation/reload-subframe-object.html
    
            Unskip http/tests/navigation/reload-subframe-object.html
    
            https://bugs.webkit.org/show_bug.cgi?id=45613
    
            * platform/qt/Skipped:
    2010-09-12  Robert Hogan  <robert at webkit.org>
    
            Reviewed by Andreas Kling.
    
            [Qt] Fix http/tests/navigation/reload-subframe-object.html
    
            We need to bring our use of getMimeTypeForPath() and
            getMimeTypeForExtension() into line with WebCore expectations.
    
            We should use MIMETypeRegistry::getMIMETypeForExtension() for cases
            where an empty mimetype should be returned if no match is found, and
            MIMETypeRegistry::getMIMETypeForPath() for cases where
            'application/octet-stream' should be returned if no match is found.
    
            Fixes http/tests/navigation/reload-subframe-object.html
    
            Based on findings in webkit.org/b/31398 and webkit.org/b/15554.
    
            https://bugs.webkit.org/show_bug.cgi?id=45613
    
            * platform/network/qt/QNetworkReplyHandler.cpp:
            (WebCore::QNetworkReplyHandler::sendResponseIfNeeded):
            * platform/qt/MIMETypeRegistryQt.cpp:
            (WebCore::MIMETypeRegistry::getMIMETypeForExtension):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67355 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c482f94..2fb8883 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-12  Robert Hogan  <robert at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Fix http/tests/navigation/reload-subframe-object.html
+
+        Unskip http/tests/navigation/reload-subframe-object.html
+
+        https://bugs.webkit.org/show_bug.cgi?id=45613
+
+        * platform/qt/Skipped:
+
 2010-09-12  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by James Robinson.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 5ae6503..fe30484 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -215,9 +215,6 @@ http/tests/navigation/javascriptlink-goback.html
 http/tests/navigation/metaredirect-goback.html
 http/tests/navigation/timerredirect-goback.html
 
-#unknown
-http/tests/navigation/reload-subframe-object.html
-
 # new content not loaded from popup window
 http/tests/navigation/target-frame-from-window.html
 
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c1dd0aa..05912d0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,28 @@
+2010-09-12  Robert Hogan  <robert at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Fix http/tests/navigation/reload-subframe-object.html
+
+        We need to bring our use of getMimeTypeForPath() and
+        getMimeTypeForExtension() into line with WebCore expectations.
+
+        We should use MIMETypeRegistry::getMIMETypeForExtension() for cases
+        where an empty mimetype should be returned if no match is found, and
+        MIMETypeRegistry::getMIMETypeForPath() for cases where
+        'application/octet-stream' should be returned if no match is found.
+
+        Fixes http/tests/navigation/reload-subframe-object.html
+
+        Based on findings in webkit.org/b/31398 and webkit.org/b/15554.
+
+        https://bugs.webkit.org/show_bug.cgi?id=45613
+
+        * platform/network/qt/QNetworkReplyHandler.cpp:
+        (WebCore::QNetworkReplyHandler::sendResponseIfNeeded):
+        * platform/qt/MIMETypeRegistryQt.cpp:
+        (WebCore::MIMETypeRegistry::getMIMETypeForExtension):
+
 2010-09-12  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Adele Peterson.
diff --git a/WebCore/platform/network/qt/QNetworkReplyHandler.cpp b/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
index 349a27f..2898303 100644
--- a/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
+++ b/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
@@ -304,12 +304,7 @@ void QNetworkReplyHandler::sendResponseIfNeeded()
 
     if (mimeType.isEmpty()) {
         // let's try to guess from the extension
-        QString extension = m_reply->url().path();
-        int index = extension.lastIndexOf(QLatin1Char('.'));
-        if (index > 0) {
-            extension = extension.mid(index + 1);
-            mimeType = MIMETypeRegistry::getMIMETypeForExtension(extension);
-        }
+        mimeType = MIMETypeRegistry::getMIMETypeForPath(m_reply->url().path());
     }
 
     KURL url(m_reply->url());
diff --git a/WebCore/platform/qt/MIMETypeRegistryQt.cpp b/WebCore/platform/qt/MIMETypeRegistryQt.cpp
index 4161f81..12db891 100644
--- a/WebCore/platform/qt/MIMETypeRegistryQt.cpp
+++ b/WebCore/platform/qt/MIMETypeRegistryQt.cpp
@@ -79,7 +79,7 @@ String MIMETypeRegistry::getMIMETypeForExtension(const String &ext)
         ++e;
     }
 
-    return "application/octet-stream";
+    return String();
 }
 
 bool MIMETypeRegistry::isApplicationPluginMIMEType(const String& mimeType)

-- 
WebKit Debian packaging