Make ContentDecryptionModuleResult cross-thread destructible.

public/platform/WebPrivatePtr.h

 /*
  * Copyright (C) 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 21 matching lines @@
 #define WebPrivatePtr_h
 
 #include "WebCommon.h"
 
 #if INSIDE_BLINK
 #include "platform/heap/Handle.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/TypeTraits.h"
 #endif
 
+namespace WTF {
+template<class T> class ThreadSafeRefCounted;
+}
+
 namespace blink {
 
+// By default, the destruction of a WebPrivatePtr<> must happen on the same
+// thread, but can be allowed to happen on another thread.
+enum WebPrivatePtrDestruction {
+    SameThreadDestruction,

[tkent, 2015/07/23 23:28:09]

The enum items should be  WebPrivatePtrDestructionSameThread and
WebPrivatePtrDestructionAllowCrossThread.

See the enum rule in https://www.chromium.org/blink/public-c-api#TOC-Naming .

[sof, 2015/07/24 05:25:21]

Thanks, aligned. And preferable to export & use this enum, rather than have it
be controlled internally to Blink.

+    AllowCrossThreadDestruction,
+};
+
 #if INSIDE_BLINK
 enum LifetimeManagementType {
     RefCountedLifetime,
     GarbageCollectedLifetime,
     RefCountedGarbageCollectedLifetime
 };
 
 template<typename T>
 class LifetimeOf {
     static const bool isGarbageCollected = WTF::IsSubclassOfTemplate<T, GarbageCollected>::value || IsGarbageCollectedMixin<T>::value;
     static const bool isRefCountedGarbageCollected = WTF::IsSubclassOfTemplate<T, RefCountedGarbageCollected>::value;
 public:
     static const LifetimeManagementType value =
         !isGarbageCollected ? RefCountedLifetime :
         isRefCountedGarbageCollected ? RefCountedGarbageCollectedLifetime : GarbageCollectedLifetime;
 };
 
-template<typename T, LifetimeManagementType lifetime>
+template<typename T, WebPrivatePtrDestruction crossThreadDestruction, LifetimeManagementType lifetime>
 class PtrStorageImpl;
 
-template<typename T>
-class PtrStorageImpl<T, RefCountedLifetime> {
+template<typename T, WebPrivatePtrDestruction crossThreadDestruction>
+class PtrStorageImpl<T, crossThreadDestruction, RefCountedLifetime> {
 public:
     typedef PassRefPtr<T> BlinkPtrType;
 
     void assign(const BlinkPtrType& val)
     {
+        static_assert(crossThreadDestruction == SameThreadDestruction || WTF::IsSubclassOfTemplate<T, WTF::ThreadSafeRefCounted>::value, "Cross thread destructible class must derive from ThreadSafeRefCounted<>");
         release();
         m_ptr = val.leakRef();
     }
 
     void assign(const PtrStorageImpl& other)
     {
         release();
         T* val = other.get();
         WTF::refIfNotNull(val);
         m_ptr = val;
@@ skipping 11 matching lines @@
     void release()
     {
         WTF::derefIfNotNull(m_ptr);
         m_ptr = 0;
     }
 
 private:
     T* m_ptr;
 };
 
-template<typename T>
-class PtrStorageImpl<T, GarbageCollectedLifetime> {
+template <typename T, WebPrivatePtrDestruction>
+struct WebPrivatePtrPersistentStorageType {
+public:
+    using Type = Persistent<T>;
+};
+
+template <typename T>
+struct WebPrivatePtrPersistentStorageType<T, AllowCrossThreadDestruction> {
+public:
+    using Type = CrossThreadPersistent<T>;
+};
+
+template<typename T, WebPrivatePtrDestruction crossThreadDestruction>
+class PtrStorageImpl<T, crossThreadDestruction, GarbageCollectedLifetime> {
 public:
     void assign(const RawPtr<T>& val)
     {
         if (!val) {
             release();
             return;
         }
 
         if (!m_handle)
-            m_handle = new Persistent<T>();
+            m_handle = new (typename WebPrivatePtrPersistentStorageType<T, crossThreadDestruction>::Type)();
 
         (*m_handle) = val;
     }
 
     void assign(T* ptr) { assign(RawPtr<T>(ptr)); }
     template<typename U> void assign(const RawPtr<U>& val) { assign(RawPtr<T>(val)); }
 
     void assign(const PtrStorageImpl& other) { assign(other.get()); }
 
     void moveFrom(PtrStorageImpl& other)
     {
         release();
         m_handle = other.m_handle;
         other.m_handle = 0;
     }
 
     T* get() const { return m_handle ? m_handle->get() : 0; }
 
     void release()
     {
         delete m_handle;
         m_handle = 0;
     }
 
 private:
-    Persistent<T>* m_handle;
+    typename WebPrivatePtrPersistentStorageType<T, crossThreadDestruction>::Type* m_handle;
 };
 
-template<typename T>
-class PtrStorageImpl<T, RefCountedGarbageCollectedLifetime> : public PtrStorageImpl<T, GarbageCollectedLifetime> {
+template<typename T, WebPrivatePtrDestruction crossThreadDestruction>
+class PtrStorageImpl<T, crossThreadDestruction, RefCountedGarbageCollectedLifetime> : public PtrStorageImpl<T, crossThreadDestruction, GarbageCollectedLifetime> {
 public:
-    void assign(const PassRefPtrWillBeRawPtr<T>& val) { PtrStorageImpl<T, GarbageCollectedLifetime>::assign(val.get()); }
+    void assign(const PassRefPtrWillBeRawPtr<T>& val) { PtrStorageImpl<T, crossThreadDestruction, GarbageCollectedLifetime>::assign(val.get()); }
 
-    void assign(const PtrStorageImpl& other) { PtrStorageImpl<T, GarbageCollectedLifetime>::assign(other.get()); }
+    void assign(const PtrStorageImpl& other) { PtrStorageImpl<T, crossThreadDestruction, GarbageCollectedLifetime>::assign(other.get()); }
 };
 
-template<typename T>
-class PtrStorage : public PtrStorageImpl<T, LifetimeOf<T>::value> {
+template<typename T, WebPrivatePtrDestruction crossThreadDestruction>
+class PtrStorage : public PtrStorageImpl<T, crossThreadDestruction, LifetimeOf<T>::value> {
 public:
     static PtrStorage& fromSlot(void** slot)
     {
         static_assert(sizeof(PtrStorage) == sizeof(void*), "PtrStorage must be the size of a pointer");
         return *reinterpret_cast<PtrStorage*>(slot);
     }
 
     static const PtrStorage& fromSlot(void* const* slot)
     {
         static_assert(sizeof(PtrStorage) == sizeof(void*), "PtrStorage must be the size of a pointer");
         return *reinterpret_cast<const PtrStorage*>(slot);
     }
 
 private:
     // Prevent construction via normal means.
     PtrStorage();
     PtrStorage(const PtrStorage&);
 };
 #endif
 
-
 // This class is an implementation detail of the Blink API. It exists to help
 // simplify the implementation of Blink interfaces that merely wrap a reference
 // counted WebCore class.
 //
 // A typical implementation of a class which uses WebPrivatePtr might look like
 // this:
 //    class WebFoo {
 //    public:
 //        BLINK_EXPORT ~WebFoo();
 //        WebFoo() { }
@@ skipping 16 matching lines @@
 //    #endif
 //
 //    private:
 //        WebPrivatePtr<Foo> m_private;
 //    };
 //
 //    // WebFoo.cpp
 //    WebFoo::~WebFoo() { m_private.reset(); }
 //    void WebFoo::assign(const WebFoo& other) { ... }
 //
-template <typename T>
+template <typename T, WebPrivatePtrDestruction crossThreadDestruction = SameThreadDestruction>
 class WebPrivatePtr {
 public:
     WebPrivatePtr() : m_storage(0) { }
     ~WebPrivatePtr()
     {
         // We don't destruct the object pointed by m_ptr here because we don't
         // want to expose destructors of core classes to embedders. We should
         // call reset() manually in destructors of classes with WebPrivatePtr
         // members.
         BLINK_ASSERT(!m_storage);
     }
 
     bool isNull() const { return !m_storage; }
 
 #if INSIDE_BLINK
     template<typename U>
     WebPrivatePtr(const U& ptr)
         : m_storage(0)
     {
         storage().assign(ptr);
     }
 
     void reset() { storage().release(); }
 
-    WebPrivatePtr<T>& operator=(const WebPrivatePtr<T>& other)
+    WebPrivatePtr& operator=(const WebPrivatePtr& other)
     {
         storage().assign(other.storage());
         return *this;
     }
 
-    void moveFrom(WebPrivatePtr<T>& other)
+    void moveFrom(WebPrivatePtr& other)
     {
         storage().moveFrom(other.storage());
         return;
     }
 
     template<typename U>
-    WebPrivatePtr<T>& operator=(const U& ptr)
+    WebPrivatePtr& operator=(const U& ptr)
     {
         storage().assign(ptr);
         return *this;
     }
 
     T* get() const { return storage().get(); }
 
     T& operator*() const
     {
         ASSERT(m_storage);
         return *get();
     }
 
     T* operator->() const
     {
         ASSERT(m_storage);
         return get();
     }
 #endif
 
 private:
 #if INSIDE_BLINK
-    PtrStorage<T>& storage() { return PtrStorage<T>::fromSlot(&m_storage); }
-    const PtrStorage<T>& storage() const { return PtrStorage<T>::fromSlot(&m_storage); }
+    PtrStorage<T, crossThreadDestruction>& storage() { return PtrStorage<T, crossThreadDestruction>::fromSlot(&m_storage); }
+    const PtrStorage<T, crossThreadDestruction>& storage() const { return PtrStorage<T, crossThreadDestruction>::fromSlot(&m_storage); }
 #endif
 
 #if !INSIDE_BLINK
     // Disable the assignment operator; we define it above for when
     // INSIDE_BLINK is set, but we need to make sure that it is not
     // used outside there; the compiler-provided version won't handle reference
     // counting properly.
-    WebPrivatePtr<T>& operator=(const WebPrivatePtr<T>& other);
+    WebPrivatePtr& operator=(const WebPrivatePtr& other);
 #endif
     // Disable the copy constructor; classes that contain a WebPrivatePtr
     // should implement their copy constructor using assign().
-    WebPrivatePtr(const WebPrivatePtr<T>&);
+    WebPrivatePtr(const WebPrivatePtr&);
 
     void* m_storage;
 };
 
 } // namespace blink
 
 #endif