Changeset 211098 in webkit

Timestamp:

Jan 24, 2017, 1:22:23 PM (10 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r210603. rdar://problem/29839194

Location:

branches/safari-603-branch/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/spi/cf/CFBundleSPI.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm (modified) (2 diffs)

branches/safari-603-branch/Source/WTF/ChangeLog

@@ +1 @@
+2017-01-24  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r210603. rdar://problem/29839194
+
+    2017-01-11  Anders Carlsson  <andersca@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_hanson@apple.com>
 

branches/safari-603-branch/Source/WTF/wtf/spi/cf/CFBundleSPI.h

@@ -39 +39 @@
 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);

branches/safari-603-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-01-24  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r210603. rdar://problem/29839194
+
+    2017-01-11  Anders Carlsson  <andersca@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_hanson@apple.com>
 

branches/safari-603-branch/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm

@@ -33 +33 @@
 #import <wtf/HashSet.h>
 #import <wtf/MainThread.h>
+#import <wtf/spi/cf/CFBundleSPI.h>
 
 using namespace WebCore;
@@ -209 +210 @@
     
     // 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;