Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1552)

Unified Diff: Source/heap/Heap.h

Issue 178663004: Oilpan: move WorkerGlobalScope to oilpan's heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/heap/Handle.h ('k') | Source/modules/crypto/WorkerGlobalScopeCrypto.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/heap/Heap.h
diff --git a/Source/heap/Heap.h b/Source/heap/Heap.h
index 920658953acf6c19397685f90e5c2e51163bd33b..a936fbabd9a86b867d7e65b4beab231f283437c2 100644
--- a/Source/heap/Heap.h
+++ b/Source/heap/Heap.h
@@ -1361,6 +1361,13 @@ struct ThreadingTrait<HashMap<Key, Value, HeapAllocator, T, U, V> > {
&& (ThreadingTrait<Value>::Affinity == MainThreadOnly) ? MainThreadOnly : AnyThread;
};
+template<typename First, typename Second>
+struct ThreadingTrait<WTF::KeyValuePair<First, Second> > {
+ static const ThreadAffinity Affinity =
+ (ThreadingTrait<First>::Affinity == MainThreadOnly)
+ && (ThreadingTrait<Second>::Affinity == MainThreadOnly) ? MainThreadOnly : AnyThread;
+};
+
template<typename T, typename U, typename V>
struct ThreadingTrait<HashSet<T, HeapAllocator, U, V> > {
static const ThreadAffinity Affinity = ThreadingTrait<T>::Affinity;
« no previous file with comments | « Source/heap/Handle.h ('k') | Source/modules/crypto/WorkerGlobalScopeCrypto.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698