summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/bridge/runtime_root.h
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-05-24 11:24:40 +0100
committerBen Murdoch <benm@google.com>2011-06-02 09:53:15 +0100
commit81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch)
tree7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/bridge/runtime_root.h
parent94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff)
downloadexternal_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip
external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz
external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/bridge/runtime_root.h')
-rw-r--r--Source/WebCore/bridge/runtime_root.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/bridge/runtime_root.h b/Source/WebCore/bridge/runtime_root.h
index dde8a48..feade45 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 <runtime/Protect.h>
+#include <collector/handles/Global.h>
#include <runtime/WeakGCMap.h>
#include <wtf/Forward.h>
@@ -71,7 +71,7 @@ public:
JSGlobalObject* globalObject() const;
void updateGlobalObject(JSGlobalObject*);
- void addRuntimeObject(RuntimeObject*);
+ void addRuntimeObject(JSGlobalData&, RuntimeObject*);
void removeRuntimeObject(RuntimeObject*);
struct InvalidationCallback {
@@ -86,7 +86,7 @@ private:
bool m_isValid;
const void* m_nativeHandle;
- ProtectedPtr<JSGlobalObject> m_globalObject;
+ Global<JSGlobalObject> m_globalObject;
ProtectCountSet m_protectCountSet;
WeakGCMap<RuntimeObject*, RuntimeObject> m_runtimeObjects; // Really need a WeakGCSet, but this will do.