Changeset 81732 in webkit

Timestamp:

Mar 22, 2011 5:33:48 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-03-22 Anders Carlsson <​andersca@apple.com>

Reviewed by Sam Weinig.

OBJECT element with DivX source is always downloaded
​https://bugs.webkit.org/show_bug.cgi?id=56879

• Plugins/WebBasePluginPackage.mm: (-[WebBasePluginPackage getPluginInfoFromPLists]): Always try to split every element in the "WebPluginExtensions" array, since the DivX plug-in specifies multiple file extensions in a single element.

2011-03-22 Anders Carlsson <​andersca@apple.com>

Reviewed by Sam Weinig.

OBJECT element with DivX source is always downloaded
​https://bugs.webkit.org/show_bug.cgi?id=56879

• Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm: (WebKit::getPluginInfoFromPropertyLists): Always try to split every element in the "WebPluginExtensions" array, since the DivX plug-in specifies multiple file extensions in a single element.

• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: (WebKit::pluginSupportsExtension): Add a new helper function.

(WebKit::WebFrameLoaderClient::objectContentType):
If we can't find the MIME for an extension, explicitly check if there's a plugin that claims to
handle the given extension.

Location:

trunk/Source

Files:

• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/Plugins/WebBasePluginPackage.mm (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (2 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2011-03-22  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        OBJECT element with DivX source is always downloaded
+        https://bugs.webkit.org/show_bug.cgi?id=56879
+
+        * Plugins/WebBasePluginPackage.mm:
+        (-[WebBasePluginPackage getPluginInfoFromPLists]):
+        Always try to split every element in the "WebPluginExtensions" array, since the DivX plug-in
+        specifies multiple file extensions in a single element.
+
 2011-03-22  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm

@@ -39 +39 @@
 #import <wtf/Threading.h>
 #import <wtf/Vector.h>
+#import <wtf/text/CString.h>
 
 #import <WebKitSystemInterface.h>
@@ -223 +224 @@
         
         extensions = [[MIMEDictionary objectForKey:WebPluginExtensionsKey] _web_lowercaseStrings];
-        for (NSUInteger i = 0; i < [extensions count]; ++i)
-            mimeClassInfo.extensions.append((NSString *)[extensions objectAtIndex:i]);
+        for (NSUInteger i = 0; i < [extensions count]; ++i) {
+            // The DivX plug-in lists multiple extensions in a comma separated string instead of using
+            // multiple array elements in the property list. Work around this here by splitting the
+            // extension string into components.
+            NSArray *extensionComponents = [[extensions objectAtIndex:i] componentsSeparatedByString:@","];
+
+            for (NSString *extension in extensionComponents)
+                mimeClassInfo.extensions.append(extension);
+        }
 
         if ([extensions count] == 0)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-03-22  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        OBJECT element with DivX source is always downloaded
+        https://bugs.webkit.org/show_bug.cgi?id=56879
+
+        * Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
+        (WebKit::getPluginInfoFromPropertyLists):
+        Always try to split every element in the "WebPluginExtensions" array, since the DivX plug-in
+        specifies multiple file extensions in a single element.
+        
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::pluginSupportsExtension):
+        Add a new helper function.
+
+        (WebKit::WebFrameLoaderClient::objectContentType):
+        If we can't find the MIME for an extension, explicitly check if there's a plugin that claims to
+        handle the given extension.
+
 2011-03-22  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm

@@ -143 +143 @@
             if (!extension || CFGetTypeID(extension) != CFStringGetTypeID())
                 continue;
-            
-            mimeClassInfo.extensions.append(String(extension).lower());
+
+            // The DivX plug-in lists multiple extensions in a comma separated string instead of using
+            // multiple array elements in the property list. Work around this here by splitting the
+            // extension string into components.
+            Vector<String> extensionComponents;
+            String(extension).lower().split(',', extensionComponents);
+
+            for (size_t i = 0; i < extensionComponents.size(); ++i)
+                mimeClassInfo.extensions.append(extensionComponents[i]);
         }
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -1256 +1256 @@
 }
 
+static bool pluginSupportsExtension(PluginData* pluginData, const String& extension)
+{
+    ASSERT(extension.lower() == extension);
+
+    for (size_t i = 0; i < pluginData->mimes().size(); ++i) {
+        const MimeClassInfo& mimeClassInfo = pluginData->mimes()[i];
+
+        if (mimeClassInfo.extensions.contains(extension))
+            return true;
+    }
+    return false;
+}
+
 ObjectContentType WebFrameLoaderClient::objectContentType(const KURL& url, const String& mimeTypeIn)
 {
@@ -1262 +1275 @@
 
     String mimeType = mimeTypeIn;
-    if (mimeType.isEmpty())
-        mimeType = MIMETypeRegistry::getMIMETypeForExtension(url.path().substring(url.path().reverseFind('.') + 1));
+    if (mimeType.isEmpty()) {
+        String extension = url.path().substring(url.path().reverseFind('.') + 1).lower();
+
+        // Try to guess the MIME type from the extension.
+        mimeType = MIMETypeRegistry::getMIMETypeForExtension(extension);
+
+        if (mimeType.isEmpty()) {
+            // Check if there's a plug-in around that can handle the extension.
+            if (WebPage* webPage = m_frame->page()) {
+                if (PluginData* pluginData = webPage->corePage()->pluginData()) {
+                    if (pluginSupportsExtension(pluginData, extension))
+                        return ObjectContentNetscapePlugin;
+                }
+            }
+        }
+    }
 
     if (mimeType.isEmpty())