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

Unified Diff: Source/platform/heap/Handle.h

Issue 365653002: Oilpan: move 2D Canvas and WebGL objects to the heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Have Nullable<T>::trace() use TraceIfNeeded<>. Created 6 years, 5 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
Index: Source/platform/heap/Handle.h
diff --git a/Source/platform/heap/Handle.h b/Source/platform/heap/Handle.h
index 039942a967d4975a076a205fe34e5feb3aa66aea..5bee66d4fb8047975d5ee949d63bc9e0d63c00cf 100644
--- a/Source/platform/heap/Handle.h
+++ b/Source/platform/heap/Handle.h
@@ -665,22 +665,29 @@ public:
}
};
-template<bool needsTracing, typename T>
-struct StdPairHelper;
+template<typename T, bool needsTracing>
+struct TraceIfEnabled;
template<typename T>
-struct StdPairHelper<false, T> {
+struct TraceIfEnabled<T, false> {
static void trace(Visitor*, T*) { }
};
template<typename T>
-struct StdPairHelper<true, T> {
+struct TraceIfEnabled<T, true> {
static void trace(Visitor* visitor, T* t)
{
visitor->trace(*t);
}
};
+template <typename T> struct RemoveHeapPointerWrapperTypes {
+ typedef typename WTF::RemoveTemplate<typename WTF::RemoveTemplate<typename WTF::RemoveTemplate<T, Member>::Type, WeakMember>::Type, RawPtr>::Type Type;
+};
+
+template<typename T>
+struct TraceIfNeeded : public TraceIfEnabled<T, WebCore::IsGarbageCollectedType<typename RemoveHeapPointerWrapperTypes<typename WTF::RemovePointer<T>::Type>::Type>::value> { };
+
// This trace trait for std::pair will null weak members if their referent is
// collected. If you have a collection that contain weakness it does not remove
// entries from the collection that contain nulled weak members.
@@ -691,8 +698,8 @@ public:
static const bool secondNeedsTracing = WTF::NeedsTracing<U>::value || WTF::IsWeak<U>::value;
static void trace(Visitor* visitor, std::pair<T, U>* pair)
{
- StdPairHelper<firstNeedsTracing, T>::trace(visitor, &pair->first);
- StdPairHelper<secondNeedsTracing, U>::trace(visitor, &pair->second);
+ TraceIfEnabled<T, firstNeedsTracing>::trace(visitor, &pair->first);
+ TraceIfEnabled<U, secondNeedsTracing>::trace(visitor, &pair->second);
}
};

Powered by Google App Engine
This is Rietveld 408576698