diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebKit2/Platform/mac/ModuleMac.mm | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebKit2/Platform/mac/ModuleMac.mm')
| -rw-r--r-- | Source/WebKit2/Platform/mac/ModuleMac.mm | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/Source/WebKit2/Platform/mac/ModuleMac.mm b/Source/WebKit2/Platform/mac/ModuleMac.mm index 078e7ee..1ec60f3 100644 --- a/Source/WebKit2/Platform/mac/ModuleMac.mm +++ b/Source/WebKit2/Platform/mac/ModuleMac.mm @@ -48,6 +48,13 @@ bool Module::load() void Module::unload() { + ASSERT(m_bundle); + +#if !defined(__LP64__) + if (m_bundleResourceMap != -1) + CFBundleCloseBundleResourceMap(m_bundle.get(), m_bundleResourceMap); +#endif + // See the comment in Module.h for why we leak the bundle here. m_bundle.releaseRef(); } @@ -60,4 +67,14 @@ void* Module::platformFunctionPointer(const char* functionName) const return CFBundleGetFunctionPointerForName(m_bundle.get(), functionNameString.get()); } +#if !defined(__LP64__) +CFBundleRefNum Module::bundleResourceMap() +{ + if (m_bundleResourceMap == -1) + m_bundleResourceMap = CFBundleOpenBundleResourceMap(m_bundle.get()); + + return m_bundleResourceMap; +} +#endif + } |