summaryrefslogtreecommitdiffstats
path: root/Source/WebKit2/Platform/Module.h
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-05-25 19:08:45 +0100
committerSteve Block <steveblock@google.com>2011-06-08 13:51:31 +0100
commit2bde8e466a4451c7319e3a072d118917957d6554 (patch)
tree28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebKit2/Platform/Module.h
parent6939c99b71d9372d14a0c74a772108052e8c48c8 (diff)
downloadexternal_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/Module.h')
-rw-r--r--Source/WebKit2/Platform/Module.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/WebKit2/Platform/Module.h b/Source/WebKit2/Platform/Module.h
index 47899e9..b58e18a 100644
--- a/Source/WebKit2/Platform/Module.h
+++ b/Source/WebKit2/Platform/Module.h
@@ -56,12 +56,19 @@ public:
template<typename FunctionType> FunctionType functionPointer(const char* functionName) const;
+#if PLATFORM(MAC) && !defined(__LP64__)
+ CFBundleRefNum bundleResourceMap();
+#endif
+
private:
void* platformFunctionPointer(const char* functionName) const;
String m_path;
#if PLATFORM(MAC)
RetainPtr<CFBundleRef> m_bundle;
+#if !defined(__LP64__)
+ CFBundleRefNum m_bundleResourceMap;
+#endif
#elif PLATFORM(WIN)
HMODULE m_module;
#elif PLATFORM(QT)