Title: [185289] trunk/Source/WebKit/mac
- Revision
- 185289
- Author
- [email protected]
- Date
- 2015-06-06 12:22:29 -0700 (Sat, 06 Jun 2015)
Log Message
Only allow plug-ins to create custom MIME property lists on older versions of OS X
https://bugs.webkit.org/show_bug.cgi?id=145726
Reviewed by Dan Bernstein.
* Plugins/WebBasePluginPackage.mm:
(-[WebBasePluginPackage getPluginInfoFromPLists]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (185288 => 185289)
--- trunk/Source/WebKit/mac/ChangeLog 2015-06-06 08:43:10 UTC (rev 185288)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-06-06 19:22:29 UTC (rev 185289)
@@ -1,3 +1,13 @@
+2015-06-06 Anders Carlsson <[email protected]>
+
+ Only allow plug-ins to create custom MIME property lists on older versions of OS X
+ https://bugs.webkit.org/show_bug.cgi?id=145726
+
+ Reviewed by Dan Bernstein.
+
+ * Plugins/WebBasePluginPackage.mm:
+ (-[WebBasePluginPackage getPluginInfoFromPLists]):
+
2015-06-05 Mark Lam <[email protected]>
finally blocks should not set the exception stack trace when re-throwing the exception.
Modified: trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm (185288 => 185289)
--- trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm 2015-06-06 08:43:10 UTC (rev 185288)
+++ trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm 2015-06-06 19:22:29 UTC (rev 185289)
@@ -180,6 +180,8 @@
return NO;
NSDictionary *MIMETypes = nil;
+
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
NSString *pListFilename = [self _objectForInfoDictionaryKey:WebPluginMIMETypesFilenameKey];
// Check if the MIME types are claimed in a plist in the user's preferences directory.
@@ -196,6 +198,7 @@
// Plist doesn't exist, ask the plug-in to create it.
MIMETypes = [[self pListForPath:pListPath createFile:YES] objectForKey:WebPluginMIMETypesKey];
}
+#endif
if (!MIMETypes) {
MIMETypes = [self _objectForInfoDictionaryKey:WebPluginMIMETypesKey];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
