[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 7c5db47889fa8aa870587b4c054429000b9483ed
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 12 20:03:56 2009 +0000

    2009-11-12  Adam Barth  <abarth>
    
            Reviewed by Dimitri Glazkov.
    
            [Chromium] reload-subframe-object.html fails
            https://bugs.webkit.org/show_bug.cgi?id=31398
    
            More closely match FrameLoaderClient.mm.  Turns out we don't want to
            use MIMETypeRegistry::getMIMETypeForPath because we can't distinguish
            between application/octet-stream and lack of knowledge of the MIME
            type.
    
            Covered by reload-subframe-object.html.
    
            * src/FrameLoaderClientImpl.cpp:
            (WebKit::FrameLoaderClientImpl::objectContentType):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50891 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 1d7a502..095d784 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,20 @@
+2009-11-12  Adam Barth  <abarth>
+
+        Reviewed by Dimitri Glazkov.
+
+        [Chromium] reload-subframe-object.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=31398
+
+        More closely match FrameLoaderClient.mm.  Turns out we don't want to
+        use MIMETypeRegistry::getMIMETypeForPath because we can't distinguish
+        between application/octet-stream and lack of knowledge of the MIME
+        type.
+
+        Covered by reload-subframe-object.html.
+
+        * src/FrameLoaderClientImpl.cpp:
+        (WebKit::FrameLoaderClientImpl::objectContentType):
+
 2009-11-12  Nate Chapin  <japhet at chromium.org>
 
         Unreviewed, Chromium build fix.
diff --git a/WebKit/chromium/src/FrameLoaderClientImpl.cpp b/WebKit/chromium/src/FrameLoaderClientImpl.cpp
index 2b4b1bc..f0abfb2 100644
--- a/WebKit/chromium/src/FrameLoaderClientImpl.cpp
+++ b/WebKit/chromium/src/FrameLoaderClientImpl.cpp
@@ -47,6 +47,7 @@
 #include "Page.h"
 #include "PlatformString.h"
 #include "PluginData.h"
+#include "PluginDataChromium.h"
 #include "StringExtras.h"
 #include "WebDataSourceImpl.h"
 #include "WebDevToolsAgentPrivate.h"
@@ -1348,8 +1349,15 @@ ObjectContentType FrameLoaderClientImpl::objectContentType(
         // Try to guess the MIME type based off the extension.
         String filename = url.lastPathComponent();
         int extensionPos = filename.reverseFind('.');
-        if (extensionPos >= 0)
-            mimeType = MIMETypeRegistry::getMIMETypeForPath(url.path());
+        if (extensionPos >= 0) {
+            String extension = filename.substring(extensionPos + 1);
+            mimeType = MIMETypeRegistry::getMIMETypeForExtension(extension);
+            if (mimeType.isEmpty()) {
+                // If there's no mimetype registered for the extension, check to see
+                // if a plugin can handle the extension.
+                mimeType = getPluginMimeTypeFromExtension(extension);
+            }
+        }
 
         if (mimeType.isEmpty())
             return ObjectContentFrame;

-- 
WebKit Debian packaging