Remove get from CrossThreadPersistent to avoid accidental use

third_party/WebKit/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 118 matching lines @@
 public:
     using Type = CrossThreadPersistent<T>;
 };
 
 template <typename T>
 struct WebPrivatePtrPersistentStorageType<T, WebPrivatePtrDestructionCrossThread, WebPrivatePtrStrength::Weak> {
 public:
     using Type = CrossThreadWeakPersistent<T>;
 };
 
-template<typename T, WebPrivatePtrDestruction crossThreadDestruction, WebPrivatePtrStrength strongOrWeak>
-class PtrStorageImpl<T, crossThreadDestruction, strongOrWeak, GarbageCollectedLifetime> {
+template<typename T, WebPrivatePtrStrength strongOrWeak>
+class PtrStorageImpl<T, WebPrivatePtrDestructionCrossThread, strongOrWeak, GarbageCollectedLifetime> {
 public:
     void assign(T* val)
     {
+        if (!val) {
+            release();
+            return;
+        }
+
+        if (!m_handle)
+            m_handle = new (typename WebPrivatePtrPersistentStorageType<T, WebPrivatePtrDestructionCrossThread, strongOrWeak>::Type)();
+
+        (*m_handle) = val;
+    }
+
+    template<typename U> void assign(U* val) { assign(static_cast<T*>(val)); }
+
+    void assign(const PtrStorageImpl& other) { assign(other.get()); }
+
+    T* get() const { return m_handle ? m_handle->unsafeGet() : nullptr; }

[sof, 2016/06/02 07:00:12]

You can use a trait (over WebPrivatePtrDestruction) to avoid having to duplicate
a class specialization.

+
+    void release()
+    {
+        delete m_handle;
+        m_handle = nullptr;
+    }
+
+private:
+    typename WebPrivatePtrPersistentStorageType<T, WebPrivatePtrDestructionCrossThread, strongOrWeak>::Type* m_handle;
+};
+
+template<typename T, WebPrivatePtrStrength strongOrWeak>
+class PtrStorageImpl<T, WebPrivatePtrDestructionSameThread, strongOrWeak, GarbageCollectedLifetime> {
+public:
+    void assign(T* val)
+    {
         if (!val) {
             release();
             return;
         }
 
         if (!m_handle)
-            m_handle = new (typename WebPrivatePtrPersistentStorageType<T, crossThreadDestruction, strongOrWeak>::Type)();
+            m_handle = new (typename WebPrivatePtrPersistentStorageType<T, WebPrivatePtrDestructionSameThread, strongOrWeak>::Type)();
 
         (*m_handle) = val;
     }
 
     template<typename U> void assign(U* val) { assign(static_cast<T*>(val)); }
 
     void assign(const PtrStorageImpl& other) { assign(other.get()); }
 
     T* get() const { return m_handle ? m_handle->get() : 0; }
 
     void release()
     {
         delete m_handle;
         m_handle = 0;
     }
 
 private:
-    typename WebPrivatePtrPersistentStorageType<T, crossThreadDestruction, strongOrWeak>::Type* m_handle;
+    typename WebPrivatePtrPersistentStorageType<T, WebPrivatePtrDestructionSameThread, strongOrWeak>::Type* m_handle;
 };
 
 template<typename T, WebPrivatePtrDestruction crossThreadDestruction, WebPrivatePtrStrength strongOrWeak>
 class PtrStorage : public PtrStorageImpl<T, crossThreadDestruction, strongOrWeak, 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);
     }
@@ skipping 116 matching lines @@
     // Disable the copy constructor; classes that contain a WebPrivatePtr
     // should implement their copy constructor using assign().
     WebPrivatePtr(const WebPrivatePtr&);
 
     void* m_storage;
 };
 
 } // namespace blink
 
 #endif // WebPrivatePtr_h