Bug 32572 – [Qt] Cannot load flash files from a local file.

• Component: Plug-ins
• Status: RESOLVED FIXED

[Yael]

swf files that are loaded from the local file system have their mime type set to application/octet-stream. This prevents identifying the file as flash file.
The same problem can be observed in Safari, but not in Chrome.
Patch will follow soon.

[Yael]

Created attachment 44901 [details]
Patch.

[WebKit Review Bot]

style-queue ran check-webkit-style on attachment 44901 [details] without any errors.

[Yael]

Created attachment 44903 [details]
Patch.

Separate the new code into its own method, as suggested by Kenneth.

[WebKit Review Bot]

style-queue ran check-webkit-style on attachment 44903 [details] without any errors.

[Kenneth Rohde Christiansen]

Comment on attachment 44903 [details]
Patch.

When landing consider the below comments

> +        void substituteMIMETypeFromPluginDatabase(const ResourceResponse& r);\

Remove the 'r' variable


> +#if PLATFORM(QT)
> +void MainResourceLoader::substituteMIMETypeFromPluginDatabase(const ResourceResponse& r)
> +{
> +    if (m_frame->settings()->arePluginsEnabled()) {
> +        String filename = r.url().lastPathComponent();
> +        if (!filename.endsWith("/")) {
> +            int extensionPos = filename.reverseFind('.');
> +            if (extensionPos != -1) {
> +                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

Reduce nesting by using early returns.

[Yael]

Created attachment 44907 [details]
New patch to reduce nesting.

[WebKit Review Bot]

style-queue ran check-webkit-style on attachment 44907 [details] without any errors.

[WebKit Commit Bot]

Comment on attachment 44907 [details]
New patch to reduce nesting.

Clearing flags on attachment: 44907

Committed r52172: <http://trac.webkit.org/changeset/52172>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.