diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/bridge/runtime_root.h | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
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 babd7ad..dde8a48 100644 --- a/Source/WebCore/bridge/runtime_root.h +++ b/Source/WebCore/bridge/runtime_root.h @@ -31,8 +31,8 @@ #endif #include <runtime/Protect.h> +#include <runtime/WeakGCMap.h> #include <wtf/Forward.h> -#include <wtf/HashSet.h> #include <wtf/Noncopyable.h> #include <wtf/PassRefPtr.h> #include <wtf/RefCounted.h> @@ -89,7 +89,7 @@ private: ProtectedPtr<JSGlobalObject> m_globalObject; ProtectCountSet m_protectCountSet; - HashSet<RuntimeObject*> m_runtimeObjects; + WeakGCMap<RuntimeObject*, RuntimeObject> m_runtimeObjects; // Really need a WeakGCSet, but this will do. HashSet<InvalidationCallback*> m_invalidationCallbacks; }; |