wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 751641: Fix bug in which we add a Java MIME type to all plugins. r=jst

Browse Source
This commit is contained in:
Josh Aas 2012-05-04 00:35:07 -04:00
parent cf4f8d7c5f
commit 4f04f118ea
2 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dom/plugins/base/nsPluginHost.cpp
View File

@ -2553,7 +2553,7 @@ nsPluginHost::WritePluginInfo()
(tag->mName.get()),
PLUGIN_REGISTRY_FIELD_DELIMITER,
PLUGIN_REGISTRY_END_OF_LINE_MARKER,
tag->mMimeTypes.Length() + 1);
tag->mMimeTypes.Length());
// Add in each mimetype this plugin supports
for (PRUint32 i = 0; i < tag->mMimeTypes.Length(); i++) {
@ -2567,18 +2567,6 @@ nsPluginHost::WritePluginInfo()
PLUGIN_REGISTRY_FIELD_DELIMITER,
PLUGIN_REGISTRY_END_OF_LINE_MARKER);
}
// This used to depend on whether or not we had an npruntime-enabled
// Java plugin but we don't care any more, we just assume we do.
PR_fprintf(fd, "%d%c%s%c%s%c%s%c%c\n",
tag->mMimeTypes.Length(), PLUGIN_REGISTRY_FIELD_DELIMITER,
"application/x-java-vm-npruntime",
PLUGIN_REGISTRY_FIELD_DELIMITER,
"",
PLUGIN_REGISTRY_FIELD_DELIMITER,
"",
PLUGIN_REGISTRY_FIELD_DELIMITER,
PLUGIN_REGISTRY_END_OF_LINE_MARKER);
}
}

13
dom/plugins/base/nsPluginTags.cpp
View File

@ -159,19 +159,6 @@ void nsPluginTag::InitMime(const char* const* aMimeTypes,
continue;
}
// If we already marked this as a Java plugin, a later MIME type will tell
// us if it is npruntime-enabled. We don't actually care any more because we
// don't support Java access via the "java" and "packages" DOM objects, so
// we don't save the value, but we skip the MIME type.
if (mIsJavaPlugin) {
if (strcmp(aMimeTypes[i], "application/x-java-vm-npruntime") == 0) {
// This "magic MIME type" should not be exposed, but is just a signal
// to the browser that this is new-style java.
// Don't add it or its associated information to our arrays.
continue;
}
}
// Look for certain special plugins.
if (nsPluginHost::IsJavaMIMEType(aMimeTypes[i])) {
mIsJavaPlugin = true;