diff options
author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/bridge/runtime_root.h | |
parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/bridge/runtime_root.h')
-rw-r--r-- | Source/WebCore/bridge/runtime_root.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/bridge/runtime_root.h b/Source/WebCore/bridge/runtime_root.h index feade45..f1ea671 100644 --- a/Source/WebCore/bridge/runtime_root.h +++ b/Source/WebCore/bridge/runtime_root.h @@ -29,7 +29,7 @@ #if PLATFORM(MAC) #include "jni_jsobject.h" #endif -#include <collector/handles/Global.h> +#include <heap/Strong.h> #include <runtime/WeakGCMap.h> #include <wtf/Forward.h> @@ -86,7 +86,7 @@ private: bool m_isValid; const void* m_nativeHandle; - Global<JSGlobalObject> m_globalObject; + Strong<JSGlobalObject> m_globalObject; ProtectCountSet m_protectCountSet; WeakGCMap<RuntimeObject*, RuntimeObject> m_runtimeObjects; // Really need a WeakGCSet, but this will do. |