Title: [211098] branches/safari-603-branch/Source
- Revision
- 211098
- Author
- matthew_han...@apple.com
- Date
- 2017-01-24 13:22:23 -0800 (Tue, 24 Jan 2017)
Log Message
Merge r210603. rdar://problem/29839194
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WTF/ChangeLog (211097 => 211098)
--- branches/safari-603-branch/Source/WTF/ChangeLog 2017-01-24 21:03:42 UTC (rev 211097)
+++ branches/safari-603-branch/Source/WTF/ChangeLog 2017-01-24 21:22:23 UTC (rev 211098)
@@ -1,3 +1,18 @@
+2017-01-24 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r210603. rdar://problem/29839194
+
+ 2017-01-11 Anders Carlsson <ander...@apple.com>
+
+ navigator.plugins.refresh and WKContextRefreshPlugIns doesn't pick up changes to already-present plug-ins
+ https://bugs.webkit.org/show_bug.cgi?id=166942
+ rdar://problem/29839194
+
+ Reviewed by Sam Weinig.
+
+ * wtf/spi/cf/CFBundleSPI.h:
+ Add SPI declaration.
+
2017-01-12 Matthew Hanson <matthew_han...@apple.com>
Merge r210399. rdar://problem/29019333
Modified: branches/safari-603-branch/Source/WTF/wtf/spi/cf/CFBundleSPI.h (211097 => 211098)
--- branches/safari-603-branch/Source/WTF/wtf/spi/cf/CFBundleSPI.h 2017-01-24 21:03:42 UTC (rev 211097)
+++ branches/safari-603-branch/Source/WTF/wtf/spi/cf/CFBundleSPI.h 2017-01-24 21:22:23 UTC (rev 211098)
@@ -38,6 +38,7 @@
void _CFBundleSetupXPCBootstrap(xpc_object_t bootstrap);
+CFBundleRef _CFBundleCreateUnique(CFAllocatorRef, CFURLRef bundleURL);
Boolean CFBundleGetLocalizationInfoForLocalization(CFStringRef localizationName, SInt32 *languageCode, SInt32 *regionCode, SInt32 *scriptCode, CFStringEncoding *stringEncoding);
CFStringRef CFBundleCopyLocalizationForLocalizationInfo(SInt32 languageCode, SInt32 regionCode, SInt32 scriptCode, CFStringEncoding stringEncoding);
Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (211097 => 211098)
--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-24 21:03:42 UTC (rev 211097)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-24 21:22:23 UTC (rev 211098)
@@ -1,3 +1,20 @@
+2017-01-24 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r210603. rdar://problem/29839194
+
+ 2017-01-11 Anders Carlsson <ander...@apple.com>
+
+ navigator.plugins.refresh and WKContextRefreshPlugIns doesn't pick up changes to already-present plug-ins
+ https://bugs.webkit.org/show_bug.cgi?id=166942
+ rdar://problem/29839194
+
+ Reviewed by Sam Weinig.
+
+ Use _CFBundleCreateUnique so the resulting bundle won't be cached.
+
+ * Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
+ (WebKit::NetscapePluginModule::getPluginInfo):
+
2017-01-20 Matthew Hanson <matthew_han...@apple.com>
Merge r210949. rdar://problem/30108531
Modified: branches/safari-603-branch/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm (211097 => 211098)
--- branches/safari-603-branch/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm 2017-01-24 21:03:42 UTC (rev 211097)
+++ branches/safari-603-branch/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm 2017-01-24 21:22:23 UTC (rev 211098)
@@ -32,6 +32,7 @@
#import "PluginSandboxProfile.h"
#import <wtf/HashSet.h>
#import <wtf/MainThread.h>
+#import <wtf/spi/cf/CFBundleSPI.h>
using namespace WebCore;
@@ -208,7 +209,7 @@
RetainPtr<CFURLRef> bundleURL = adoptCF(CFURLCreateWithFileSystemPath(kCFAllocatorDefault, pluginPath.createCFString().get(), kCFURLPOSIXPathStyle, false));
// Try to initialize the bundle.
- RetainPtr<CFBundleRef> bundle = adoptCF(CFBundleCreate(kCFAllocatorDefault, bundleURL.get()));
+ RetainPtr<CFBundleRef> bundle = adoptCF(_CFBundleCreateUnique(kCFAllocatorDefault, bundleURL.get()));
if (!bundle)
return false;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
