Changeset 52172 in webkit

Timestamp:

Dec 15, 2009 2:07:49 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-15 Yael Aharon <​yael.aharon@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Cannot load flash files from a local file.
​https://bugs.webkit.org/show_bug.cgi?id=32572

When loading the main resource and its mime type is application/octet-stream,
use the file extenstion to check if it is a supported plugin.

No new tests were added since any existing swf file can be used as a manual test.

• loader/MainResourceLoader.cpp: (WebCore::MainResourceLoader::didReceiveResponse):
• loader/MainResourceLoader.h:
• plugins/PluginDatabase.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/MainResourceLoader.cpp (modified) (3 diffs)
• loader/MainResourceLoader.h (modified) (1 diff)
• plugins/PluginDatabase.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-15  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Cannot load flash files from a local file.
+        https://bugs.webkit.org/show_bug.cgi?id=32572
+
+        When loading the main resource and its mime type is application/octet-stream,
+        use the file extenstion to check if it is a supported plugin.
+
+        No new tests were added since any existing swf file can be used as a manual test.
+
+        * loader/MainResourceLoader.cpp:
+        (WebCore::MainResourceLoader::didReceiveResponse):
+        * loader/MainResourceLoader.h:
+        * plugins/PluginDatabase.h:
+
 2009-12-15  Brian Weinstein  <bweinstein@apple.com>
 

trunk/WebCore/loader/MainResourceLoader.cpp

@@ -39 +39 @@
 #include "HTMLFormElement.h"
 #include "Page.h"
+#if PLATFORM(QT)
+#include "PluginDatabase.h"
+#endif
 #include "ResourceError.h"
 #include "ResourceHandle.h"
@@ -280 +283 @@
 }
 
+#if PLATFORM(QT)
+void MainResourceLoader::substituteMIMETypeFromPluginDatabase(const ResourceResponse& r)
+{
+    if (!m_frame->settings()->arePluginsEnabled())
+        return;
+
+    String filename = r.url().lastPathComponent();
+    if (filename.endsWith("/"))
+        return;
+
+    int extensionPos = filename.reverseFind('.');
+    if (extensionPos == -1)
+        return;
+
+    String extension = filename.substring(extensionPos + 1);
+    String mimeType = PluginDatabase::installedPlugins()->MIMETypeForExtension(extension);
+    if (!mimeType.isEmpty()) {
+        ResourceResponse* response = const_cast<ResourceResponse*>(&r);
+        response->setMimeType(mimeType);
+    }
+}
+#endif
+
 void MainResourceLoader::didReceiveResponse(const ResourceResponse& r)
 {
@@ -302 +328 @@
 #endif
 
+#if PLATFORM(QT)
+    if (r.mimeType() == "application/octet-stream")
+        substituteMIMETypeFromPluginDatabase(r);
+#endif
+
     if (m_loadingMultipartContent) {
         frameLoader()->setupForReplaceByMIMEType(r.mimeType());

trunk/WebCore/loader/MainResourceLoader.h

@@ -93 +93 @@
         void continueAfterContentPolicy(PolicyAction);
         void continueAfterContentPolicy(PolicyAction, const ResourceResponse&);
+        
+#if PLATFORM(QT)
+        void substituteMIMETypeFromPluginDatabase(const ResourceResponse&);
+#endif
 
         ResourceRequest m_initialRequest;

trunk/WebCore/plugins/PluginDatabase.h

@@ -84 +84 @@
         Vector<String> pluginDirectories() const { return m_pluginDirectories; }
 
+        String MIMETypeForExtension(const String& extension) const;
+
     private:
         void getPluginPathsInDirectories(HashSet<String>&) const;
@@ -91 +93 @@
         bool add(PassRefPtr<PluginPackage>);
         void remove(PluginPackage*);
-
-        String MIMETypeForExtension(const String& extension) const;
 
         Vector<String> m_pluginDirectories;