Changeset 67355 in webkit

Timestamp:

Sep 12, 2010 5:19:43 PM (14 years ago)

Author:

robert@webkit.org

Message:

2010-09-12 Robert Hogan <​robert@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@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):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/network/qt/QNetworkReplyHandler.cpp (modified) (1 diff)
• WebCore/platform/qt/MIMETypeRegistryQt.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-09-12  Robert Hogan  <robert@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@apple.com>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -215 +215 @@
 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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-09-12  Robert Hogan  <robert@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@apple.com>
 

trunk/WebCore/platform/network/qt/QNetworkReplyHandler.cpp

@@ -305 +305 @@
     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());
     }
 

trunk/WebCore/platform/qt/MIMETypeRegistryQt.cpp

@@ -80 +80 @@
     }
 
-    return "application/octet-stream";
+    return String();
 }