Reviewed by Kevin Decker.

        * Plugins/WebNetscapePluginPackage.m:
        (-[WebNetscapePluginPackage _unloadWithShutdown:]):
        Fixed a subtle problem with the 64-bit debug build -- as written, this would LOG() on 64-bit and do nothing on
        32-bit!
        * Plugins/WebPluginDatabase.m:
        (-[WebPluginDatabase _scanForNewPlugins]):
        Use +[NSMutableSet set] here.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@15902 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 97a1e498ea0fc0dce7e5662f18988e1a39875c5f..3c7373373fb309ec3ae49894810bac2c7d8fd76d 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2006-08-15  Tim Omernick  <timo@apple.com>
+
+        Reviewed by Kevin Decker.
+
+        * Plugins/WebNetscapePluginPackage.m:
+        (-[WebNetscapePluginPackage _unloadWithShutdown:]):
+        Fixed a subtle problem with the 64-bit debug build -- as written, this would LOG() on 64-bit and do nothing on
+        32-bit!
+        * Plugins/WebPluginDatabase.m:
+        (-[WebPluginDatabase _scanForNewPlugins]):
+        Use +[NSMutableSet set] here.
+
 2006-08-15  Tim Omernick  <timo@apple.com>
 
         Reviewed by Darin Adler.

diff --git a/WebKit/Plugins/WebNetscapePluginPackage.m b/WebKit/Plugins/WebNetscapePluginPackage.m
index a022fa43ea53feddba1b8e650288912ce6adf8ae..53bc5def962e3862ff8b6af70e438b4e2ccdc298 100644 (file)
--- a/WebKit/Plugins/WebNetscapePluginPackage.m
+++ b/WebKit/Plugins/WebNetscapePluginPackage.m
@@ -700,10 +700,11 @@ TransitionVector tVectorForFunctionPointer(FunctionPointer fp)
 
     if (isBundle)
         CFBundleUnloadExecutable(cfBundle);
-    else
 #ifndef __LP64__
+    else {
         // CFM is not supported in 64-bit
         WebCloseConnection(&connID);
+    }
 #endif
 
     LOG(Plugins, "Plugin Unloaded");

diff --git a/WebKit/Plugins/WebPluginDatabase.m b/WebKit/Plugins/WebPluginDatabase.m
index 2b2fdae0538895b7e520fc71351b563239897dd5..2ae75e058395df15b2c47cbf9de0f225455ea792 100644 (file)
--- a/WebKit/Plugins/WebPluginDatabase.m
+++ b/WebKit/Plugins/WebPluginDatabase.m
@@ -344,7 +344,7 @@ static NSArray *additionalWebPlugInPaths;
 
 - (NSMutableSet *)_scanForNewPlugins
 {
-    NSMutableSet *newPlugins = [[[NSMutableSet alloc] init] autorelease];
+    NSMutableSet *newPlugins = [NSMutableSet set];
     NSEnumerator *directoryEnumerator = [[self _plugInPaths] objectEnumerator];
     NSMutableSet *uniqueFilenames = [[NSMutableSet alloc] init];
     NSFileManager *fileManager = [NSFileManager defaultManager];