Title: [211223] trunk/Source/WebKit2
Revision
211223
Author
ander...@apple.com
Date
2017-01-26 11:50:14 -0800 (Thu, 26 Jan 2017)

Log Message

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):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (211222 => 211223)


--- trunk/Source/WebKit2/ChangeLog	2017-01-26 19:36:27 UTC (rev 211222)
+++ trunk/Source/WebKit2/ChangeLog	2017-01-26 19:50:14 UTC (rev 211223)
@@ -1,3 +1,14 @@
+2017-01-26  Anders Carlsson  <ander...@apple.com>
+
+        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-26  Alex Christensen  <achristen...@webkit.org>
 
         Add SPI for updating WebsitePolicies

Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm (211222 => 211223)


--- trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm	2017-01-26 19:36:27 UTC (rev 211222)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm	2017-01-26 19:50:14 UTC (rev 211223)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to