Load bundle resources when loading bundles on the Mac

base/native_library_mac.mm

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/native_library.h"
 
 #include <dlfcn.h>
 #import <Carbon/Carbon.h>
 
 #include "base/file_path.h"
@@ skipping 22 matching lines @@
       true));
   if (!url)
     return NULL;
   CFBundleRef bundle = CFBundleCreate(kCFAllocatorDefault, url.get());
   if (!bundle)
     return NULL;
 
   NativeLibrary native_lib = new NativeLibraryStruct();
   native_lib->type = BUNDLE;
   native_lib->bundle = bundle;
+  native_lib->bundle_resource_ref = CFBundleOpenBundleResourceMap(bundle);
   return native_lib;
 }
 
 // static
 void UnloadNativeLibrary(NativeLibrary library) {
-  if (library->type == BUNDLE)
+  if (library->type == BUNDLE) {
+    CFBundleCloseBundleResourceMap(library->bundle,
+                                   library->bundle_resource_ref);

[Avi (use Gerrit), 2010/01/28 14:46:47]

What if there was no resource map and the open call returned -1; is it safe to
call close with the -1?

[stuartmorgan, 2010/01/28 15:24:37]

The docs say nothing about returning -1 (or anything else) on failure, and
neither the WebKit code nor our own plugin info reading code does any kind of
check.

     CFRelease(library->bundle);
-  else
+  } else {
     dlclose(library->dylib);
+  }
   delete library;
 }
 
 // static
 void* GetFunctionPointerFromNativeLibrary(NativeLibrary library,
                                           const char* name) {
   if (library->type == BUNDLE) {
     scoped_cftyperef<CFStringRef> symbol_name(
         CFStringCreateWithCString(kCFAllocatorDefault, name,
                                   kCFStringEncodingUTF8));
     return CFBundleGetFunctionPointerForName(library->bundle, symbol_name);
   }
   return dlsym(library->dylib, name);
 }
 
 // static
 string16 GetNativeLibraryName(const string16& name) {
   return name + ASCIIToUTF16(".dylib");
 }
 
 }  // namespace base