Replace threadSafeBind() + GCed pointers with CrossThreadPersistent

third_party/WebKit/Source/platform/CrossThreadCopier.h

 /*
  * Copyright (C) 2009, 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 53 matching lines @@
 template <typename T>
 struct CrossThreadCopierPassThrough {
     STATIC_ONLY(CrossThreadCopierPassThrough);
     typedef T Type;
     static Type copy(const T& parameter)
     {
         return parameter;
     }
 };
 
-template <typename T, bool isArithmeticOrEnum, bool isThreadSafeRefCounted, bool isGarbageCollected>
+template <typename T, bool isArithmeticOrEnum, bool isThreadSafeRefCounted>
 struct CrossThreadCopierBase;
 
 // Arithmetic values (integers or floats) and enums can be safely copied.
-template <typename T, bool isThreadSafeRefCounted, bool isGarbageCollected>
-struct CrossThreadCopierBase<T, true, isThreadSafeRefCounted, isGarbageCollected> : public CrossThreadCopierPassThrough<T> {
+template <typename T, bool isThreadSafeRefCounted>
+struct CrossThreadCopierBase<T, true, isThreadSafeRefCounted> : public CrossThreadCopierPassThrough<T> {
     STATIC_ONLY(CrossThreadCopierBase);
 };
 
 // Custom copy method for ThreadSafeRefCounted.
-template <typename T, bool isGarbageCollected>
-struct CrossThreadCopierBase<T, false, true, isGarbageCollected> {
+template <typename T>
+struct CrossThreadCopierBase<T, false, true> {
     STATIC_ONLY(CrossThreadCopierBase);
     typedef typename WTF::RemoveTemplate<T, RefPtr>::Type TypeWithoutRefPtr;
     typedef typename WTF::RemoveTemplate<TypeWithoutRefPtr, PassRefPtr>::Type TypeWithoutPassRefPtr;
     typedef typename std::remove_pointer<TypeWithoutPassRefPtr>::type RefCountedType;
 
     // Verify that only one of the above did a change.
     static_assert((std::is_same<RefPtr<RefCountedType>, T>::value
         || std::is_same<PassRefPtr<RefCountedType>, T>::value
         || std::is_same<RefCountedType*, T>::value),
         "only one type modification should be allowed");
 
     typedef PassRefPtr<RefCountedType> Type;
     static Type copy(const T& refPtr)
     {
         return refPtr;
     }
 };
 
-// A pointer to GarbageCollected.
-template <typename T>
-struct CrossThreadCopierBase<T, false, false, true> {
-    STATIC_ONLY(CrossThreadCopierBase);
-    typedef typename std::remove_pointer<T>::type TypeWithoutPointer;
-    typedef TypeWithoutPointer* Type;
-    static Type copy(const T& ptr)
-    {
-        return ptr;
-    }
-};
-
 template <typename T>
 struct CrossThreadCopier : public CrossThreadCopierBase<
     T,
     std::is_arithmetic<T>::value || std::is_enum<T>::value,
     WTF::IsSubclassOfTemplate<typename WTF::RemoveTemplate<T, RefPtr>::Type, ThreadSafeRefCounted>::value
     || WTF::IsSubclassOfTemplate<typename std::remove_pointer<T>::type, ThreadSafeRefCounted>::value
     || WTF::IsSubclassOfTemplate<typename WTF::RemoveTemplate<T, PassRefPtr>::Type, ThreadSafeRefCounted>::value
     || std::is_base_of<SkRefCnt, typename WTF::RemoveTemplate<T, RefPtr>::Type>::value
     || std::is_base_of<SkRefCnt, typename std::remove_pointer<T>::type>::value
-    || std::is_base_of<SkRefCnt, typename WTF::RemoveTemplate<T, PassRefPtr>::Type>::value,
-    WTF::IsSubclassOfTemplate<typename std::remove_pointer<T>::type, GarbageCollected>::value> {
+    || std::is_base_of<SkRefCnt, typename WTF::RemoveTemplate<T, PassRefPtr>::Type>::value> {
     STATIC_ONLY(CrossThreadCopier);
 };
 
 // CrossThreadCopier specializations follow.
 
 // nullptr_t can be passed through without any changes.
 template <>
 struct CrossThreadCopier<std::nullptr_t> : public CrossThreadCopierPassThrough<std::nullptr_t> {
     STATIC_ONLY(CrossThreadCopier);
 };
@@ skipping 23 matching lines @@
 template <typename T>
 struct CrossThreadCopier<std::unique_ptr<T>> {
     STATIC_ONLY(CrossThreadCopier);
     using Type = std::unique_ptr<T>;
     static std::unique_ptr<T> copy(std::unique_ptr<T> pointer)
     {
         return pointer; // This is in fact a move.
     }
 };
 
+template<typename T>
+struct CrossThreadCopier<CrossThreadPersistent<T>> : public CrossThreadCopierPassThrough<CrossThreadPersistent<T>> {
+    STATIC_ONLY(CrossThreadCopier);
+};
+
 template <typename T>
 struct CrossThreadCopier<WTF::PassedWrapper<T>> {
     STATIC_ONLY(CrossThreadCopier);
     using Type = WTF::PassedWrapper<typename CrossThreadCopier<T>::Type>;
     static Type copy(WTF::PassedWrapper<T>&& value) { return passed(CrossThreadCopier<T>::copy(value.moveOut())); }
 };
 
 template<typename T>
 struct CrossThreadCopier<CrossThreadWeakPersistentThisPointer<T>> : public CrossThreadCopierPassThrough<CrossThreadWeakPersistentThisPointer<T>> {
     STATIC_ONLY(CrossThreadCopier);
@@ skipping 83 matching lines @@
 
 template <typename T>
 AllowCrossThreadAccessWrapper<const WeakPtr<T>&> AllowCrossThreadAccess(const WeakPtr<T>& value)
 {
     return AllowCrossThreadAccessWrapper<const WeakPtr<T>&>(value);
 }
 
 } // namespace blink
 
 #endif // CrossThreadCopier_h