Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-26 23:23:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 611296: Fix bug that caused the Quicktime plugin to fail to load for some Mac OS X users. Don't require that the MIME plist locale match the current locale. r=sgreenlay a=blocking2.0betaN+

Browse Source
This commit is contained in:
Josh Aas 2011-01-07 07:47:41 -05:00
parent d9e60f2b88
commit d1ea555568
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/plugin/base/src/nsPluginHost.cpp
View File

@ -192,8 +192,9 @@ using mozilla::TimeStamp;
// 0.11 file name and full path fields now store expected values on all platforms, bug 488181
// 0.12 force refresh due to quicktime pdf claim fix, bug 611197
// 0.13 add architecture and list of invalid plugins, bug 616271
// 0.14 force refresh due to locale comparison fix, bug 611296
// The current plugin registry version (and the maximum version we know how to read)
static const char *kPluginRegistryVersion = "0.13";
static const char *kPluginRegistryVersion = "0.14";
// The minimum registry version we know how to read
static const char *kMinimumRegistryVersion = "0.9";

17
modules/plugin/base/src/nsPluginsDirDarwin.cpp
View File

@ -212,22 +212,7 @@ static CFDictionaryRef ParsePlistForMIMETypesFilename(CFBundleRef bundle)
if (::CFGetTypeID(propertyList) != ::CFDictionaryGetTypeID()) {
return NULL;
}
CFTypeRef localizedName = ::CFDictionaryGetValue(static_cast<CFDictionaryRef>(propertyList), CFSTR("WebPluginLocalizationName"));
if (!localizedName || ::CFGetTypeID(localizedName) != ::CFStringGetTypeID()) {
return NULL;
}
CFLocaleRef currentLocale = ::CFLocaleCopyCurrent();
if (!currentLocale) {
return NULL;
}
AutoCFTypeObject currentLocaleAutorelease(currentLocale);
if (::CFStringCompare(static_cast<CFStringRef>(localizedName), ::CFLocaleGetIdentifier(currentLocale), 0) != kCFCompareEqualTo) {
return NULL;
}
CFTypeRef mimeTypes = ::CFDictionaryGetValue(static_cast<CFDictionaryRef>(propertyList), CFSTR("WebPluginMIMETypes"));
if (!mimeTypes || ::CFGetTypeID(mimeTypes) != ::CFDictionaryGetTypeID() || ::CFDictionaryGetCount(static_cast<CFDictionaryRef>(mimeTypes)) == 0) {
return NULL;