Title: [211264] branches/safari-603-branch/Source/WebKit2
- Revision
- 211264
- Author
- [email protected]
- Date
- 2017-01-27 00:02:01 -0800 (Fri, 27 Jan 2017)
Log Message
Merge r211223. rdar://problem/30181179
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (211263 => 211264)
--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-27 08:01:59 UTC (rev 211263)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-27 08:02:01 UTC (rev 211264)
@@ -1,3 +1,18 @@
+2017-01-26 Matthew Hanson <[email protected]>
+
+ Merge r211223. rdar://problem/30181179
+
+ 2017-01-26 Anders Carlsson <[email protected]>
+
+ Don't use _CFBundleCreateUnique on Yosemite, it's not available there
+ https://bugs.webkit.org/show_bug.cgi?id=167459
+ rdar://problem/30181179
+
+ Reviewed by Beth Dakin.
+
+ * Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
+ (WebKit::NetscapePluginModule::getPluginInfo):
+
2017-01-25 Matthew Hanson <[email protected]>
Merge r211126. rdar://problem/30174873
Modified: branches/safari-603-branch/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm (211263 => 211264)
--- branches/safari-603-branch/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm 2017-01-27 08:01:59 UTC (rev 211263)
+++ branches/safari-603-branch/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm 2017-01-27 08:02:01 UTC (rev 211264)
@@ -209,7 +209,12 @@
RetainPtr<CFURLRef> bundleURL = adoptCF(CFURLCreateWithFileSystemPath(kCFAllocatorDefault, pluginPath.createCFString().get(), kCFURLPOSIXPathStyle, false));
// Try to initialize the bundle.
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
RetainPtr<CFBundleRef> bundle = adoptCF(_CFBundleCreateUnique(kCFAllocatorDefault, bundleURL.get()));
+#else
+ RetainPtr<CFBundleRef> bundle = adoptCF(CFBundleCreate(kCFAllocatorDefault, bundleURL.get()));
+#endif
+
if (!bundle)
return false;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
